From ba84bace3c6d1ba0c73abe8895574ff3d23b832d Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 22 Dec 2021 04:32:30 +0800 Subject: [PATCH] wtd --- app/Http/Controllers/TunaiController.php | 64 +++++++++++++++++++++--- app/Http/Controllers/WTDController.php | 22 ++++++++ app/WTDDraft.php | 34 +++++++++++++ routes/web.php | 5 ++ 4 files changed, 118 insertions(+), 7 deletions(-) create mode 100644 app/Http/Controllers/WTDController.php create mode 100644 app/WTDDraft.php diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 1934978..8eeafe2 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -418,7 +418,7 @@ class TunaiController extends Controller ->first(); $tunai=Tunai::on($cawangan['mysql']) - ->where([['kodcaw','=',$kodcaw],['tarikh','=', $getdate['tarikh']],['baki','<>',0]]) + ->where([['kodcaw','=',$cawangan['kodcaw']],['tarikh','=', $getdate['tarikh']],['baki','<>',0]]) ->GroupBy('kodlaluan') ->get(); @@ -427,10 +427,10 @@ class TunaiController extends Controller foreach($tunai as $index=>$tunsem){ $latesttunai=Tunai::on($cawangan['mysql']) - ->where([['kodcaw','=',$cawangan['kodcaw']],['tarikh','=',$current->toDateString()],['kodlaluan','=',$tunsem['kodlaluan']]]) + ->where([['kodcaw','=',$cawangan['kodcaw']],['tarikh','<',$current->toDateString()],['kodlaluan','=',$tunsem['kodlaluan']]]) ->orderBy('tarikh','desc') ->first(); - if(sizeof($latesttunai) == 0) + if($latesttunai) { $tunai=Tunai::on($cawangan['mysql'])->create([ 'tarikh' => $current->toDateString(), @@ -551,7 +551,6 @@ class TunaiController extends Controller } //Peti Besi Cawangan - $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); $getVault=Vault::on($cawangan['mysql']) ->where('kodcaw','=',$cawangan['kodcaw']) ->where('tarikh','=',$current->toDateString()) @@ -559,9 +558,60 @@ class TunaiController extends Controller if(sizeof($getVault) == 0) { - $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); - $getVault = $peti_besi_terkini['bakiakhir']; - + $vault = Vault::on($cawangan['mysql'])->orderby('tarikh','desc')->first(); + + if($vault) + { + $vaultcreate = Vault::on($cawangan['mysql'])->create([ + 'kodcaw'=>$cawangan['kodcaw'], + 'tarikh'=> $current->toDateString(), + 'bakiawal' => $vault['bakiakhir'], + 'keluar' => 0, + 'masuk' => 0, + 'bakiakhir' => $vault['bakiakhir'], + 'bakieod' => $vault['bakiakhir'], + 'pendahuluan' => 0, + 'serahan' => 0, + '1sen' => $vault['1sen'], + '5sen' => $vault['5sen'], + '10sen' => $vault['10sen'], + '20sen' => $vault['20sen'], + '50sen' => $vault['50sen'], + 'rm1' => $vault['rm1'], + 'rm2' => $vault['rm2'], + 'rm5' => $vault['rm5'], + 'rm10' => $vault['rm10'], + 'rm50' => $vault['rm50'], + 'rm100' => $vault['rm100'], + 'rm1000' => $vault['rm1000'], + 'totpanjar' => 0 + ]); + }else{ + $vaultcreate = Vault::on($cawangan['mysql'])->create([ + 'kodcaw'=>$request->kodcaw, + 'tarikh'=> $current->toDateString(), + 'bakiawal' => 0, + 'keluar' => 0, + 'masuk' => 0, + 'bakiakhir' => 0, + 'bakieod' => 0, + 'pendahuluan' => 0, + 'serahan' => 0, + '1sen' => 0, + '5sen' => 0, + '10sen' => 0, + '20sen' => 0, + '50sen' => 0, + 'rm1' => 0, + 'rm2' => 0, + 'rm5' => 0, + 'rm10' => 0, + 'rm50' => 0, + 'rm100' => 0, + 'rm1000' => 0, + 'totpanjar' => 0 + ]); + } } } diff --git a/app/Http/Controllers/WTDController.php b/app/Http/Controllers/WTDController.php new file mode 100644 index 0000000..e140e1f --- /dev/null +++ b/app/Http/Controllers/WTDController.php @@ -0,0 +1,22 @@ +norujukan)->first(); + + if($sagwtddraft){ + return 'yes'; + }else{ + return 'no'; + } + } +} diff --git a/app/WTDDraft.php b/app/WTDDraft.php new file mode 100644 index 0000000..f14d353 --- /dev/null +++ b/app/WTDDraft.php @@ -0,0 +1,34 @@ +get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBa $router->post('tac/generate/express_payment',['uses'=>'TacExpressPaymentController@generateTacExpressPayment']); $router->get('tac/get/express_payment',['uses'=>'TacExpressPaymentController@getTacExpressPayment']); $router->get('tac/verify/express_payment',['uses'=>'TacExpressPaymentController@verifyTacExpressPayment']); + + //initiateTunai + $router->get('initiate/tunai',['uses'=>'TunaiController@initiateTunai']); + //WTD + $router->get('check/wtd',['uses'=>'WTDController@getDraftWTD']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){