From 840c202e0473ea70a4548e810b869256ec74929f Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Sat, 17 Jun 2023 22:56:38 +0800
Subject: [PATCH] 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';