fix second commit

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);
     }

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;
         });
     }
 

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,
         ];
     }