From 7303c6dc8b314dc8dc48d133c0d684c34055f5fd Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 4 Jun 2023 01:09:55 +0800 Subject: [PATCH 1/9] add ringkasan backup --- app/Http/Controllers/AdminPageController.php | 21 +- app/RingkasanAnsuran.php | 19 + app/RingkasanGadai.php | 19 + app/RingkasanLelong.php | 19 + app/RingkasanMain.php | 34 ++ app/RingkasanTebus.php | 19 + app/Services/RingkasanHarianServices.php | 458 +++++++++++++++++++ config/database.php | 2 +- routes/web.php | 5 + 9 files changed, 592 insertions(+), 4 deletions(-) create mode 100644 app/RingkasanAnsuran.php create mode 100644 app/RingkasanGadai.php create mode 100644 app/RingkasanLelong.php create mode 100644 app/RingkasanMain.php create mode 100644 app/RingkasanTebus.php create mode 100644 app/Services/RingkasanHarianServices.php diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 2da279e..28c2c7c 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -47,9 +47,13 @@ use App\AuditCustomer; use App\imbangdugalama; use App\HapusKira; use App\MaxPinjaman; - - -use DB; +use App\RingkasanAnsuran; +use App\RingkasanGadai; +use App\RingkasanLelong; +use App\RingkasanMain; +use App\RingkasanTebus; +use App\Services\RingkasanHarianServices; +use Illuminate\Support\Facades\DB; use DateTime; use Carbon\Carbon; use Illuminate\Pagination\Paginator; @@ -3619,4 +3623,15 @@ class AdminPageController extends Controller return response()->json($batchleltuntutbaki); } + + public function StoreRingkasanHarian(Request $request){ + + $current = Carbon::now(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); + + $ringkasan = new RingkasanHarianServices; + $ringkasan->StoreRingkasanHarian(); + + + } } diff --git a/app/RingkasanAnsuran.php b/app/RingkasanAnsuran.php new file mode 100644 index 0000000..b8d9153 --- /dev/null +++ b/app/RingkasanAnsuran.php @@ -0,0 +1,19 @@ +belongsTo(RingkasanMain::class); + } + + public $timestamps = false; + +} \ No newline at end of file diff --git a/app/RingkasanGadai.php b/app/RingkasanGadai.php new file mode 100644 index 0000000..7bfd0e8 --- /dev/null +++ b/app/RingkasanGadai.php @@ -0,0 +1,19 @@ +belongsTo(RingkasanMain::class); + } + + public $timestamps = false; + +} \ No newline at end of file diff --git a/app/RingkasanLelong.php b/app/RingkasanLelong.php new file mode 100644 index 0000000..7e303a0 --- /dev/null +++ b/app/RingkasanLelong.php @@ -0,0 +1,19 @@ +belongsTo(RingkasanMain::class); + } + + public $timestamps = false; + +} \ No newline at end of file diff --git a/app/RingkasanMain.php b/app/RingkasanMain.php new file mode 100644 index 0000000..7916deb --- /dev/null +++ b/app/RingkasanMain.php @@ -0,0 +1,34 @@ +hasOne(RingkasanGadai::class, 'gad_id'); + } + + public function ansuran(): HasOne + { + return $this->hasOne(RingkasanAnsuran::class, 'ans_id'); + } + + public function lelong(): HasOne + { + return $this->hasOne(RingkasanLelong::class, 'lel_id'); + } + + public function tebus(): HasOne + { + return $this->hasOne(RingkasanTebus::class, 'teb_id'); + } + + public $timestamps = false; + +} \ No newline at end of file diff --git a/app/RingkasanTebus.php b/app/RingkasanTebus.php new file mode 100644 index 0000000..7a8bfb9 --- /dev/null +++ b/app/RingkasanTebus.php @@ -0,0 +1,19 @@ +belongsTo(RingkasanMain::class); + } + + public $timestamps = false; + +} \ No newline at end of file diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php new file mode 100644 index 0000000..cdde025 --- /dev/null +++ b/app/Services/RingkasanHarianServices.php @@ -0,0 +1,458 @@ +where('t_gadai','=',$date)->sum('pinjaman'); + $total_tebus = Tebus::on($connection)->where('t_tebus','=',$date)->sum('pinjaman'); + $bayaranonlinequery = Transaction::on('mysql7')->whereDate('created_at',$date)->where('teller','=','Online')->where('kodcaw',$kodcaw); + + $bayaranonline = $bayaranonlinequery->sum('duit_masuk'); + $bilbayaranonline = $bayaranonlinequery->count(); + + $ansurankaunter = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) = ?',[$date]) + ->where([['trans.trans_type','=','A'],['teller','<>','Online'],['trans.kodcaw','=',$kodcaw]]); + + $ansuranonline = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereRaw('DATE(transaksi_keuntungan.tarikh_bayaran) = ?',[$date]) + ->where([['trans.trans_type','=','A'],['teller','=','Online'],['trans.kodcaw','=',$kodcaw]]); + + $total_ansuran = $ansurankaunter->sum('transaksi_keuntungan.bayaran_pembiayaan'); + $total_ansuranonline = $ansuranonline->sum('transaksi_keuntungan.bayaran_pembiayaan'); + + $total_upah = Advansur::on($connection)->where('tarikh','=',$date)->sum('upahdibayar'); + $total_keuntungantebus = Tebus::on($connection)->where('t_tebus','=',$date)->sum('bakiupah'); + + $total_keuntunganansuran_data_kaunter = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereDate('trans.created_at','=',$date) + ->where('trans.teller','<>','Online') + ->where('trans.trans_type','=','A') + ->where('trans.kodcaw',$kodcaw) + ->pluck('transaksi_keuntungan.norujukan'); + + $gadaiDataKaunter = Gadai::on($connection)->whereIn('norujukan',$total_keuntunganansuran_data_kaunter)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntunganansuran_kaunter_query = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.teller','<>','Online') + ->where('trans.trans_type','=','A') + ->whereIn('transaksi_keuntungan.norujukan',$gadaiDataKaunter) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','=',$date); + + + $total_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->sum('bayaran_keuntungan'); + $bil_keuntunganansuran_kaunter = $keuntunganansuran_kaunter_query->count(); + + $total_keuntunganansuran_data_online = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereDate('trans.created_at','=',$date) + ->where('trans.teller','=','Online') + ->where('trans.trans_type','=','A') + ->where('trans.kodcaw',$kodcaw) + ->pluck('transaksi_keuntungan.norujukan'); + + $gadaiDataOnline = Gadai::on($connection)->whereIn('norujukan',$total_keuntunganansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntunganansuran_online_query = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereDate('trans.created_at','=',$date) + ->where('trans.teller','=','Online') + ->where('trans.trans_type','=','A') + ->where('trans.kodcaw',$kodcaw) + ->whereIn('trans.norujukan',$gadaiDataOnline) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','=',$date); + + $total_keuntunganansuran_online = $keuntunganansuran_online_query->sum('bayaran_keuntungan'); + $bil_keuntunganansuran_online = $keuntunganansuran_online_query->count(); + + $total_keuntunganbukanansuran_data_kaunter = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.trans_type','!=','A') + ->where('trans.teller','<>','Online') + ->whereDate('trans.created_at','=',$date) + ->where('trans.kodcaw','=',$kodcaw); + + $total_keuntunganbukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->sum('keuntungan_rebet'); + $bil_keuntunganbukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->count(); + + $total_keuntunganbukanansuran_data_online = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->where('trans.trans_type','!=','A') + ->where('trans.teller','=','Online') + ->whereDate('trans.created_at','=',$date) + ->where('trans.kodcaw','=',$kodcaw) + ->pluck('transaksi_keuntungan.norujukan'); + + $gadaiDataOnline = Gadai::on($connection)->whereIn('norujukan',$total_keuntunganbukanansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan'); + + $keuntunganbukanansuran_online_query = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiDataOnline) + ->whereDate('tarikh_bayaran','=',$date); + + + $total_keuntunganbukanansuran_online = $keuntunganbukanansuran_online_query->sum('keuntungan_rebet'); + $bil_keuntunganbukanansuran_online = $keuntunganbukanansuran_online_query->count(); + + $keuntungan_data_kaunter = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $date) + ->where('trans.teller','<>','Online') + ->pluck('transaksi_keuntungan.norujukan'); + + $gadaiDataKaunter = Gadai::on($connection)->whereIn('norujukan',$keuntungan_data_kaunter)->whereNull('hargajualan')->pluck('norujukan'); + + $keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$gadaiDataKaunter); + + + $keuntungan_kaunter = $keuntungan_kaunter_query->sum('bayaran_keuntungan'); + $bil_keuntungan_kaunter = $keuntungan_kaunter_query->count(); + + + $upahtebus = Tebus::on($connection) + ->where('t_tebus','=',$date) + ->sum('upahdibayar'); + + $upahlelong = Lelong::on($connection) + ->where('t_jual','=',$date) + ->sum('bakiupah'); + + $upahansurKaunter = Advansur::on($connection) + ->where('teller','<>','Online') + ->where('tarikh','=',$date) + ->sum('upahdibayar'); + + $upahansurOnlineQuery = Advansur::on($connection) + ->where('teller','=','Online') + ->where('tarikh','=',$date); + + $upahansurOnline = $upahansurOnlineQuery->sum('upahdibayar'); + $bilupahansurOnline = $upahansurOnlineQuery->count(); + + + $upahsimpankaunter = $keuntungan_kaunter + $upahtebus + $upahlelong + $upahansurKaunter + $total_keuntunganbukanansuran_kaunter; + + $keuntungansebenarkaunter = $total_keuntunganansuran_kaunter; + + $upahsimpanonline = $upahansurOnline; + $keuntungansebenaronline = $total_keuntunganansuran_online + $total_keuntunganbukanansuran_online; + + $total_keuntungan_kaunter = floatval($upahsimpankaunter) + floatval($keuntungansebenarkaunter); + $total_keuntungan_online = floatval($upahsimpanonline) + floatval($keuntungansebenaronline); + + $totalbayaranonline = floatval($bayaranonline) + floatval($upahansurOnline); + $biltotalbayaranonline = $bilbayaranonline + $bilupahansurOnline; + + $tebus = Tebus::on($connection) + ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg') + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') + ->where('tebus.t_tebus','=',$date) + ->get(); + + $pembiayaanlelong = Lelong::on($connection) + ->where('t_jual','=',$date) + ->sum('pinjaman'); + + $totalpenebusan = 0; + + foreach($tebus as $index1=>$teb) + { + if($teb['gad.hargajualan'] != $teb['bakihargajualan']) + { + $totalpenebusan += $teb['gadaibakipjm']; + }else{ + $totalpenebusan += $teb['pinjaman']; + } + } + + //Lelongan Pembiayaan + $totalpenebusan += $pembiayaanlelong; + + + //b + $bilangan_gadai = Gadai::on($connection)->where('t_gadai','=',$date)->where('pinjaman','>',0)->count(); + $bilangan_tebus = Tebus::on($connection)->where('t_tebus','=',$date)->count(); + $bilangan_ansuran = $ansurankaunter->count(); + $bilangan_ansuranonline = $ansuranonline->count(); + $bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','=',$date],['kodcaw',$kodcaw]])->count(); + + return [ + 'total_gadai'=>$total_gadai, + 'total_tebus'=>$totalpenebusan, + 'total_ansuran'=>$total_ansuran, + 'total_ansuranonline'=>$total_ansuranonline, + 'bilangan_gadai'=>$bilangan_gadai, + 'bilangan_tebus'=>$bilangan_tebus, + 'bilangan_ansuran'=>$bilangan_ansuran, + 'bilangan_ansuranonline'=>$bilangan_ansuranonline, + 'bilangan_customer_baru'=>$bilangan_customer_baru, + 'total_keuntungan_kaunter'=>floatval($total_keuntungan_kaunter), + 'total_keuntungan_online'=>floatval($total_keuntungan_online), + 'totalbayaranonline' => floatval($totalbayaranonline), + 'biltotalbayaranonline' => $biltotalbayaranonline, + 'totalbayaranonline' => floatval($totalbayaranonline), + 'upahsimpankaunter' => floatval($upahsimpankaunter), + 'keuntungansebenarkaunter' => floatval($keuntungansebenarkaunter), + ]; + } + + private function getPendahuluanSerahanHQ($date,$kodcaw,$connection) : Array{ + $serahanpkb = '1000/020'; + $pendahuluanpkb = '7000/102'; + + $totalserahan = GlDetail::on($connection) + ->where('ktacct','=',$serahanpkb) + ->where('descpt','not like', 'SERAHAN BAYAR ONLINE%') + ->where('tarikh','=', $date) + ->where('tarikh','>','2021-03-24') + ->sum('serahan'); + + $serahanbayaranOnline = GlDetail::on($connection) + ->where('ktacct','=',$serahanpkb) + ->where('descpt','like', 'SERAHAN BAYAR ONLINE%') + ->where('tarikh','=', $date) + ->where('tarikh','>','2021-03-24') + ->sum('serahan'); + + $totalpendahuluan = GlDetail::on($connection) + ->where('ktacct','=',$pendahuluanpkb) + ->where([['tarikh','=', $date],['tarikh','>','2021-03-24']]) + ->sum('pendahuluan'); + + return [ + 'totalserahan' => $totalserahan, + 'serahanonline' => $serahanbayaranOnline, + 'totalpendahuluan' => $totalpendahuluan + ]; + } + + private function getPerbelanjaan($date,$kodcaw,$connection) : Array{ + $belanjaam = Panjar::on($connection)->where('tag','=', 1)->where('tarikh','=', $date)->sum('bayaran'); + $baikidanselenggara = Panjar::on($connection)->where('tag','=', 2)->where('tarikh','=', $date)->sum('bayaran'); + $keraian = Panjar::on($connection)->where('tag','=', 3)->where('tarikh','=', $date)->sum('bayaran'); + + return [ + 'belanja' => $belanjaam, + 'baikidanselenggara' => $baikidanselenggara, + 'keraian' => $keraian + ]; + } + + private function getLelong($date,$kodcaw,$connection) : Array{ + + + $data_lelong = Lelong::on($connection)->where('t_jual','=',$date); + $data_lelong_baki = clone $data_lelong; + $data_lelong_baki->where('baki','>=',0); + $data_lelong_rugi = clone $data_lelong; + $data_lelong_rugi->where('baki','<',0); + + $bilangan_lelong = $data_lelong->count(); + $cas_lelong = $data_lelong->sum('cajlelong'); + $jumlah_lelong = $data_lelong->sum('hargajual'); + + $baki_lelong = $data_lelong_baki->sum('baki'); + $rugi_lelong = $data_lelong_rugi->sum('baki'); + + $tuntut_baki_rugi = TuntutBaki::on($connection)->where('tarikh','>=',$date)->where('jumlah','<',0); + $tuntut_baki_bayar = TuntutBaki::on($connection)->where('tarikh','>=',$date)->where('jumlah','>',0); + + $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah'); + + return [ + 'cas_lelong' => $cas_lelong, + 'jumlah_lelong' => $jumlah_lelong, + 'baki_lelong' => $baki_lelong, + 'rugi_lelong' => $rugi_lelong, + 'bayar_rugi_lelong' => $bayar_rugi_lelong, + 'bayar_baki_lelong' => $bayar_baki_lelong, + 'bilangan' => $bilangan_lelong + ]; + } + + private function getPeratusan($date,$kodcaw,$connection){ + $gadai_70 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','<=',70]])->sum('pinjaman'); + $gadai_75 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman'); + $gadai_80 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman'); + + $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80); + + $nilaimarhun_70 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','<=',70]])->sum('nilaimarhun'); + $nilaimarhun_75 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun'); + $nilaimarhun_80 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun'); + + $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80); + + $bilangan_70 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','<=',70]])->count(); + $bilangan_75 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','>',70],['percentpinj','<=',75]])->count(); + $bilangan_80 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','>',75],['percentpinj','<=',80]])->count(); + + $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80); + + return [ + 'gadai_70'=>$gadai_70, + 'gadai_75'=>$gadai_75, + 'gadai_80'=>$gadai_80, + 'total_gadaian'=>$total_gadaian, + 'nilaimarhun_70'=>$nilaimarhun_70, + 'nilaimarhun_75'=>$nilaimarhun_75, + 'nilaimarhun_80'=>$nilaimarhun_80, + 'total_nm'=>$total_nm, + 'bilangan_70'=>$bilangan_70, + 'bilangan_75'=>$bilangan_75, + 'bilangan_80'=>$bilangan_80, + 'total_bilangan'=>$total_bilangan, + ]; + + } + + public function StoreRingkasanHarian(){ + + $current = Carbon::now(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); + + foreach($cawangan as $index=>$caw){ + DB::connection($caw['mysql'])->beginTransaction(); + + try{ + + $getTransaksi = $this->getTransaksiHarian($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $getPendser = $this->getPendahuluanSerahanHQ($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $getPerbelanjaan = $this->getPerbelanjaan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $getLelong = $this->getLelong($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $getPeratusan = $this->getPeratusan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + + dd($getTransaksi,$getPendser,$getPerbelanjaan,$getLelong,$getPeratusan); + + $main = new RingkasanMain(); + $gadai = new RingkasanGadai(); + $tebus = new RingkasanTebus(); + $ansuran = new RingkasanAnsuran(); + $lelong = new RingkasanLelong(); + + $gadai->setConnection($caw['mysql']); + $gadai->setConnection($caw['mysql']); + $tebus->setConnection($caw['mysql']); + $lelong->setConnection($caw['mysql']); + $main->setConnection($caw['mysql']); + + /* main */ + $main->pelangganbaru = 10; + $main->pendahuluan = 10000; + $main->serahan = 10000; + $main->serahan_online = 10000; + $main->belanjaam = 10000; + $main->baikidanselenggara = 10000; + $main->keraian = 10000; + $main->date = $current->toDateTimeString(); + + /* gadai */ + $gadai->pembiayaan_dibayar = 10000; + $gadai->keuntungan_dibayar = 10000; + $main->gadai()->save($gadai); + + /* tebus */ + $tebus->pembiayaan_dibayar = 10000; + $tebus->keuntungan_dibayar = 10000; + $main->tebus()->save($tebus); + + /* ansuran */ + $ansuran->pembiayaan_dibayar = 10000; + $ansuran->keuntungan_dibayar = 10000; + $main->ansuran()->save($ansuran); + + /* lelong */ + $lelong->lelong_current = 10000; + $lelong->baki_lelong = 10000; + $lelong->rugi_lelong = 10000; + $lelong->bayaran_rugi = 10000; + $lelong->bayaran_baki = 10000; + $lelong->caj_lelong = 10000; + $lelong->bil_lelong = 10000; + $main->lelong()->save($lelong); + + $main->gad_id = $gadai->id; + $main->teb_id = $tebus->id; + $main->ans_id = $ansuran->id; + $main->lel_id = $lelong->id; + $main->save(); + + DB::connection($caw['mysql'])->commit(); + // return response()->json($result1,200); + }catch (\Exception $e) { + DB::connection($caw['mysql'])->rollback(); + return response()->json($e->getMessage(),400); + } + } + + } + +} diff --git a/config/database.php b/config/database.php index b7e9873..01a6d98 100644 --- a/config/database.php +++ b/config/database.php @@ -2,7 +2,7 @@ return [ - 'default' => 'accounts', + 'default' => 'mysql', 'connections' => [ 'lelong' => [ diff --git a/routes/web.php b/routes/web.php index ad15ed6..10b8ea3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -762,6 +762,11 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('laporan/online',['uses'=>'AdminPageController@LaporanOnline']); $router->get('laporan/tuntutbaki',['uses'=>'AdminPageController@LaporanTuntutBaki']); + $router->get('store/ringkasanharian',['uses'=>'AdminPageController@StoreRingkasanHarian']); + + + + }); $router->group(['prefix'=>'lelong'], function () use ($router){ From f04e71ccbf83dcc18b7e79f222a6e01f15b6e0f2 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 6 Jun 2023 07:24:17 +0800 Subject: [PATCH 2/9] fix ringkasanbackup --- app/Http/Controllers/AdminPageController.php | 11 + app/RingkasanAnsuran.php | 3 +- app/RingkasanGadai.php | 3 +- app/RingkasanLelong.php | 3 +- app/RingkasanMain.php | 192 +++++++++++++++- app/RingkasanTebus.php | 4 +- app/Services/RingkasanHarianServices.php | 217 +++++++++++++------ routes/web.php | 1 + 8 files changed, 364 insertions(+), 70 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 28c2c7c..42465ab 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -3634,4 +3634,15 @@ class AdminPageController extends Controller } + + public function getRingkasanHarian(Request $request){ + + $current = Carbon::now(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); + + $ringkasan = new RingkasanHarianServices; + $test = $ringkasan->getRingkasanHarian(); + + dd($test); + } } diff --git a/app/RingkasanAnsuran.php b/app/RingkasanAnsuran.php index b8d9153..86ba90c 100644 --- a/app/RingkasanAnsuran.php +++ b/app/RingkasanAnsuran.php @@ -8,10 +8,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class RingkasanAnsuran extends Model { protected $table = 'ringkasan_ansuran'; + protected $primaryKey = 'ans_id'; public function main(): BelongsTo { - return $this->belongsTo(RingkasanMain::class); + return $this->belongsTo(RingkasanMain::class, 'ans_id', 'ans_id'); } public $timestamps = false; diff --git a/app/RingkasanGadai.php b/app/RingkasanGadai.php index 7bfd0e8..377e858 100644 --- a/app/RingkasanGadai.php +++ b/app/RingkasanGadai.php @@ -8,10 +8,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class RingkasanGadai extends Model { protected $table = 'ringkasan_gadai'; + protected $primaryKey = 'gad_id'; public function main(): BelongsTo { - return $this->belongsTo(RingkasanMain::class); + return $this->belongsTo(RingkasanMain::class, 'gad_id', 'gad_id'); } public $timestamps = false; diff --git a/app/RingkasanLelong.php b/app/RingkasanLelong.php index 7e303a0..900e063 100644 --- a/app/RingkasanLelong.php +++ b/app/RingkasanLelong.php @@ -8,10 +8,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class RingkasanLelong extends Model { protected $table = 'ringkasan_lelong'; + protected $primaryKey = 'lel_id'; public function main(): BelongsTo { - return $this->belongsTo(RingkasanMain::class); + return $this->belongsTo(RingkasanMain::class, 'lel_id', 'lel_id'); } public $timestamps = false; diff --git a/app/RingkasanMain.php b/app/RingkasanMain.php index 7916deb..f5e0654 100644 --- a/app/RingkasanMain.php +++ b/app/RingkasanMain.php @@ -3,6 +3,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Relations\HasOne; class RingkasanMain extends Model @@ -11,24 +12,207 @@ class RingkasanMain extends Model public function gadai(): HasOne { - return $this->hasOne(RingkasanGadai::class, 'gad_id'); + return $this->hasOne(RingkasanGadai::class, 'gad_id', 'gad_id'); } public function ansuran(): HasOne { - return $this->hasOne(RingkasanAnsuran::class, 'ans_id'); + return $this->hasOne(RingkasanAnsuran::class, 'ans_id', 'ans_id'); } public function lelong(): HasOne { - return $this->hasOne(RingkasanLelong::class, 'lel_id'); + return $this->hasOne(RingkasanLelong::class, 'lel_id', 'lel_id'); } public function tebus(): HasOne { - return $this->hasOne(RingkasanTebus::class, 'teb_id'); + return $this->hasOne(RingkasanTebus::class, 'teb_id', 'teb_id'); } + public function scopeJumlahGadai($query) : Float + { + $gadai = $query->with('gadai')->get(); + + return $gadai->sum(function ($gad){ + return $gad->gadai->sum('jumlah_pembiayaan'); + }); + } + + public function scopeBilanganGadai($query) : Float + { + $gadai = $query->with('gadai')->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->sum('bilangan_pembiayaan'); + }); + } + + public function scopePendahuluan($query) : Float + { + return $query->sum('pendahuluan'); + } + + public function scopePelanggan($query) : Int + { + return $query->sum('pelangganbaru'); + } + + public function scopeSerahan($query) : Float + { + return $query->sum('serahan'); + } + + public function scopeSerahanOnline($query) : Float + { + return $query->sum('serahan_online'); + } + + public function scopeBelanjaAm($query) : Float + { + return $query->sum('belanjaam'); + } + + public function scopeBaikiDanSelenggara($query) : Float + { + return $query->sum('baikidanselenggara'); + } + + public function scopeKeraian($query) : Float + { + return $query->sum('keraian'); + } + + public function scopePenebusan($query) : Float + { + $tebus = $query->with('tebus')->get(); + return $tebus->sum(function ($gad){ + return $gad->tebus->sum('pembiayaan_dibayar'); + }); + } + + public function scopeKeuntunganPenebusan($query) : Float + { + $tebus = $query->with('tebus')->get(); + return $tebus->sum(function ($gad){ + return $gad->tebus->sum('keuntungan_dibayar'); + }); + } + + public function scopeBilanganPenebusan($query) : Float + { + $tebus = $query->with('tebus')->get(); + return $tebus->sum(function ($gad){ + return $gad->tebus->sum('bilangan_tebus'); + }); + } + + public function scopeJumlahLelong($query) : Float + { + $lelong = $query->with('lelong')->get(); + return $lelong->sum(function ($gad){ + return $gad->lelong->sum('lelong_current'); + }); + } + + public function scopeBakiLelong($query) : Float + { + $lelong = $query->with('lelong')->get(); + return $lelong->sum(function ($gad){ + return $gad->lelong->sum('baki_lelong'); + }); + } + + public function scopeRugiLelong($query) : Float + { + $lelong = $query->with('lelong')->get(); + return $lelong->sum(function ($gad){ + return $gad->lelong->sum('rugi_lelong'); + }); + } + + public function scopeBayaranRugi($query) : Float + { + $lelong = $query->with('lelong')->get(); + return $lelong->sum(function ($gad){ + return $gad->lelong->sum('bayaran_rugi'); + }); + } + + public function scopeBayaranBaki($query) : Float + { + $lelong = $query->with('lelong')->get(); + return $lelong->sum(function ($gad){ + return $gad->lelong->sum('bayaran_baki'); + }); + } + + public function scopeCajLelong($query) : Float + { + $lelong = $query->with('lelong')->get(); + return $lelong->sum(function ($gad){ + return $gad->lelong->sum('caj_lelong'); + }); + } + + public function scopeBilLelong($query) : Float + { + $lelong = $query->with('lelong')->get(); + return $lelong->sum(function ($gad){ + return $gad->lelong->sum('bil_lelong'); + }); + } + + public function scopePembiayaanAnsuran($query) : Float + { + $ansuran = $query->with('ansuran')->get(); + return $ansuran->sum(function ($gad){ + return $gad->ansuran->sum('pembiayaan_dibayar'); + }); + } + + public function scopeKeuntunganAnsuran($query) : Float + { + $ansuran = $query->with('ansuran')->get(); + return $ansuran->sum(function ($gad){ + return $gad->ansuran->sum('keuntungan_dibayar'); + }); + } + + public function scopeBilAnsuran($query) : Float + { + $ansuran = $query->with('ansuran')->get(); + return $ansuran->sum(function ($gad){ + return $gad->ansuran->sum('bilangan_ansuran'); + }); + } + + public function scopePembiayaanOnline($query) : Float + { + $ansuran = $query->with('ansuran')->get(); + return $ansuran->sum(function ($gad){ + return $gad->ansuran->sum('pembiayaan_dibayar_online'); + }); + } + + public function scopeKeuntunganOnline($query) : Float + { + $ansuran = $query->with('ansuran')->get(); + return $ansuran->sum(function ($gad){ + return $gad->ansuran->sum('keuntungan_dibayar_online'); + }); + } + + public function scopeBilOnline($query) : Float + { + $ansuran = $query->with('ansuran')->get(); + return $ansuran->sum(function ($gad){ + return $gad->ansuran->sum('bilangan_bayaran_online'); + }); + } + + + public $timestamps = false; } \ No newline at end of file diff --git a/app/RingkasanTebus.php b/app/RingkasanTebus.php index 7a8bfb9..48aafb3 100644 --- a/app/RingkasanTebus.php +++ b/app/RingkasanTebus.php @@ -9,9 +9,11 @@ class RingkasanTebus extends Model { protected $table = 'ringkasan_tebus'; + protected $primaryKey = 'teb_id'; + public function main(): BelongsTo { - return $this->belongsTo(RingkasanMain::class); + return $this->belongsTo(RingkasanMain::class, 'teb_id', 'teb_id'); } public $timestamps = false; diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php index cdde025..cd8e60c 100644 --- a/app/Services/RingkasanHarianServices.php +++ b/app/Services/RingkasanHarianServices.php @@ -21,12 +21,13 @@ use App\TuntutBaki; use Illuminate\Support\Facades\Http; use Carbon\Carbon; +use Carbon\CarbonPeriod; use Illuminate\Support\Facades\DB; class RingkasanHarianServices { - protected float $tunaiditangan = 0; + // protected float $tunaiditangan = 0; private function getTransaksiHarian($date,$kodcaw,$connection) : Array { @@ -376,83 +377,175 @@ class RingkasanHarianServices public function StoreRingkasanHarian(){ - $current = Carbon::now(); + $period = CarbonPeriod::create('2023-01-01', '2023-01-01'); $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); - foreach($cawangan as $index=>$caw){ - DB::connection($caw['mysql'])->beginTransaction(); + // foreach() + foreach($period as $current) + { + foreach($cawangan as $index=>$caw){ + DB::connection($caw['mysql'])->beginTransaction(); - try{ + try{ - $getTransaksi = $this->getTransaksiHarian($current->toDateString(),$caw['kodcaw'],$caw['mysql']); - $getPendser = $this->getPendahuluanSerahanHQ($current->toDateString(),$caw['kodcaw'],$caw['mysql']); - $getPerbelanjaan = $this->getPerbelanjaan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); - $getLelong = $this->getLelong($current->toDateString(),$caw['kodcaw'],$caw['mysql']); - $getPeratusan = $this->getPeratusan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); - - dd($getTransaksi,$getPendser,$getPerbelanjaan,$getLelong,$getPeratusan); + $getTransaksi = $this->getTransaksiHarian($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $getPendser = $this->getPendahuluanSerahanHQ($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $getPerbelanjaan = $this->getPerbelanjaan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $getLelong = $this->getLelong($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $getPeratusan = $this->getPeratusan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); + $bilangan_tebus = $getLelong['bilangan'] + $getTransaksi['bilangan_tebus']; - $main = new RingkasanMain(); - $gadai = new RingkasanGadai(); - $tebus = new RingkasanTebus(); - $ansuran = new RingkasanAnsuran(); - $lelong = new RingkasanLelong(); + $condition = RingkasanMain::where('date',$current->toDateString())->first(); - $gadai->setConnection($caw['mysql']); - $gadai->setConnection($caw['mysql']); - $tebus->setConnection($caw['mysql']); - $lelong->setConnection($caw['mysql']); - $main->setConnection($caw['mysql']); + if($condition){ + $gadai = RingkasanGadai::find($condition['gad_id']); + $tebus = RingkasanTebus::find($condition['gad_id']); + $ansuran = RingkasanAnsuran::find($condition['gad_id']); + $lelong = RingkasanLelong::find($condition['gad_id']); + $main = RingkasanMain::where('date',$current->toDateString())->first(); + }else{ + $main = new RingkasanMain(); + $gadai = new RingkasanGadai(); + $tebus = new RingkasanTebus(); + $ansuran = new RingkasanAnsuran(); + $lelong = new RingkasanLelong(); + } - /* main */ - $main->pelangganbaru = 10; - $main->pendahuluan = 10000; - $main->serahan = 10000; - $main->serahan_online = 10000; - $main->belanjaam = 10000; - $main->baikidanselenggara = 10000; - $main->keraian = 10000; - $main->date = $current->toDateTimeString(); + $gadai->setConnection($caw['mysql']); + $gadai->setConnection($caw['mysql']); + $tebus->setConnection($caw['mysql']); + $lelong->setConnection($caw['mysql']); + $main->setConnection($caw['mysql']); - /* gadai */ - $gadai->pembiayaan_dibayar = 10000; - $gadai->keuntungan_dibayar = 10000; - $main->gadai()->save($gadai); + /* 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(); - /* tebus */ - $tebus->pembiayaan_dibayar = 10000; - $tebus->keuntungan_dibayar = 10000; - $main->tebus()->save($tebus); + /* gadai */ + $gadai->jumlah_pembiayaan = ($getTransaksi['total_gadai']) ? $getTransaksi['total_gadai'] : 0; + $gadai->bilangan_pembiayaan = ($getTransaksi['bilangan_gadai']) ? $getTransaksi['bilangan_gadai'] : 0; + $main->gadai()->save($gadai); - /* ansuran */ - $ansuran->pembiayaan_dibayar = 10000; - $ansuran->keuntungan_dibayar = 10000; - $main->ansuran()->save($ansuran); + /* 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; + $main->tebus()->save($tebus); - /* lelong */ - $lelong->lelong_current = 10000; - $lelong->baki_lelong = 10000; - $lelong->rugi_lelong = 10000; - $lelong->bayaran_rugi = 10000; - $lelong->bayaran_baki = 10000; - $lelong->caj_lelong = 10000; - $lelong->bil_lelong = 10000; - $main->lelong()->save($lelong); + /* 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; + $main->ansuran()->save($ansuran); - $main->gad_id = $gadai->id; - $main->teb_id = $tebus->id; - $main->ans_id = $ansuran->id; - $main->lel_id = $lelong->id; - $main->save(); + /* 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; + $main->lelong()->save($lelong); - DB::connection($caw['mysql'])->commit(); - // return response()->json($result1,200); - }catch (\Exception $e) { - DB::connection($caw['mysql'])->rollback(); - return response()->json($e->getMessage(),400); + if(!$condition){ + $main->gad_id = $gadai->id; + $main->teb_id = $tebus->id; + $main->ans_id = $ansuran->id; + $main->lel_id = $lelong->id; + $main->save(); + } + + + + + DB::connection($caw['mysql'])->commit(); + return response('success'); + }catch (\Exception $e) { + dd($e); + DB::connection($caw['mysql'])->rollback(); + return response()->json($e->getMessage(),400); + } } } } + public function getRingkasanHarian() : Array{ + + //gadai + $totalgadai = RingkasanMain::JumlahGadai(); + $bilangangadai = RingkasanMain::BilanganGadai(); + + //main + $pendahuluan = RingkasanMain::pendahuluan(); + $pelanggan = RingkasanMain::pelanggan(); + $serahan = RingkasanMain::Serahan(); + $serahanonline = RingkasanMain::SerahanOnline(); + $belanja = RingkasanMain::BelanjaAm(); + $baiki = RingkasanMain::BaikiDanSelenggara(); + $keraian = RingkasanMain::Keraian(); + + //tebus + $tebus = RingkasanMain::penebusan(); + $tebus_keuntungan = RingkasanMain::KeuntunganPenebusan(); + $bilangan_tebus = RingkasanMain::BilanganPenebusan(); + + //lelong + $jumlahlelong = RingkasanMain::JumlahLelong(); + $bakilelong = RingkasanMain::BakiLelong(); + $rugilelong = RingkasanMain::RugiLelong(); + $bayaranrugi = RingkasanMain::BayaranRugi(); + $bayaranbaki = RingkasanMain::BayaranBaki(); + $cajlelong = RingkasanMain::CajLelong(); + $billelong = RingkasanMain::BilLelong(); + + + //ansuran + $pembiayaanansuran = RingkasanMain::PembiayaanAnsuran(); + $keuntunganansuran = RingkasanMain::KeuntunganAnsuran(); + $bilansuran = RingkasanMain::BilAnsuran(); + $pembiayaanonline = RingkasanMain::PembiayaanOnline(); + $keuntunganonline = RingkasanMain::KeuntunganOnline(); + $bilonline = RingkasanMain::BilOnline(); + + + return [ + 'totalgadai' => $totalgadai, + 'bilangangadai' => $bilangangadai, + 'pendahuluan' => $pendahuluan, + 'pelanggan' => $pelanggan, + 'serahan' => $serahan, + 'serahanonline' => $serahanonline, + 'belanja' => $belanja, + 'baiki' => $baiki, + 'keraian' => $keraian, + 'tebus' => $tebus, + 'tebus_keuntungan' => $tebus_keuntungan, + 'bilangan_tebus' => $bilangan_tebus, + 'jumlahlelong' => $jumlahlelong, + 'bakilelong' => $bakilelong, + 'rugilelong' => $rugilelong, + 'bayaranrugi' => $bayaranrugi, + 'bayaranbaki' => $bayaranbaki, + 'cajlelong' => $cajlelong, + 'billelong' => $billelong, + 'pembiayaanansuran' => $pembiayaanansuran, + 'keuntunganansuran' => $keuntunganansuran, + 'bilansuran' => $bilansuran, + 'pembiayaanonline' => $pembiayaanonline, + 'keuntunganonline' => $keuntunganonline, + 'bilonline' => $bilonline + ]; + } + } diff --git a/routes/web.php b/routes/web.php index 10b8ea3..674eacb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -763,6 +763,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('laporan/tuntutbaki',['uses'=>'AdminPageController@LaporanTuntutBaki']); $router->get('store/ringkasanharian',['uses'=>'AdminPageController@StoreRingkasanHarian']); + $router->get('get/ringkasanharian',['uses'=>'AdminPageController@getRingkasanHarian']); From 6ae8ccbbdde2a013d5280894d2fe0e4668941263 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 6 Jun 2023 16:54:46 +0800 Subject: [PATCH 3/9] fix second commit --- app/Http/Controllers/AdminPageController.php | 5 +- app/RingkasanMain.php | 320 +++++++++++++++---- app/Services/RingkasanHarianServices.php | 115 ++++--- 3 files changed, 330 insertions(+), 110 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 42465ab..1ce675d 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -3630,8 +3630,9 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); $ringkasan = new RingkasanHarianServices; - $ringkasan->StoreRingkasanHarian(); + $res = $ringkasan->StoreRingkasanHarian(); + return response($res); } @@ -3641,7 +3642,7 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); $ringkasan = new RingkasanHarianServices; - $test = $ringkasan->getRingkasanHarian(); + $test = $ringkasan->getRingkasanHarian($request->mula,$request->hingga); dd($test); } diff --git a/app/RingkasanMain.php b/app/RingkasanMain.php index f5e0654..80f89d5 100644 --- a/app/RingkasanMain.php +++ b/app/RingkasanMain.php @@ -30,184 +30,368 @@ class RingkasanMain extends Model return $this->hasOne(RingkasanTebus::class, 'teb_id', 'teb_id'); } - public function scopeJumlahGadai($query) : Float + public function scopeJumlahGadai($query,$mula,$hingga) : Float { - $gadai = $query->with('gadai')->get(); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); return $gadai->sum(function ($gad){ - return $gad->gadai->sum('jumlah_pembiayaan'); + return $gad->gadai->jumlah_pembiayaan; }); } - public function scopeBilanganGadai($query) : Float + public function scopeBilanganGadai($query,$mula,$hingga) : Float { - $gadai = $query->with('gadai')->get(); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); return $gadai->sum(function($gad){ - return $gad->gadai->sum('bilangan_pembiayaan'); + return $gad->gadai->bilangan_pembiayaan; }); } - public function scopePendahuluan($query) : Float + public function scopeGadai70($query,$mula,$hingga) : Float { - return $query->sum('pendahuluan'); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->gadai_70; + }); } - public function scopePelanggan($query) : Int + public function scopeGadai75($query,$mula,$hingga) : Float { - return $query->sum('pelangganbaru'); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->gadai_75; + }); } - public function scopeSerahan($query) : Float + public function scopeGadai80($query,$mula,$hingga) : Float { - return $query->sum('serahan'); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->gadai_80; + }); } - public function scopeSerahanOnline($query) : Float + public function scopeNm70($query,$mula,$hingga) : Float { - return $query->sum('serahan_online'); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->nm_70; + }); } - public function scopeBelanjaAm($query) : Float + public function scopeNm75($query,$mula,$hingga) : Float { - return $query->sum('belanjaam'); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->nm_75; + }); } - public function scopeBaikiDanSelenggara($query) : Float + + public function scopeNm80($query,$mula,$hingga) : Float { - return $query->sum('baikidanselenggara'); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->nm_80; + }); } - public function scopeKeraian($query) : Float + public function scopeBil70($query,$mula,$hingga) : Float { - return $query->sum('keraian'); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->bil_70; + }); } - public function scopePenebusan($query) : Float + public function scopeBil75($query,$mula,$hingga) : Float { - $tebus = $query->with('tebus')->get(); + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->bil_75; + }); + } + + public function scopeBil80($query,$mula,$hingga) : Float + { + $from = date($mula); + $to = date($hingga); + + $gadai = $query->with('gadai')->whereBetween('date', [$from, $to])->get(); + + return $gadai->sum(function($gad){ + return $gad->gadai->bil_80; + }); + } + + public function scopePendahuluan($query,$mula,$hingga) : Float + { + $from = date($mula); + $to = date($hingga); + + return $query->whereBetween('date', [$from, $to])->sum('pendahuluan'); + } + + public function scopePelanggan($query,$mula,$hingga) : Int + { + $from = date($mula); + $to = date($hingga); + + return $query->whereBetween('date', [$from, $to])->sum('pelangganbaru'); + } + + public function scopeSerahan($query,$mula,$hingga) : Float + { + $from = date($mula); + $to = date($hingga); + + return $query->whereBetween('date', [$from, $to])->sum('serahan'); + } + + public function scopeSerahanOnline($query,$mula,$hingga) : Float + { + $from = date($mula); + $to = date($hingga); + + return $query->whereBetween('date', [$from, $to])->sum('serahan_online'); + } + + public function scopeBelanjaAm($query,$mula,$hingga) : Float + { + $from = date($mula); + $to = date($hingga); + + return $query->whereBetween('date', [$from, $to])->sum('belanjaam'); + } + + public function scopeBaikiDanSelenggara($query,$mula,$hingga) : Float + { + $from = date($mula); + $to = date($hingga); + + return $query->whereBetween('date', [$from, $to])->sum('baikidanselenggara'); + } + + public function scopeKeraian($query,$mula,$hingga) : Float + { + $from = date($mula); + $to = date($hingga); + + return $query->whereBetween('date', [$from, $to])->sum('keraian'); + } + + public function scopePenebusan($query,$mula,$hingga) : Float + { + $from = date($mula); + $to = date($hingga); + + $tebus = $query->with('tebus')->whereBetween('date', [$from, $to])->get(); return $tebus->sum(function ($gad){ - return $gad->tebus->sum('pembiayaan_dibayar'); + return $gad->tebus->pembiayaan_dibayar; }); } - public function scopeKeuntunganPenebusan($query) : Float + public function scopeKeuntunganPenebusan($query,$mula,$hingga) : Float { - $tebus = $query->with('tebus')->get(); + $from = date($mula); + $to = date($hingga); + + $tebus = $query->with('tebus')->whereBetween('date', [$from, $to])->get(); return $tebus->sum(function ($gad){ - return $gad->tebus->sum('keuntungan_dibayar'); + return $gad->tebus->keuntungan_dibayar; }); } - public function scopeBilanganPenebusan($query) : Float + public function scopeBilanganPenebusan($query,$mula,$hingga) : Float { - $tebus = $query->with('tebus')->get(); + $from = date($mula); + $to = date($hingga); + + $tebus = $query->with('tebus')->whereBetween('date', [$from, $to])->get(); return $tebus->sum(function ($gad){ - return $gad->tebus->sum('bilangan_tebus'); + return $gad->tebus->bilangan_tebus; }); } - public function scopeJumlahLelong($query) : Float + public function scopeJumlahLelong($query,$mula,$hingga) : Float { - $lelong = $query->with('lelong')->get(); + $from = date($mula); + $to = date($hingga); + + $lelong = $query->with('lelong')->whereBetween('date', [$from, $to])->get(); return $lelong->sum(function ($gad){ - return $gad->lelong->sum('lelong_current'); + return $gad->lelong->lelong_current; }); } - public function scopeBakiLelong($query) : Float + public function scopeBakiLelong($query,$mula,$hingga) : Float { - $lelong = $query->with('lelong')->get(); + $from = date($mula); + $to = date($hingga); + + $lelong = $query->with('lelong')->whereBetween('date', [$from, $to])->get(); return $lelong->sum(function ($gad){ - return $gad->lelong->sum('baki_lelong'); + return $gad->lelong->baki_lelong; }); } - public function scopeRugiLelong($query) : Float + public function scopeRugiLelong($query,$mula,$hingga) : Float { - $lelong = $query->with('lelong')->get(); + $from = date($mula); + $to = date($hingga); + + $lelong = $query->with('lelong')->whereBetween('date', [$from, $to])->get(); return $lelong->sum(function ($gad){ - return $gad->lelong->sum('rugi_lelong'); + return $gad->lelong->rugi_lelong; }); } - public function scopeBayaranRugi($query) : Float + public function scopeBayaranRugi($query,$mula,$hingga) : Float { - $lelong = $query->with('lelong')->get(); + $from = date($mula); + $to = date($hingga); + + $lelong = $query->with('lelong')->whereBetween('date', [$from, $to])->get(); return $lelong->sum(function ($gad){ - return $gad->lelong->sum('bayaran_rugi'); + return $gad->lelong->bayaran_rugi; }); } - public function scopeBayaranBaki($query) : Float + public function scopeBayaranBaki($query,$mula,$hingga) : Float { - $lelong = $query->with('lelong')->get(); + $from = date($mula); + $to = date($hingga); + + $lelong = $query->with('lelong')->whereBetween('date', [$from, $to])->get(); return $lelong->sum(function ($gad){ - return $gad->lelong->sum('bayaran_baki'); + return $gad->lelong->bayaran_baki; }); } - public function scopeCajLelong($query) : Float + public function scopeCajLelong($query,$mula,$hingga) : Float { - $lelong = $query->with('lelong')->get(); + $from = date($mula); + $to = date($hingga); + + $lelong = $query->with('lelong')->whereBetween('date', [$from, $to])->get(); return $lelong->sum(function ($gad){ - return $gad->lelong->sum('caj_lelong'); + return $gad->lelong->caj_lelong; }); } - public function scopeBilLelong($query) : Float + public function scopeBilLelong($query,$mula,$hingga) : Float { - $lelong = $query->with('lelong')->get(); + $from = date($mula); + $to = date($hingga); + + $lelong = $query->with('lelong')->whereBetween('date', [$from, $to])->get(); return $lelong->sum(function ($gad){ - return $gad->lelong->sum('bil_lelong'); + return $gad->lelong->bil_lelong; }); } - public function scopePembiayaanAnsuran($query) : Float + public function scopePembiayaanAnsuran($query,$mula,$hingga) : Float { - $ansuran = $query->with('ansuran')->get(); + $from = date($mula); + $to = date($hingga); + + $ansuran = $query->with('ansuran')->whereBetween('date', [$from, $to])->get(); return $ansuran->sum(function ($gad){ - return $gad->ansuran->sum('pembiayaan_dibayar'); + return $gad->ansuran->pembiayaan_dibayar; }); } - public function scopeKeuntunganAnsuran($query) : Float + public function scopeKeuntunganAnsuran($query,$mula,$hingga) : Float { - $ansuran = $query->with('ansuran')->get(); + $from = date($mula); + $to = date($hingga); + + $ansuran = $query->with('ansuran')->whereBetween('date', [$from, $to])->get(); return $ansuran->sum(function ($gad){ - return $gad->ansuran->sum('keuntungan_dibayar'); + return $gad->ansuran->keuntungan_dibayar; }); } - public function scopeBilAnsuran($query) : Float + public function scopeBilAnsuran($query,$mula,$hingga) : Float { - $ansuran = $query->with('ansuran')->get(); + $from = date($mula); + $to = date($hingga); + + $ansuran = $query->with('ansuran')->whereBetween('date', [$from, $to])->get(); return $ansuran->sum(function ($gad){ - return $gad->ansuran->sum('bilangan_ansuran'); + return $gad->ansuran->bilangan_ansuran; }); } - public function scopePembiayaanOnline($query) : Float + public function scopePembiayaanOnline($query,$mula,$hingga) : Float { - $ansuran = $query->with('ansuran')->get(); + $from = date($mula); + $to = date($hingga); + + $ansuran = $query->with('ansuran')->whereBetween('date', [$from, $to])->get(); return $ansuran->sum(function ($gad){ - return $gad->ansuran->sum('pembiayaan_dibayar_online'); + return $gad->ansuran->pembiayaan_dibayar_online; }); } - public function scopeKeuntunganOnline($query) : Float + public function scopeKeuntunganOnline($query,$mula,$hingga) : Float { - $ansuran = $query->with('ansuran')->get(); + $from = date($mula); + $to = date($hingga); + + $ansuran = $query->with('ansuran')->whereBetween('date', [$from, $to])->get(); return $ansuran->sum(function ($gad){ - return $gad->ansuran->sum('keuntungan_dibayar_online'); + return $gad->ansuran->keuntungan_dibayar_online; }); } - public function scopeBilOnline($query) : Float + public function scopeBilOnline($query,$mula,$hingga) : Float { - $ansuran = $query->with('ansuran')->get(); + $from = date($mula); + $to = date($hingga); + + $ansuran = $query->with('ansuran')->whereBetween('date', [$from, $to])->get(); return $ansuran->sum(function ($gad){ - return $gad->ansuran->sum('bilangan_bayaran_online'); + return $gad->ansuran->bilangan_bayaran_online; }); } diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php index cd8e60c..7c1f4f0 100644 --- a/app/Services/RingkasanHarianServices.php +++ b/app/Services/RingkasanHarianServices.php @@ -356,7 +356,7 @@ class RingkasanHarianServices $bilangan_75 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','>',70],['percentpinj','<=',75]])->count(); $bilangan_80 = Gadai::on($connection)->where([['t_gadai','=',$date],['percentpinj','>',75],['percentpinj','<=',80]])->count(); - $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80); + $total_bilangan = intval($bilangan_70) + intval($bilangan_75) + intval($bilangan_80); return [ 'gadai_70'=>$gadai_70, @@ -377,12 +377,11 @@ class RingkasanHarianServices public function StoreRingkasanHarian(){ - $period = CarbonPeriod::create('2023-01-01', '2023-01-01'); + $period = CarbonPeriod::create('2023-01-01', '2023-03-31'); $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); // foreach() - foreach($period as $current) - { + foreach($period as $current){ foreach($cawangan as $index=>$caw){ DB::connection($caw['mysql'])->beginTransaction(); @@ -399,9 +398,9 @@ class RingkasanHarianServices if($condition){ $gadai = RingkasanGadai::find($condition['gad_id']); - $tebus = RingkasanTebus::find($condition['gad_id']); - $ansuran = RingkasanAnsuran::find($condition['gad_id']); - $lelong = RingkasanLelong::find($condition['gad_id']); + $tebus = RingkasanTebus::find($condition['teb_id']); + $ansuran = RingkasanAnsuran::find($condition['ans_id']); + $lelong = RingkasanLelong::find($condition['lel_id']); $main = RingkasanMain::where('date',$current->toDateString())->first(); }else{ $main = new RingkasanMain(); @@ -430,13 +429,20 @@ class RingkasanHarianServices /* gadai */ $gadai->jumlah_pembiayaan = ($getTransaksi['total_gadai']) ? $getTransaksi['total_gadai'] : 0; $gadai->bilangan_pembiayaan = ($getTransaksi['bilangan_gadai']) ? $getTransaksi['bilangan_gadai'] : 0; - $main->gadai()->save($gadai); + $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; - $main->tebus()->save($tebus); /* ansuran */ $ansuran->pembiayaan_dibayar = ($getTransaksi['total_ansuran']) ? $getTransaksi['total_ansuran'] : 0; @@ -445,7 +451,6 @@ class RingkasanHarianServices $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; - $main->ansuran()->save($ansuran); /* lelong */ $lelong->lelong_current = ($getLelong['jumlah_lelong']) ? $getLelong['jumlah_lelong'] : 0; @@ -455,21 +460,31 @@ class RingkasanHarianServices $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; - $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->id; $main->teb_id = $tebus->id; $main->ans_id = $ansuran->id; $main->lel_id = $lelong->id; - $main->save(); + }else{ + $ansuran->save(); + $tebus->save(); + $lelong->save(); + $gadai->save(); } + $main->save(); DB::connection($caw['mysql'])->commit(); - return response('success'); }catch (\Exception $e) { dd($e); DB::connection($caw['mysql'])->rollback(); @@ -478,45 +493,56 @@ class RingkasanHarianServices } } + return response('success'); } - public function getRingkasanHarian() : Array{ + public function getRingkasanHarian($date1,$date2) : Array{ //gadai - $totalgadai = RingkasanMain::JumlahGadai(); - $bilangangadai = RingkasanMain::BilanganGadai(); + $totalgadai = RingkasanMain::JumlahGadai($date1,$date2); + $bilangangadai = RingkasanMain::BilanganGadai($date1,$date2); + $gadai70 = RingkasanMain::Gadai70($date1,$date2); + $gadai75 = RingkasanMain::Gadai75($date1,$date2); + $gadai80 = RingkasanMain::Gadai80($date1,$date2); + $nilaimarhun70 = RingkasanMain::Nm70($date1,$date2); + $nilaimarhun75 = RingkasanMain::Nm75($date1,$date2); + $nilaimarhun80 = RingkasanMain::Nm80($date1,$date2); + $bilangan70 = RingkasanMain::Bil70($date1,$date2); + $bilangan75 = RingkasanMain::Bil75($date1,$date2); + $bilangan80 = RingkasanMain::Bil80($date1,$date2); + //main - $pendahuluan = RingkasanMain::pendahuluan(); - $pelanggan = RingkasanMain::pelanggan(); - $serahan = RingkasanMain::Serahan(); - $serahanonline = RingkasanMain::SerahanOnline(); - $belanja = RingkasanMain::BelanjaAm(); - $baiki = RingkasanMain::BaikiDanSelenggara(); - $keraian = RingkasanMain::Keraian(); + $pendahuluan = RingkasanMain::pendahuluan($date1,$date2); + $pelanggan = RingkasanMain::pelanggan($date1,$date2); + $serahan = RingkasanMain::Serahan($date1,$date2); + $serahanonline = RingkasanMain::SerahanOnline($date1,$date2); + $belanja = RingkasanMain::BelanjaAm($date1,$date2); + $baiki = RingkasanMain::BaikiDanSelenggara($date1,$date2); + $keraian = RingkasanMain::Keraian($date1,$date2); //tebus - $tebus = RingkasanMain::penebusan(); - $tebus_keuntungan = RingkasanMain::KeuntunganPenebusan(); - $bilangan_tebus = RingkasanMain::BilanganPenebusan(); + $tebus = RingkasanMain::penebusan($date1,$date2); + $tebus_keuntungan = RingkasanMain::KeuntunganPenebusan($date1,$date2); + $bilangan_tebus = RingkasanMain::BilanganPenebusan($date1,$date2); //lelong - $jumlahlelong = RingkasanMain::JumlahLelong(); - $bakilelong = RingkasanMain::BakiLelong(); - $rugilelong = RingkasanMain::RugiLelong(); - $bayaranrugi = RingkasanMain::BayaranRugi(); - $bayaranbaki = RingkasanMain::BayaranBaki(); - $cajlelong = RingkasanMain::CajLelong(); - $billelong = RingkasanMain::BilLelong(); + $jumlahlelong = RingkasanMain::JumlahLelong($date1,$date2); + $bakilelong = RingkasanMain::BakiLelong($date1,$date2); + $rugilelong = RingkasanMain::RugiLelong($date1,$date2); + $bayaranrugi = RingkasanMain::BayaranRugi($date1,$date2); + $bayaranbaki = RingkasanMain::BayaranBaki($date1,$date2); + $cajlelong = RingkasanMain::CajLelong($date1,$date2); + $billelong = RingkasanMain::BilLelong($date1,$date2); //ansuran - $pembiayaanansuran = RingkasanMain::PembiayaanAnsuran(); - $keuntunganansuran = RingkasanMain::KeuntunganAnsuran(); - $bilansuran = RingkasanMain::BilAnsuran(); - $pembiayaanonline = RingkasanMain::PembiayaanOnline(); - $keuntunganonline = RingkasanMain::KeuntunganOnline(); - $bilonline = RingkasanMain::BilOnline(); + $pembiayaanansuran = RingkasanMain::PembiayaanAnsuran($date1,$date2); + $keuntunganansuran = RingkasanMain::KeuntunganAnsuran($date1,$date2); + $bilansuran = RingkasanMain::BilAnsuran($date1,$date2); + $pembiayaanonline = RingkasanMain::PembiayaanOnline($date1,$date2); + $keuntunganonline = RingkasanMain::KeuntunganOnline($date1,$date2); + $bilonline = RingkasanMain::BilOnline($date1,$date2); return [ @@ -544,7 +570,16 @@ class RingkasanHarianServices 'bilansuran' => $bilansuran, 'pembiayaanonline' => $pembiayaanonline, 'keuntunganonline' => $keuntunganonline, - 'bilonline' => $bilonline + 'bilonline' => $bilonline, + 'gadai70' => $gadai70, + 'gadai75' => $gadai75, + 'gadai80' => $gadai80, + 'nilaimarhun70' => $nilaimarhun70, + 'nilaimarhun75' => $nilaimarhun75, + 'nilaimarhun80' => $nilaimarhun80, + 'bilangan70' => $bilangan70, + 'bilangan75' => $bilangan75, + 'bilangan80' => $bilangan80, ]; } From ce822c3e6b5a3492a05521183c31b4196fb68142 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 7 Jun 2023 07:39:23 +0800 Subject: [PATCH 4/9] fix primary key --- app/Services/RingkasanHarianServices.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php index 7c1f4f0..765e5cc 100644 --- a/app/Services/RingkasanHarianServices.php +++ b/app/Services/RingkasanHarianServices.php @@ -377,16 +377,13 @@ class RingkasanHarianServices public function StoreRingkasanHarian(){ - $period = CarbonPeriod::create('2023-01-01', '2023-03-31'); + $period = CarbonPeriod::create('2023-01-01', '2023-05-31'); $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); - // foreach() - foreach($period as $current){ - foreach($cawangan as $index=>$caw){ + foreach($cawangan as $index=>$caw){ + foreach($period as $current){ DB::connection($caw['mysql'])->beginTransaction(); - try{ - $getTransaksi = $this->getTransaksiHarian($current->toDateString(),$caw['kodcaw'],$caw['mysql']); $getPendser = $this->getPendahuluanSerahanHQ($current->toDateString(),$caw['kodcaw'],$caw['mysql']); $getPerbelanjaan = $this->getPerbelanjaan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); @@ -469,10 +466,10 @@ class RingkasanHarianServices $main->tebus()->save($tebus); $main->lelong()->save($lelong); - $main->gad_id = $gadai->id; - $main->teb_id = $tebus->id; - $main->ans_id = $ansuran->id; - $main->lel_id = $lelong->id; + $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(); From ec3e81fbffb8356256012275cfc79aa7f737d610 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 7 Jun 2023 22:52:40 +0800 Subject: [PATCH 5/9] fix skit2 --- app/Http/Controllers/AdminPageController.php | 30 +-- app/Services/RingkasanHarianServices.php | 181 ++++++++++--------- 2 files changed, 112 insertions(+), 99 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 1ce675d..d84dc44 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -3624,26 +3624,26 @@ class AdminPageController extends Controller return response()->json($batchleltuntutbaki); } - public function StoreRingkasanHarian(Request $request){ - - $current = Carbon::now(); - $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); - + public function StoreRingkasanHarian(Request $request){ $ringkasan = new RingkasanHarianServices; - $res = $ringkasan->StoreRingkasanHarian(); - + + if($request->jenisgenerate == 'daily'){ + $date = $request->tarikh; + $res = $ringkasan->StoreRingkasanHarian($date,$date,$request->zone); + }else{ + $res = $ringkasan->StoreRingkasanHarian($request->mula,$request->hingga,$request->zone); + } return response($res); - } - public function getRingkasanHarian(Request $request){ - - $current = Carbon::now(); - $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); - + public function getRingkasanHarian(Request $request){ $ringkasan = new RingkasanHarianServices; - $test = $ringkasan->getRingkasanHarian($request->mula,$request->hingga); + $getData = $ringkasan->getRingkasanHarian($request->mula,$request->hingga,$request->kodcaw); - dd($test); + if($getData != 'error'){ + return response($getData); + }else{ + return response('error'); + } } } diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php index 7c1f4f0..05d6811 100644 --- a/app/Services/RingkasanHarianServices.php +++ b/app/Services/RingkasanHarianServices.php @@ -322,8 +322,8 @@ class RingkasanHarianServices $baki_lelong = $data_lelong_baki->sum('baki'); $rugi_lelong = $data_lelong_rugi->sum('baki'); - $tuntut_baki_rugi = TuntutBaki::on($connection)->where('tarikh','>=',$date)->where('jumlah','<',0); - $tuntut_baki_bayar = TuntutBaki::on($connection)->where('tarikh','>=',$date)->where('jumlah','>',0); + $tuntut_baki_rugi = TuntutBaki::on($connection)->where('tarikh','=',$date)->where('jumlah','<',0); + $tuntut_baki_bayar = TuntutBaki::on($connection)->where('tarikh','=',$date)->where('jumlah','>',0); $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah'); $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah'); @@ -375,12 +375,11 @@ class RingkasanHarianServices } - public function StoreRingkasanHarian(){ + public function StoreRingkasanHarian($mula,$hingga,$zone){ - $period = CarbonPeriod::create('2023-01-01', '2023-03-31'); + $period = CarbonPeriod::create($mula, $hingga); $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); - // foreach() foreach($period as $current){ foreach($cawangan as $index=>$caw){ DB::connection($caw['mysql'])->beginTransaction(); @@ -496,91 +495,105 @@ class RingkasanHarianServices return response('success'); } - public function getRingkasanHarian($date1,$date2) : Array{ + public function getRingkasanHarian($date1,$date2,$kodcaw) : Array{ - //gadai - $totalgadai = RingkasanMain::JumlahGadai($date1,$date2); - $bilangangadai = RingkasanMain::BilanganGadai($date1,$date2); - $gadai70 = RingkasanMain::Gadai70($date1,$date2); - $gadai75 = RingkasanMain::Gadai75($date1,$date2); - $gadai80 = RingkasanMain::Gadai80($date1,$date2); - $nilaimarhun70 = RingkasanMain::Nm70($date1,$date2); - $nilaimarhun75 = RingkasanMain::Nm75($date1,$date2); - $nilaimarhun80 = RingkasanMain::Nm80($date1,$date2); - $bilangan70 = RingkasanMain::Bil70($date1,$date2); - $bilangan75 = RingkasanMain::Bil75($date1,$date2); - $bilangan80 = RingkasanMain::Bil80($date1,$date2); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); + $cawangan = (sizeof($cawangan) > 0) ? $cawangan[0] : null; + + if($cawangan != null){ + //gadai + $totalgadai = RingkasanMain::on($cawangan['mysql'])->JumlahGadai($date1,$date2); + $bilangangadai = RingkasanMain::on($cawangan['mysql'])->BilanganGadai($date1,$date2); + $gadai70 = RingkasanMain::on($cawangan['mysql'])->Gadai70($date1,$date2); + $gadai75 = RingkasanMain::on($cawangan['mysql'])->Gadai75($date1,$date2); + $gadai80 = RingkasanMain::on($cawangan['mysql'])->Gadai80($date1,$date2); + $nilaimarhun70 = RingkasanMain::on($cawangan['mysql'])->Nm70($date1,$date2); + $nilaimarhun75 = RingkasanMain::on($cawangan['mysql'])->Nm75($date1,$date2); + $nilaimarhun80 = RingkasanMain::on($cawangan['mysql'])->Nm80($date1,$date2); + $bilangan70 = RingkasanMain::on($cawangan['mysql'])->Bil70($date1,$date2); + $bilangan75 = RingkasanMain::on($cawangan['mysql'])->Bil75($date1,$date2); + $bilangan80 = RingkasanMain::on($cawangan['mysql'])->Bil80($date1,$date2); + + $totalbilperatusan = intval($bilangan70) + intval($bilangan75) + intval($bilangan80); + $totalnmperatusan = floatval($nilaimarhun70) + floatval($nilaimarhun75) + floatval($nilaimarhun80); + $totalgadperatusan = floatval($gadai70) + floatval($gadai75) + floatval($gadai80); + + //main + $pendahuluan = RingkasanMain::on($cawangan['mysql'])->pendahuluan($date1,$date2); + $pelanggan = RingkasanMain::on($cawangan['mysql'])->pelanggan($date1,$date2); + $serahan = RingkasanMain::on($cawangan['mysql'])->Serahan($date1,$date2); + $serahanonline = RingkasanMain::on($cawangan['mysql'])->SerahanOnline($date1,$date2); + $belanja = RingkasanMain::on($cawangan['mysql'])->BelanjaAm($date1,$date2); + $baiki = RingkasanMain::on($cawangan['mysql'])->BaikiDanSelenggara($date1,$date2); + $keraian = RingkasanMain::on($cawangan['mysql'])->Keraian($date1,$date2); + + //tebus + $tebus = RingkasanMain::on($cawangan['mysql'])->penebusan($date1,$date2); + $tebus_keuntungan = RingkasanMain::on($cawangan['mysql'])->KeuntunganPenebusan($date1,$date2); + $bilangan_tebus = RingkasanMain::on($cawangan['mysql'])->BilanganPenebusan($date1,$date2); + + //lelong + $jumlahlelong = RingkasanMain::on($cawangan['mysql'])->JumlahLelong($date1,$date2); + $bakilelong = RingkasanMain::on($cawangan['mysql'])->BakiLelong($date1,$date2); + $rugilelong = RingkasanMain::on($cawangan['mysql'])->RugiLelong($date1,$date2); + $bayaranrugi = RingkasanMain::on($cawangan['mysql'])->BayaranRugi($date1,$date2); + $bayaranbaki = RingkasanMain::on($cawangan['mysql'])->BayaranBaki($date1,$date2); + $cajlelong = RingkasanMain::on($cawangan['mysql'])->CajLelong($date1,$date2); + $billelong = RingkasanMain::on($cawangan['mysql'])->BilLelong($date1,$date2); - //main - $pendahuluan = RingkasanMain::pendahuluan($date1,$date2); - $pelanggan = RingkasanMain::pelanggan($date1,$date2); - $serahan = RingkasanMain::Serahan($date1,$date2); - $serahanonline = RingkasanMain::SerahanOnline($date1,$date2); - $belanja = RingkasanMain::BelanjaAm($date1,$date2); - $baiki = RingkasanMain::BaikiDanSelenggara($date1,$date2); - $keraian = RingkasanMain::Keraian($date1,$date2); - - //tebus - $tebus = RingkasanMain::penebusan($date1,$date2); - $tebus_keuntungan = RingkasanMain::KeuntunganPenebusan($date1,$date2); - $bilangan_tebus = RingkasanMain::BilanganPenebusan($date1,$date2); - - //lelong - $jumlahlelong = RingkasanMain::JumlahLelong($date1,$date2); - $bakilelong = RingkasanMain::BakiLelong($date1,$date2); - $rugilelong = RingkasanMain::RugiLelong($date1,$date2); - $bayaranrugi = RingkasanMain::BayaranRugi($date1,$date2); - $bayaranbaki = RingkasanMain::BayaranBaki($date1,$date2); - $cajlelong = RingkasanMain::CajLelong($date1,$date2); - $billelong = RingkasanMain::BilLelong($date1,$date2); + //ansuran + $pembiayaanansuran = RingkasanMain::on($cawangan['mysql'])->PembiayaanAnsuran($date1,$date2); + $keuntunganansuran = RingkasanMain::on($cawangan['mysql'])->KeuntunganAnsuran($date1,$date2); + $bilansuran = RingkasanMain::on($cawangan['mysql'])->BilAnsuran($date1,$date2); + $pembiayaanonline = RingkasanMain::on($cawangan['mysql'])->PembiayaanOnline($date1,$date2); + $keuntunganonline = RingkasanMain::on($cawangan['mysql'])->KeuntunganOnline($date1,$date2); + $bilonline = RingkasanMain::on($cawangan['mysql'])->BilOnline($date1,$date2); - //ansuran - $pembiayaanansuran = RingkasanMain::PembiayaanAnsuran($date1,$date2); - $keuntunganansuran = RingkasanMain::KeuntunganAnsuran($date1,$date2); - $bilansuran = RingkasanMain::BilAnsuran($date1,$date2); - $pembiayaanonline = RingkasanMain::PembiayaanOnline($date1,$date2); - $keuntunganonline = RingkasanMain::KeuntunganOnline($date1,$date2); - $bilonline = RingkasanMain::BilOnline($date1,$date2); + return [ + 'totalgadai' => $totalgadai, + 'bilangangadai' => $bilangangadai, + 'pendahuluan' => $pendahuluan, + 'pelanggan' => $pelanggan, + 'serahan' => $serahan, + 'serahanonline' => $serahanonline, + 'belanja' => $belanja, + 'baiki' => $baiki, + 'keraian' => $keraian, + 'tebus' => $tebus, + 'tebus_keuntungan' => $tebus_keuntungan, + 'bilangan_tebus' => $bilangan_tebus, + 'jumlahlelong' => $jumlahlelong, + 'bakilelong' => $bakilelong, + 'rugilelong' => $rugilelong, + 'bayaranrugi' => $bayaranrugi, + 'bayaranbaki' => $bayaranbaki, + 'cajlelong' => $cajlelong, + 'billelong' => $billelong, + 'pembiayaanansuran' => $pembiayaanansuran, + 'keuntunganansuran' => $keuntunganansuran, + 'bilansuran' => $bilansuran, + 'pembiayaanonline' => $pembiayaanonline, + 'keuntunganonline' => $keuntunganonline, + 'bilonline' => $bilonline, + 'gadai70' => $gadai70, + 'gadai75' => $gadai75, + 'gadai80' => $gadai80, + 'nilaimarhun70' => $nilaimarhun70, + 'nilaimarhun75' => $nilaimarhun75, + 'nilaimarhun80' => $nilaimarhun80, + 'bilangan70' => $bilangan70, + 'bilangan75' => $bilangan75, + 'bilangan80' => $bilangan80, + 'totalbilperatusan' => $totalbilperatusan, + 'totalnmperatusan' => $totalnmperatusan, + 'totalgadperatusan' => $totalgadperatusan, + ]; + }else{ + return 'error'; + } - - return [ - 'totalgadai' => $totalgadai, - 'bilangangadai' => $bilangangadai, - 'pendahuluan' => $pendahuluan, - 'pelanggan' => $pelanggan, - 'serahan' => $serahan, - 'serahanonline' => $serahanonline, - 'belanja' => $belanja, - 'baiki' => $baiki, - 'keraian' => $keraian, - 'tebus' => $tebus, - 'tebus_keuntungan' => $tebus_keuntungan, - 'bilangan_tebus' => $bilangan_tebus, - 'jumlahlelong' => $jumlahlelong, - 'bakilelong' => $bakilelong, - 'rugilelong' => $rugilelong, - 'bayaranrugi' => $bayaranrugi, - 'bayaranbaki' => $bayaranbaki, - 'cajlelong' => $cajlelong, - 'billelong' => $billelong, - 'pembiayaanansuran' => $pembiayaanansuran, - 'keuntunganansuran' => $keuntunganansuran, - 'bilansuran' => $bilansuran, - 'pembiayaanonline' => $pembiayaanonline, - 'keuntunganonline' => $keuntunganonline, - 'bilonline' => $bilonline, - 'gadai70' => $gadai70, - 'gadai75' => $gadai75, - 'gadai80' => $gadai80, - 'nilaimarhun70' => $nilaimarhun70, - 'nilaimarhun75' => $nilaimarhun75, - 'nilaimarhun80' => $nilaimarhun80, - 'bilangan70' => $bilangan70, - 'bilangan75' => $bilangan75, - 'bilangan80' => $bilangan80, - ]; } } From f001ce6ffeb75420434ced25ef8ff9569c14e84b Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 8 Jun 2023 11:14:39 +0800 Subject: [PATCH 6/9] 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); From 840c202e0473ea70a4548e810b869256ec74929f Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 17 Jun 2023 22:56:38 +0800 Subject: [PATCH 7/9] fix the names to return to the kaunter --- app/Services/RingkasanHarianServices.php | 91 +++++++++++------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php index 59537a6..8f2d36e 100644 --- a/app/Services/RingkasanHarianServices.php +++ b/app/Services/RingkasanHarianServices.php @@ -376,10 +376,8 @@ class RingkasanHarianServices } public function StoreRingkasanHarian($mula,$hingga,$zone){ - $period = CarbonPeriod::create($mula, $hingga); - $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); - + $cawangan = Cawangan::on('mysql7')->where('zone',$zone)->get()->toArray(); foreach($cawangan as $index=>$caw){ foreach($period as $current){ DB::connection($caw['mysql'])->beginTransaction(); @@ -390,15 +388,13 @@ class RingkasanHarianServices $getLelong = $this->getLelong($current->toDateString(),$caw['kodcaw'],$caw['mysql']); $getPeratusan = $this->getPeratusan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); $bilangan_tebus = $getLelong['bilangan'] + $getTransaksi['bilangan_tebus']; - - $condition = RingkasanMain::where('date',$current->toDateString())->first(); - + $condition = RingkasanMain::on($caw['mysql'])->where('date',$current->toDateString())->first(); if($condition){ - $gadai = RingkasanGadai::find($condition['gad_id']); - $tebus = RingkasanTebus::find($condition['teb_id']); - $ansuran = RingkasanAnsuran::find($condition['ans_id']); - $lelong = RingkasanLelong::find($condition['lel_id']); - $main = RingkasanMain::where('date',$current->toDateString())->first(); + $gadai = RingkasanGadai::on($caw['mysql'])->find($condition['gad_id']); + $tebus = RingkasanTebus::on($caw['mysql'])->find($condition['teb_id']); + $ansuran = RingkasanAnsuran::on($caw['mysql'])->find($condition['ans_id']); + $lelong = RingkasanLelong::on($caw['mysql'])->find($condition['lel_id']); + $main = RingkasanMain::on($caw['mysql'])->where('date',$current->toDateString())->first(); }else{ $main = new RingkasanMain(); $gadai = new RingkasanGadai(); @@ -408,7 +404,7 @@ class RingkasanHarianServices } $gadai->setConnection($caw['mysql']); - $gadai->setConnection($caw['mysql']); + $ansuran->setConnection($caw['mysql']); $tebus->setConnection($caw['mysql']); $lelong->setConnection($caw['mysql']); $main->setConnection($caw['mysql']); @@ -480,7 +476,6 @@ class RingkasanHarianServices - DB::connection($caw['mysql'])->commit(); }catch (\Exception $e) { dd($e); @@ -550,43 +545,43 @@ class RingkasanHarianServices return [ - 'totalgadai' => $totalgadai, - 'bilangangadai' => $bilangangadai, - 'pendahuluan' => $pendahuluan, - 'pelanggan' => $pelanggan, - 'serahan' => $serahan, - 'serahanonline' => $serahanonline, - 'belanja' => $belanja, - 'baiki' => $baiki, + 'total_gadai' => $totalgadai, + 'bilangan_gadai' => $bilangangadai, + 'totalpendahuluan' => $pendahuluan, + 'bilangan_customer_baru' => $pelanggan, + 'totalserahan' => $serahan, + 'serahanbayaranOnline' => $serahanonline, + 'belanjaam' => $belanja, + 'baikidanselenggara' => $baiki, 'keraian' => $keraian, - 'tebus' => $tebus, - 'tebus_keuntungan' => $tebus_keuntungan, + 'total_tebus' => $tebus, + 'upahsimpankaunter' => $tebus_keuntungan, 'bilangan_tebus' => $bilangan_tebus, - 'jumlahlelong' => $jumlahlelong, - 'bakilelong' => $bakilelong, - 'rugilelong' => $rugilelong, - 'bayaranrugi' => $bayaranrugi, - 'bayaranbaki' => $bayaranbaki, - 'cajlelong' => $cajlelong, - 'billelong' => $billelong, - 'pembiayaanansuran' => $pembiayaanansuran, - 'keuntunganansuran' => $keuntunganansuran, - 'bilansuran' => $bilansuran, - 'pembiayaanonline' => $pembiayaanonline, - 'keuntunganonline' => $keuntunganonline, - 'bilonline' => $bilonline, - 'gadai70' => $gadai70, - 'gadai75' => $gadai75, - 'gadai80' => $gadai80, - 'nilaimarhun70' => $nilaimarhun70, - 'nilaimarhun75' => $nilaimarhun75, - 'nilaimarhun80' => $nilaimarhun80, - 'bilangan70' => $bilangan70, - 'bilangan75' => $bilangan75, - 'bilangan80' => $bilangan80, - 'totalbilperatusan' => $totalbilperatusan, - 'totalnmperatusan' => $totalnmperatusan, - 'totalgadperatusan' => $totalgadperatusan, + 'jumlah_lelong' => $jumlahlelong, + 'baki_lelong' => $bakilelong, + 'rugi_lelong' => $rugilelong, + 'bayar_rugi_lelong' => $bayaranrugi, + 'bayar_baki_lelong' => $bayaranbaki, + 'cas_lelong' => $cajlelong, + 'bilangan_lelong' => $billelong, + 'total_ansuran' => $pembiayaanansuran, + 'keuntungansebenarkaunter' => $keuntunganansuran, + 'bilangan_ansuran' => $bilansuran, + 'total_ansuranonline' => $pembiayaanonline, + 'total_keuntungan_online' => $keuntunganonline, + 'bilangan_ansuranonline' => $bilonline, + 'gadai_70' => $gadai70, + 'gadai_75' => $gadai75, + 'gadai_80' => $gadai80, + 'nilaimarhun_70' => $nilaimarhun70, + 'nilaimarhun_75' => $nilaimarhun75, + 'nilaimarhun_80' => $nilaimarhun80, + 'bilangan_70' => $bilangan70, + 'bilangan_75' => $bilangan75, + 'bilangan_80' => $bilangan80, + 'total_bilangan' => $totalbilperatusan, + 'total_nm' => $totalnmperatusan, + 'total_gadaian' => $totalgadperatusan, ]; }else{ return 'error'; From fb26fd47c5b3431b065778707ec1f0cc797e6d2d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 20 Jun 2023 09:20:20 +0800 Subject: [PATCH 8/9] fix cawangan request --- app/Services/RingkasanHarianServices.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/RingkasanHarianServices.php b/app/Services/RingkasanHarianServices.php index b7c2078..194153a 100644 --- a/app/Services/RingkasanHarianServices.php +++ b/app/Services/RingkasanHarianServices.php @@ -488,7 +488,7 @@ class RingkasanHarianServices public function getRingkasanHarian($date1,$date2,$kodcaw) : Array{ - $cawangan = Cawangan::on('mysql7')->where('kodcaw','KB2')->get()->toArray(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw',$kodcaw)->get()->toArray(); $cawangan = (sizeof($cawangan) > 0) ? $cawangan[0] : null; if($cawangan != null){ From 7cf25e5db74aee695b3f1a1e5db7c9340ad9040d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 24 Jun 2023 22:27:05 +0800 Subject: [PATCH 9/9] fix default --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 01a6d98..b7e9873 100644 --- a/config/database.php +++ b/config/database.php @@ -2,7 +2,7 @@ return [ - 'default' => 'mysql', + 'default' => 'accounts', 'connections' => [ 'lelong' => [