diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 97ac38b..0655434 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -247,7 +247,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);
@@ -262,6 +262,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)
@@ -274,6 +278,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();
@@ -324,11 +330,116 @@ class LaporanController extends Controller
         $panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
 
         //e
+
+        $tarikhtawarruq = '';
+
+        switch ($request->kodcaw) {
+            case 'KB2':
+                $tarikhtawarruq = '2021-04-13';
+              break;
+            case 'WCY':
+                $tarikhtawarruq = '2021-05-04';
+              break;
+            case '1STOP':
+                $tarikhtawarruq = '2021-05-09';
+            break;
+            case '020301':
+                $tarikhtawarruq = '2021-05-18';
+            break;
+            case 'ALS':
+                $tarikhtawarruq = '2021-05-24';
+            break;
+            case 'WB':
+                $tarikhtawarruq = '2021-05-24';
+            break;
+            case 'APM':
+                $tarikhtawarruq = '2021-06-08';
+            break;
+            case 'ARM':
+                $tarikhtawarruq = '2021-06-08';
+            break;
+            case '020306':
+                $tarikhtawarruq = '2021-06-08';
+            break;
+            case '010311':
+                $tarikhtawarruq = '2021-06-13';
+            break;
+            case 'GC':
+                $tarikhtawarruq = '2021-06-13';
+            break;
+            case 'JLI':
+                $tarikhtawarruq = '2021-06-13';
+            break;
+            case '010621':
+                $tarikhtawarruq = '2021-06-15';
+            break;
+            case 'ARP':
+                $tarikhtawarruq = '2021-06-15';
+            break;
+            case '010621':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010136':
+                $tarikhtawarruq = '2021-06-20';
+            break;
+            case '011235':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '011227':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010620':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010617':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010915':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011228':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '010219':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011229':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011230':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '011013':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '011412':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '011234':
+                $tarikhtawarruq = '2021-06-28';
+            break;
+            case '020303':
+                $tarikhtawarruq = '2021-06-29';
+            break;
+            case '010618':
+                $tarikhtawarruq = '2021-06-29';
+            break;
+            case '011231':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '011232':
+                $tarikhtawarruq = '2021-06-28';
+            break;
+            case '011233':
+                $tarikhtawarruq = '2021-06-28';
+            break;
+          } 
+
         /* Imbang Duga */
 
         $rekodkoopquery = Gadai::on($cawangan['mysql'])
                             ->where('tagpalsu','=',0)
-                            ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
+                            ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
                             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']]);
                             // ->sum('pinjaman');
 
@@ -340,8 +451,8 @@ class LaporanController extends Controller
         if($request->tarikh > '2021-04-13'){
             $rekodtawarruqquery = Gadai::on($cawangan['mysql'])
                 ->where('tagpalsu','=',0)
-                ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
-                ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]);
+                ->where([['t_gadai','<=',$request->tarikh],['hargajualan','<>','NULL'],['sttebus','=','']])
+                ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']]);
 
             $rekodtawarruq = $rekodtawarruqquery->sum('pinjaman');
             $rekodtawarruqnilaimarhun = $rekodtawarruqquery->sum('nilaimarhun');
@@ -351,7 +462,7 @@ class LaporanController extends Controller
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
-        $bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7')
+            $bayaranpendahuluan_data = TransaksiKeuntungan::on('mysql7')
             // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
             // ->where('db2.sttebus','=','')
             // ->where('db2.hargajualan','<>','null')