LaporanContorller

app/Http/Controllers/LaporanController.php

@@ -244,7 +244,7 @@ class LaporanController extends Controller
         $upahsimpankaunter = $keuntungan_kaunter + $upahtebus + $upahlelong + $upahansurKaunter + $total_keuntunganbukanansuran_kaunter;
         $keuntungansebenarkaunter = $total_keuntunganansuran_kaunter;
 
-        $upahsimpanonline = $upahtebus + $upahlelong + $upahansurOnline;
+        $upahsimpanonline = $upahansurOnline;
         $keuntungansebenaronline = $total_keuntunganansuran_online + $total_keuntunganbukanansuran_online;
 
         $total_keuntungan_kaunter = floatval($upahsimpankaunter) + floatval($keuntungansebenarkaunter);
@@ -259,6 +259,10 @@ class LaporanController extends Controller
                 ->where('tebus.t_tebus','=',$request->tarikh)
                 ->get();
 
+        $pembiayaanlelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','=',$request->tarikh)
+                ->sum('pinjaman');
+
         $totalpenebusan = 0;
 
         foreach($tebus as $index1=>$teb)
@@ -271,6 +275,8 @@ class LaporanController extends Controller
             }
         }
 
+        //Lelongan Pembiayaan
+        $totalpenebusan += $pembiayaanlelong;
 
         //b
         $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->where('pinjaman','>',0)->count();