fix the names to return to the kaunter

This commit is contained in:
hafifierahman
2023-06-17 22:56:38 +08:00
parent 2a41418291
commit 840c202e04
+43 -48
View File
@@ -376,10 +376,8 @@ class RingkasanHarianServices
} }
public function StoreRingkasanHarian($mula,$hingga,$zone){ public function StoreRingkasanHarian($mula,$hingga,$zone){
$period = CarbonPeriod::create($mula, $hingga); $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($cawangan as $index=>$caw){
foreach($period as $current){ foreach($period as $current){
DB::connection($caw['mysql'])->beginTransaction(); DB::connection($caw['mysql'])->beginTransaction();
@@ -390,15 +388,13 @@ class RingkasanHarianServices
$getLelong = $this->getLelong($current->toDateString(),$caw['kodcaw'],$caw['mysql']); $getLelong = $this->getLelong($current->toDateString(),$caw['kodcaw'],$caw['mysql']);
$getPeratusan = $this->getPeratusan($current->toDateString(),$caw['kodcaw'],$caw['mysql']); $getPeratusan = $this->getPeratusan($current->toDateString(),$caw['kodcaw'],$caw['mysql']);
$bilangan_tebus = $getLelong['bilangan'] + $getTransaksi['bilangan_tebus']; $bilangan_tebus = $getLelong['bilangan'] + $getTransaksi['bilangan_tebus'];
$condition = RingkasanMain::on($caw['mysql'])->where('date',$current->toDateString())->first();
$condition = RingkasanMain::where('date',$current->toDateString())->first();
if($condition){ if($condition){
$gadai = RingkasanGadai::find($condition['gad_id']); $gadai = RingkasanGadai::on($caw['mysql'])->find($condition['gad_id']);
$tebus = RingkasanTebus::find($condition['teb_id']); $tebus = RingkasanTebus::on($caw['mysql'])->find($condition['teb_id']);
$ansuran = RingkasanAnsuran::find($condition['ans_id']); $ansuran = RingkasanAnsuran::on($caw['mysql'])->find($condition['ans_id']);
$lelong = RingkasanLelong::find($condition['lel_id']); $lelong = RingkasanLelong::on($caw['mysql'])->find($condition['lel_id']);
$main = RingkasanMain::where('date',$current->toDateString())->first(); $main = RingkasanMain::on($caw['mysql'])->where('date',$current->toDateString())->first();
}else{ }else{
$main = new RingkasanMain(); $main = new RingkasanMain();
$gadai = new RingkasanGadai(); $gadai = new RingkasanGadai();
@@ -408,7 +404,7 @@ class RingkasanHarianServices
} }
$gadai->setConnection($caw['mysql']); $gadai->setConnection($caw['mysql']);
$gadai->setConnection($caw['mysql']); $ansuran->setConnection($caw['mysql']);
$tebus->setConnection($caw['mysql']); $tebus->setConnection($caw['mysql']);
$lelong->setConnection($caw['mysql']); $lelong->setConnection($caw['mysql']);
$main->setConnection($caw['mysql']); $main->setConnection($caw['mysql']);
@@ -480,7 +476,6 @@ class RingkasanHarianServices
DB::connection($caw['mysql'])->commit(); DB::connection($caw['mysql'])->commit();
}catch (\Exception $e) { }catch (\Exception $e) {
dd($e); dd($e);
@@ -550,43 +545,43 @@ class RingkasanHarianServices
return [ return [
'totalgadai' => $totalgadai, 'total_gadai' => $totalgadai,
'bilangangadai' => $bilangangadai, 'bilangan_gadai' => $bilangangadai,
'pendahuluan' => $pendahuluan, 'totalpendahuluan' => $pendahuluan,
'pelanggan' => $pelanggan, 'bilangan_customer_baru' => $pelanggan,
'serahan' => $serahan, 'totalserahan' => $serahan,
'serahanonline' => $serahanonline, 'serahanbayaranOnline' => $serahanonline,
'belanja' => $belanja, 'belanjaam' => $belanja,
'baiki' => $baiki, 'baikidanselenggara' => $baiki,
'keraian' => $keraian, 'keraian' => $keraian,
'tebus' => $tebus, 'total_tebus' => $tebus,
'tebus_keuntungan' => $tebus_keuntungan, 'upahsimpankaunter' => $tebus_keuntungan,
'bilangan_tebus' => $bilangan_tebus, 'bilangan_tebus' => $bilangan_tebus,
'jumlahlelong' => $jumlahlelong, 'jumlah_lelong' => $jumlahlelong,
'bakilelong' => $bakilelong, 'baki_lelong' => $bakilelong,
'rugilelong' => $rugilelong, 'rugi_lelong' => $rugilelong,
'bayaranrugi' => $bayaranrugi, 'bayar_rugi_lelong' => $bayaranrugi,
'bayaranbaki' => $bayaranbaki, 'bayar_baki_lelong' => $bayaranbaki,
'cajlelong' => $cajlelong, 'cas_lelong' => $cajlelong,
'billelong' => $billelong, 'bilangan_lelong' => $billelong,
'pembiayaanansuran' => $pembiayaanansuran, 'total_ansuran' => $pembiayaanansuran,
'keuntunganansuran' => $keuntunganansuran, 'keuntungansebenarkaunter' => $keuntunganansuran,
'bilansuran' => $bilansuran, 'bilangan_ansuran' => $bilansuran,
'pembiayaanonline' => $pembiayaanonline, 'total_ansuranonline' => $pembiayaanonline,
'keuntunganonline' => $keuntunganonline, 'total_keuntungan_online' => $keuntunganonline,
'bilonline' => $bilonline, 'bilangan_ansuranonline' => $bilonline,
'gadai70' => $gadai70, 'gadai_70' => $gadai70,
'gadai75' => $gadai75, 'gadai_75' => $gadai75,
'gadai80' => $gadai80, 'gadai_80' => $gadai80,
'nilaimarhun70' => $nilaimarhun70, 'nilaimarhun_70' => $nilaimarhun70,
'nilaimarhun75' => $nilaimarhun75, 'nilaimarhun_75' => $nilaimarhun75,
'nilaimarhun80' => $nilaimarhun80, 'nilaimarhun_80' => $nilaimarhun80,
'bilangan70' => $bilangan70, 'bilangan_70' => $bilangan70,
'bilangan75' => $bilangan75, 'bilangan_75' => $bilangan75,
'bilangan80' => $bilangan80, 'bilangan_80' => $bilangan80,
'totalbilperatusan' => $totalbilperatusan, 'total_bilangan' => $totalbilperatusan,
'totalnmperatusan' => $totalnmperatusan, 'total_nm' => $totalnmperatusan,
'totalgadperatusan' => $totalgadperatusan, 'total_gadaian' => $totalgadperatusan,
]; ];
}else{ }else{
return 'error'; return 'error';