From d1d1636e6b49bdd2b8a7558232b06b5344d9a023 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 29 Mar 2021 15:31:20 +0800 Subject: [PATCH] untuk imac sahaja --- app/Http/Controllers/GadaiController.php | 1 + app/Http/Controllers/VaultController.php | 60 ++++++++++++++++++++++-- routes/web.php | 1 + 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index c366859..f7f50f5 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1998,6 +1998,7 @@ class GadaiController extends Controller ->where('t_gadai','<=',$request->tarikh) ->where('t_gadai','>=','2021-03-14') ->where('sttebus','=','') + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-03-14']]) ->whereNotNull('upah12') ->sum('upah12'); diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 1362763..ee936a6 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -58,6 +58,36 @@ class VaultController extends Controller return response()->json($updateVault, 200); } + public function updateVaultPanjar($kodcaw, Request $request) + { + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first(); + + $bakiawal = $vault['bakiawal']; + $keluar = $vault['keluar']; + $masuk = $vault['masuk']; + $bakiakhir = $vault['bakiakhir']; + $bakieod = $vault['bakieod']; + $pendahuluan = $vault['pendahuluan']; + $serahan = $vault['serahan']; + $totpanjaran = $vault['totpanjar']; + + $totalpanjar = $request->totpanjar + $totpanjaran; + + $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar; + + $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( + 'totpanjar' => $totalpanjar, + 'bakiakhir'=>$bakiakhir, + 'bakieod'=>$bakiakhir + )); + + return response()->json($updateVault, 200); + } + public function updateVaultPendahuluanSerahan($kodcaw, Request $request) { $current = Carbon::now(); @@ -73,12 +103,13 @@ class VaultController extends Controller $bakieod = $vault['bakieod']; $pendahuluan = $vault['pendahuluan']; $serahan = $vault['serahan']; + $totpanjaran = $vault['totpanjar']; if($request->jenispendahuluanserahan == 'pendahuluan'){ $totalpendahuluan = $request->amaun + $pendahuluan; - $bakiakhir = $bakiawal-$keluar+$masuk+$totalpendahuluan-$serahan; + $bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran; $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( 'pendahuluan' => $totalpendahuluan, @@ -90,7 +121,7 @@ class VaultController extends Controller $totalserahan = $request->amaun + $serahan; - $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan; + $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $totalserahan - $totpanjaran; $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( 'serahan' => $totalserahan, @@ -258,6 +289,17 @@ class VaultController extends Controller $pendahuluanjmc = '7000/106'; $serahankoperasi = '1000/090'; + //Selepas Tawarruq + + $serahanpkbTawarruq = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=',$serahanpkb) + ->where('tarikh','<=', $request->tarikh) + ->where('tarikh','>','2021-03-24') + ->sum('serahan'); + + + //Sebelum Tawarruq + $serahanpkb = GlDetail::on($cawangan['mysql']) ->where('dtacct','=',$serahanpkb) ->where('tarikh','<=', $request->tarikh) @@ -279,7 +321,17 @@ class VaultController extends Controller $totaljmc = $serahanJMC + $serahanjmclama; $totalpkb = $serahanpkb + $serahanpkblama; - $totalserahan = $totaljmc + $totalpkb; + $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; + + + //Selepas Tawarruq + + $pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=',$pendahuluanpkb) + ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2021-03-24']]) + ->sum('pendahuluan'); + + //Sebelum Tawarruq $pendahuluanPKB = GlDetail::on($cawangan['mysql']) ->where('ktacct','=',$pendahuluanpkb) @@ -297,7 +349,7 @@ class VaultController extends Controller $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql']) ->sum('pendahuluan_jmc'); - $total = $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC; + $total = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC; $pindahkekpkb = GlCode::on($cawangan['mysql']) ->where('glcode','=',$serahankoperasi) diff --git a/routes/web.php b/routes/web.php index 1fd7fea..9bfedaa 100644 --- a/routes/web.php +++ b/routes/web.php @@ -196,6 +196,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('countGT/{kodcaw}',['uses'=>'TunaiController@countgadaidantebus']); $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']); $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']); + $router->put('UpdateVault/Panjar/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']); $router->put('UpdateVaultPendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPendahuluanSerahan']); $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']); $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);