KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

pick certain commits

Browse Source
This commit is contained in:
Hafifie PKB
2024-03-06 22:04:19 +08:00
parent e6cc3613bf
commit de32f6b13d
8 changed files with 2452 additions and 1424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+3 -25
View File
@@ -129,16 +129,8 @@ class AliranTunaiController extends Controller
$getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $teller])->json();
$keluar = $getTunai2['keluar'];
$baki = $getTunai2['baki'];
$bakiakhir = $getTunai2['baki'];
$masuk = $getTunai2['masuk'];
$bakiawal = $getTunai2['bakiawal'];
$pendahuluan = $getTunai2['tambah'];
$serahan = $getTunai2['kurang'];
$totalkeluar = 0;
$bakiakhir = $baki;
// $totalkeluar = $request->pinjaman + $keluar;
$bakiakhir -= $request->pinjaman;
@@ -170,12 +162,7 @@ class AliranTunaiController extends Controller
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk'];
$bakiawal=$getTunai2['bakiawal'];
$pendahuluan=$getTunai2['tambah'];
$serahan=$getTunai2['kurang'];
$totalmasuk = 0;
$bakiakhir = $baki;
$totalkeluar = 0;
if($tebus_detail['jenistebus'] == 'P')
{
@@ -198,17 +185,13 @@ class AliranTunaiController extends Controller
if($tebus_detail['jenistebus'] == 'S')
{
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
$bakiakhir = $bakiakhir + $tebus_detail['bakipjm'];
$totalmasuk = ($tebus_detail['bakipjm'] - $request['pinjaman']) + $masuk;
$bakiakhir = $bakiakhir + ($tebus_detail['bakipjm'] - $request['pinjaman']);
}else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
$bakiakhir = $bakiakhir + $tebus_detail['bakipjm'];
}
// $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
$updateTunai=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'],
'keluar'=>$keluar,
@@ -234,12 +217,7 @@ class AliranTunaiController extends Controller
$keluar=$getTunai2['keluar'];
$baki=$getTunai2['baki'];
$masuk=$getTunai2['masuk'];
$bakiawal=$getTunai2['bakiawal'];
$pendahuluan=$getTunai2['tambah'];
$serahan=$getTunai2['kurang'];
$totalmasuk = 0;
$bakiakhir = $baki;
$totalkeluar = 0;
$bakiakhir = $bakiakhir + $request->totalbayaran;