From f001ce6ffeb75420434ced25ef8ff9569c14e84b Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 8 Jun 2023 11:14:39 +0800 Subject: [PATCH] fix --- app/Http/Controllers/AdminPageController.php | 4 +- app/Services/RingkasanHarianServices.php | 127 +++++++++---------- 2 files changed, 64 insertions(+), 67 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index d84dc44..7eec74e 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -3630,8 +3630,10 @@ class AdminPageController extends Controller if($request->jenisgenerate == 'daily'){ $date = $request->tarikh; $res = $ringkasan->StoreRingkasanHarian($date,$date,$request->zone); - }else{ + }else if($request->jenisgenerate == 'monthly'){ $res = $ringkasan->StoreRingkasanHarian($request->mula,$request->hingga,$request->zone); + }else{ + return response('error',400); } return response($res); } diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php index 59537a6..f90ca6d 100644 --- a/app/Services/RingkasanHarianServices.php +++ b/app/Services/RingkasanHarianServices.php @@ -407,80 +407,75 @@ class RingkasanHarianServices $lelong = new RingkasanLelong(); } - $gadai->setConnection($caw['mysql']); - $gadai->setConnection($caw['mysql']); - $tebus->setConnection($caw['mysql']); - $lelong->setConnection($caw['mysql']); - $main->setConnection($caw['mysql']); + $gadai->setConnection($caw['mysql']); + $gadai->setConnection($caw['mysql']); + $tebus->setConnection($caw['mysql']); + $lelong->setConnection($caw['mysql']); + $main->setConnection($caw['mysql']); - /* main */ - $main->pelangganbaru = ($getTransaksi['bilangan_customer_baru']) ? $getTransaksi['bilangan_customer_baru'] : 0; - $main->pendahuluan = ($getPendser['totalpendahuluan']) ? $getPendser['totalpendahuluan'] : 0; - $main->serahan = ($getPendser['totalserahan']) ? $getPendser['totalserahan'] : 0; - $main->serahan_online = ($getPendser['serahanonline']) ? $getPendser['serahanonline'] : 0; - $main->belanjaam = ($getPerbelanjaan['belanja']) ? $getPerbelanjaan['belanja'] : 0; - $main->baikidanselenggara = ($getPerbelanjaan['baikidanselenggara']) ? $getPerbelanjaan['baikidanselenggara'] : 0; - $main->keraian = ($getPerbelanjaan['keraian']) ? $getPerbelanjaan['keraian'] : 0; - $main->date = $current->toDateTimeString(); + /* main */ + $main->pelangganbaru = ($getTransaksi['bilangan_customer_baru']) ? $getTransaksi['bilangan_customer_baru'] : 0; + $main->pendahuluan = ($getPendser['totalpendahuluan']) ? $getPendser['totalpendahuluan'] : 0; + $main->serahan = ($getPendser['totalserahan']) ? $getPendser['totalserahan'] : 0; + $main->serahan_online = ($getPendser['serahanonline']) ? $getPendser['serahanonline'] : 0; + $main->belanjaam = ($getPerbelanjaan['belanja']) ? $getPerbelanjaan['belanja'] : 0; + $main->baikidanselenggara = ($getPerbelanjaan['baikidanselenggara']) ? $getPerbelanjaan['baikidanselenggara'] : 0; + $main->keraian = ($getPerbelanjaan['keraian']) ? $getPerbelanjaan['keraian'] : 0; + $main->date = $current->toDateTimeString(); - /* gadai */ - $gadai->jumlah_pembiayaan = ($getTransaksi['total_gadai']) ? $getTransaksi['total_gadai'] : 0; - $gadai->bilangan_pembiayaan = ($getTransaksi['bilangan_gadai']) ? $getTransaksi['bilangan_gadai'] : 0; - $gadai->gadai_70 = ($getPeratusan['gadai_70']) ? $getPeratusan['gadai_70'] : 0; - $gadai->gadai_75 = ($getPeratusan['gadai_75']) ? $getPeratusan['gadai_75'] : 0; - $gadai->gadai_80 = ($getPeratusan['gadai_80']) ? $getPeratusan['gadai_80'] : 0; - $gadai->nm_70 = ($getPeratusan['nilaimarhun_70']) ? $getPeratusan['nilaimarhun_70'] : 0; - $gadai->nm_75 = ($getPeratusan['nilaimarhun_75']) ? $getPeratusan['nilaimarhun_75'] : 0; - $gadai->nm_80 = ($getPeratusan['nilaimarhun_80']) ? $getPeratusan['nilaimarhun_80'] : 0; - $gadai->bil_70 = ($getPeratusan['bilangan_70']) ? $getPeratusan['bilangan_70'] : 0; - $gadai->bil_75 = ($getPeratusan['bilangan_75']) ? $getPeratusan['bilangan_75'] : 0; - $gadai->bil_80 = ($getPeratusan['bilangan_80']) ? $getPeratusan['bilangan_80'] : 0; + /* gadai */ + $gadai->jumlah_pembiayaan = ($getTransaksi['total_gadai']) ? $getTransaksi['total_gadai'] : 0; + $gadai->bilangan_pembiayaan = ($getTransaksi['bilangan_gadai']) ? $getTransaksi['bilangan_gadai'] : 0; + $gadai->gadai_70 = ($getPeratusan['gadai_70']) ? $getPeratusan['gadai_70'] : 0; + $gadai->gadai_75 = ($getPeratusan['gadai_75']) ? $getPeratusan['gadai_75'] : 0; + $gadai->gadai_80 = ($getPeratusan['gadai_80']) ? $getPeratusan['gadai_80'] : 0; + $gadai->nm_70 = ($getPeratusan['nilaimarhun_70']) ? $getPeratusan['nilaimarhun_70'] : 0; + $gadai->nm_75 = ($getPeratusan['nilaimarhun_75']) ? $getPeratusan['nilaimarhun_75'] : 0; + $gadai->nm_80 = ($getPeratusan['nilaimarhun_80']) ? $getPeratusan['nilaimarhun_80'] : 0; + $gadai->bil_70 = ($getPeratusan['bilangan_70']) ? $getPeratusan['bilangan_70'] : 0; + $gadai->bil_75 = ($getPeratusan['bilangan_75']) ? $getPeratusan['bilangan_75'] : 0; + $gadai->bil_80 = ($getPeratusan['bilangan_80']) ? $getPeratusan['bilangan_80'] : 0; - /* tebus */ - $tebus->pembiayaan_dibayar = ($getTransaksi['total_tebus']) ? $getTransaksi['total_tebus'] : 0; - $tebus->keuntungan_dibayar = ($getTransaksi['upahsimpankaunter']) ? $getTransaksi['upahsimpankaunter'] : 0; - $tebus->bilangan_tebus = ($bilangan_tebus) ? $bilangan_tebus : 0; + /* tebus */ + $tebus->pembiayaan_dibayar = ($getTransaksi['total_tebus']) ? $getTransaksi['total_tebus'] : 0; + $tebus->keuntungan_dibayar = ($getTransaksi['upahsimpankaunter']) ? $getTransaksi['upahsimpankaunter'] : 0; + $tebus->bilangan_tebus = ($bilangan_tebus) ? $bilangan_tebus : 0; - /* ansuran */ - $ansuran->pembiayaan_dibayar = ($getTransaksi['total_ansuran']) ? $getTransaksi['total_ansuran'] : 0; - $ansuran->keuntungan_dibayar = ($getTransaksi['keuntungansebenarkaunter']) ? $getTransaksi['keuntungansebenarkaunter'] : 0; - $ansuran->bilangan_ansuran = ($getTransaksi['bilangan_ansuran']) ? $getTransaksi['bilangan_ansuran'] : 0; - $ansuran->pembiayaan_dibayar_online = ($getTransaksi['total_ansuranonline']) ? $getTransaksi['total_ansuranonline'] : 0; - $ansuran->keuntungan_dibayar_online = ($getTransaksi['total_keuntungan_online']) ? $getTransaksi['total_keuntungan_online'] : 0; - $ansuran->bilangan_bayaran_online = ($getTransaksi['bilangan_ansuranonline']) ? $getTransaksi['bilangan_ansuranonline'] : 0; + /* ansuran */ + $ansuran->pembiayaan_dibayar = ($getTransaksi['total_ansuran']) ? $getTransaksi['total_ansuran'] : 0; + $ansuran->keuntungan_dibayar = ($getTransaksi['keuntungansebenarkaunter']) ? $getTransaksi['keuntungansebenarkaunter'] : 0; + $ansuran->bilangan_ansuran = ($getTransaksi['bilangan_ansuran']) ? $getTransaksi['bilangan_ansuran'] : 0; + $ansuran->pembiayaan_dibayar_online = ($getTransaksi['total_ansuranonline']) ? $getTransaksi['total_ansuranonline'] : 0; + $ansuran->keuntungan_dibayar_online = ($getTransaksi['total_keuntungan_online']) ? $getTransaksi['total_keuntungan_online'] : 0; + $ansuran->bilangan_bayaran_online = ($getTransaksi['bilangan_ansuranonline']) ? $getTransaksi['bilangan_ansuranonline'] : 0; - /* lelong */ - $lelong->lelong_current = ($getLelong['jumlah_lelong']) ? $getLelong['jumlah_lelong'] : 0; - $lelong->baki_lelong = ($getLelong['baki_lelong']) ? $getLelong['baki_lelong'] : 0; - $lelong->rugi_lelong = ($getLelong['rugi_lelong']) ? $getLelong['rugi_lelong'] : 0; - $lelong->bayaran_rugi = ($getLelong['bayar_rugi_lelong']) ? $getLelong['bayar_rugi_lelong'] : 0; - $lelong->bayaran_baki = ($getLelong['bayar_baki_lelong']) ? $getLelong['bayar_baki_lelong'] : 0; - $lelong->caj_lelong = ($getLelong['cas_lelong']) ? $getLelong['cas_lelong'] : 0; - $lelong->bil_lelong = ($getLelong['bilangan']) ? $getLelong['bilangan'] : 0; + /* lelong */ + $lelong->lelong_current = ($getLelong['jumlah_lelong']) ? $getLelong['jumlah_lelong'] : 0; + $lelong->baki_lelong = ($getLelong['baki_lelong']) ? $getLelong['baki_lelong'] : 0; + $lelong->rugi_lelong = ($getLelong['rugi_lelong']) ? $getLelong['rugi_lelong'] : 0; + $lelong->bayaran_rugi = ($getLelong['bayar_rugi_lelong']) ? $getLelong['bayar_rugi_lelong'] : 0; + $lelong->bayaran_baki = ($getLelong['bayar_baki_lelong']) ? $getLelong['bayar_baki_lelong'] : 0; + $lelong->caj_lelong = ($getLelong['cas_lelong']) ? $getLelong['cas_lelong'] : 0; + $lelong->bil_lelong = ($getLelong['bilangan']) ? $getLelong['bilangan'] : 0; + if(!$condition){ + $main->gadai()->save($gadai); + $main->ansuran()->save($ansuran); + $main->tebus()->save($tebus); + $main->lelong()->save($lelong); - - if(!$condition){ - $main->gadai()->save($gadai); - $main->ansuran()->save($ansuran); - $main->tebus()->save($tebus); - $main->lelong()->save($lelong); - - $main->gad_id = $gadai->gad_id; - $main->teb_id = $tebus->teb_id; - $main->ans_id = $ansuran->ans_id; - $main->lel_id = $lelong->lel_id; - }else{ - $ansuran->save(); - $tebus->save(); - $lelong->save(); - $gadai->save(); - } - $main->save(); + $main->gad_id = $gadai->gad_id; + $main->teb_id = $tebus->teb_id; + $main->ans_id = $ansuran->ans_id; + $main->lel_id = $lelong->lel_id; + }else{ + $ansuran->save(); + $tebus->save(); + $lelong->save(); + $gadai->save(); + } + $main->save(); - - - DB::connection($caw['mysql'])->commit(); }catch (\Exception $e) { dd($e);