Merge branch 'pipi' into 'master'
fix Cust See merge request online-sistem1/kaunter!59
This commit is contained in:
@@ -88,7 +88,7 @@ class KhazanahController extends Controller
|
||||
//Peti Besi Cawangan
|
||||
$getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
|
||||
|
||||
$getVault = $getVault[0]['bakiawal'];
|
||||
$getVault = $getVault[0]['bakiakhir'];
|
||||
|
||||
//Dashboardall
|
||||
$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"];
|
||||
}
|
||||
|
||||
|
||||
|
||||
$amount = $request->amt;
|
||||
|
||||
if($amount>$baki_awal)
|
||||
@@ -882,9 +880,9 @@ class KhazanahController extends Controller
|
||||
|
||||
$tambahT=$tambah + $tam;
|
||||
|
||||
$kurang=$kurangT;
|
||||
$keluarT = $keluar;
|
||||
$bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang;
|
||||
$kurang=$kurangT;
|
||||
$keluarT = $keluar;
|
||||
$bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang;
|
||||
|
||||
$updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
|
||||
'kodlaluan'=>$kodlaluan,
|
||||
@@ -902,7 +900,8 @@ class KhazanahController extends Controller
|
||||
|
||||
// return;
|
||||
// dd($tambahT);
|
||||
$keluarV=$tambahT;
|
||||
// $keluarV=$tambahT;
|
||||
$keluarV = $tambah + $keluarV;
|
||||
|
||||
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
|
||||
|
||||
@@ -974,6 +973,7 @@ class KhazanahController extends Controller
|
||||
$nota=$request->nota;
|
||||
$kodcaw=$auth_user['cawangan'];
|
||||
$tambahT = 0;
|
||||
$kurangvault = $request->amt;
|
||||
|
||||
$addTunai=Http::post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[
|
||||
'kodcaw'=>$kodcaw,
|
||||
@@ -1052,11 +1052,11 @@ class KhazanahController extends Controller
|
||||
|
||||
if($masukV == 0)
|
||||
{
|
||||
$masuk_V = 0 + $kurang_T;
|
||||
$masuk_V = 0 + $kurangvault;
|
||||
}
|
||||
else
|
||||
{
|
||||
$masuk_V=$masukV + $kurang_T;
|
||||
$masuk_V = $masukV + $kurangvault;
|
||||
}
|
||||
|
||||
if($keluarV == 0)
|
||||
|
||||
Reference in New Issue
Block a user