From da8ed07029e069591639cc435e0687b8f9aac9d4 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 28 Mar 2021 08:02:49 +0800 Subject: [PATCH 1/3] biasa la --- app/Http/Controllers/GadaiController.php | 14 +++++++++- app/Http/Controllers/LelongController.php | 32 +++++++++++++++++------ 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index c1e471f..c366859 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1967,12 +1967,24 @@ class GadaiController extends Controller // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) ->sum('pinjaman'); - $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) + + if($request->tarikh <= '2021-02-25') + { + $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) ->sum('pinjaman'); + } + else{ + $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) + ->where('tagpalsu','=',0) + ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]]) + ->sum('pinjaman'); + } + $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; return response()->json($array_rekodemas); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 1b6f228..3c23f3c 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -148,14 +148,30 @@ class LelongController extends Controller $rugilelonglama = imbangdugalama::on($cawangan['mysql']) ->sum('rugi_lelong'); - $bakilelong = Lelong::on($cawangan['mysql']) - ->where('t_jual','<=',$request->tarikh) - ->where(function($query) use ($tarikhbaru){ - $query->whereNull('trkhtuntut') - ->orWhere('trkhtuntut','>',$tarikhbaru); - }) - ->where('baki','>=',0) - ->sum('baki'); + + if($request->tarikh <= '2021-02-25') + { + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','<=',$request->tarikh) + ->where(function($query) use ($tarikhbaru){ + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>',$tarikhbaru); + }) + ->where('baki','>=',0) + ->sum('baki'); + }else{ + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','<=',$request->tarikh) + ->where(function($query) use ($tarikhbaru){ + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>','2021-02-25'); + }) + ->where('baki','>=',0) + ->sum('baki'); + } + + + $ansrugi = AnsRugi::on($cawangan['mysql']) ->sum('bayaran'); From a3d127e749cf72dbdbcc973c5e1d50ac907a2926 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 28 Mar 2021 16:47:38 +0800 Subject: [PATCH 2/3] fix skit2 --- app/Http/Controllers/LelongController.php | 2 ++ app/Http/Controllers/TunaiController.php | 15 +++++++++++++++ app/RequestTeller.php | 2 +- routes/web.php | 3 +-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 3c23f3c..0f5cc64 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -173,6 +173,8 @@ class LelongController extends Controller + // dd($bakilelong->toSql()); + $ansrugi = AnsRugi::on($cawangan['mysql']) ->sum('bayaran'); diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 7a6ed68..5bc29d9 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -261,6 +261,16 @@ class TunaiController extends Controller return response()->json($requestteller); } + public function getRequestTellerByDate($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',0],['tarikh','<=',$request->hingga],['tarikh','>=',$request->mula]])->get(); + return response()->json($requestteller); + } + public function updateRequestTeller($kodcaw,Request $request) { $requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array( @@ -280,9 +290,14 @@ class TunaiController extends Controller public function createRequestTeller($kodcaw,Request $request) { + $current = Carbon::now(); $current = new Carbon(); + // dd($current->toTimeString()); + + // strtotime($current->toTimeString()); + $reqteller=RequestTeller::on('mysql7')->create([ 'tarikh' => $current->toDateString(), diff --git a/app/RequestTeller.php b/app/RequestTeller.php index d38a7e9..b5f9e67 100644 --- a/app/RequestTeller.php +++ b/app/RequestTeller.php @@ -13,7 +13,7 @@ class RequestTeller extends Model * * @var array */ - protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20', + protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','masa','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20', 'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50']; /** diff --git a/routes/web.php b/routes/web.php index c5b04e7..1fd7fea 100644 --- a/routes/web.php +++ b/routes/web.php @@ -220,7 +220,6 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); //Gldetail List Kaunter $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); //Gldetail List Kaunter - //API PANJAR KHAZANAH $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']); $router->get('SenaraiPanjar/list/{kodcaw}',['uses'=>'PanjarController@listpanjar']); @@ -228,7 +227,6 @@ $router->group(['prefix'=>'api'], function () use ($router){ // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']); $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']); - //API KELULUSAN $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']); $router->get('RekodDahLepas/{kodcaw}',['uses'=>'KelulusanController@rekodlepas']); @@ -247,6 +245,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API REQUEST TELLER $router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']); $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']); + $router->get('requestTeller/get/{kodcaw}/date',['uses' => 'TunaiController@getRequestTellerByDate']); $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']); $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']); From d1d1636e6b49bdd2b8a7558232b06b5344d9a023 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 29 Mar 2021 15:31:20 +0800 Subject: [PATCH 3/3] 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']);