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

Merge branch 'pipi' into 'master'

Browse Source 
fix Cust

See merge request online-sistem1/kaunter!59
This commit is contained in:
hafifie rahman
2021-02-17 02:28:48 +00:00
parent 4d519a8f9e 10111cb535
commit 7859060bb1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+9 -9
View File
@@ -88,7 +88,7 @@ class KhazanahController extends Controller
//Peti Besi Cawangan //Peti Besi Cawangan
$getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
$getVault = $getVault[0]['bakiawal']; $getVault = $getVault[0]['bakiakhir'];
//Dashboardall //Dashboardall
$dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json(); $dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();
@@ -825,8 +825,6 @@ class KhazanahController extends Controller
$baki_awal=$peti_besi_terkini[0]["bakiawal"]; $baki_awal=$peti_besi_terkini[0]["bakiawal"];
} }
$amount = $request->amt; $amount = $request->amt;
if($amount>$baki_awal) if($amount>$baki_awal)
@@ -882,9 +880,9 @@ class KhazanahController extends Controller
$tambahT=$tambah + $tam; $tambahT=$tambah + $tam;
$kurang=$kurangT; $kurang=$kurangT;
$keluarT = $keluar; $keluarT = $keluar;
$bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang; $bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang;
$updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [ $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
'kodlaluan'=>$kodlaluan, 'kodlaluan'=>$kodlaluan,
@@ -902,7 +900,8 @@ class KhazanahController extends Controller
// return; // return;
// dd($tambahT); // dd($tambahT);
$keluarV=$tambahT; // $keluarV=$tambahT;
$keluarV = $tambah + $keluarV;
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
@@ -974,6 +973,7 @@ class KhazanahController extends Controller
$nota=$request->nota; $nota=$request->nota;
$kodcaw=$auth_user['cawangan']; $kodcaw=$auth_user['cawangan'];
$tambahT = 0; $tambahT = 0;
$kurangvault = $request->amt;
$addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[ $addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[
'kodcaw'=>$kodcaw, 'kodcaw'=>$kodcaw,
@@ -1052,11 +1052,11 @@ class KhazanahController extends Controller
if($masukV == 0) if($masukV == 0)
{ {
$masuk_V = 0 + $kurang_T; $masuk_V = 0 + $kurangvault;
} }
else else
{ {
$masuk_V=$masukV + $kurang_T; $masuk_V = $masukV + $kurangvault;
} }
if($keluarV == 0) if($keluarV == 0)