diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index fc0cce5..27a256c 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -20,6 +20,7 @@ use App\Tunai;
 use App\Komuditi;
 use App\KawalanStokLama;
 use App\KawalanStok;
+use App\KadarUpah;
 use App\Moratorium;
 use App\Audit;
 use App\Customer;
@@ -207,6 +208,7 @@ class GadaiController extends Controller
 
 
     public function daftarGadaiMarhun($norujukan,Request $request){
+        // dd("ggwp");
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -228,24 +230,34 @@ class GadaiController extends Controller
 
         $bil_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->count();
 
+        $total_nilai_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('n_marhun');
+        $total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat');
+
+        $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
+        $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
+        $upah6 = $upah1 * 6;
+        $upah12 = $upah1 * 12;
+
+        $hargajualan = $request->pinjaman + $upah12;
+
         $gadai = Gadai::on($cawangan['mysql'])
             ->where('norujukan','=',$norujukan)
             ->update(array(
-                'nilaimarhun' => $request->nilaimarhun,
-                'berat'=> $request->berat,
+                'nilaimarhun' => $total_nilai_marhun,
+                'berat'=> $total_berat,
                 'pinjaman' => $request->pinjaman,
-                'kadarupah' => $request->kadarupah,
+                'kadarupah' => $kadar_raw['kadarupdah'],
                 'marhun' => $request->marhun,
                 'percentpinj' => $margin_pinjam,
                 'teller' => $request->teller,
                 'bakipjm' => $request->pinjaman,
-                'bakiupah' => $request->upah6,
+                'bakiupah' => $upah6,
                 'jbg' => 0.5,
                 't_update' => $current->toDateString(),
                 'cetak' => 0,
-                'upah12' => $request->upah12,
-                'hargajualan' => $request->hargajualan,
-                'bakihargajualan' => $request->hargajualan,
+                'upah12' => $upah12,
+                'hargajualan' => $hargajualan,
+                'bakihargajualan' => $hargajualan,
                 'tagserah' => 0,
                 't_matang' => $t_matang,
                 't_matang1' => $t_kontrak,
@@ -256,9 +268,9 @@ class GadaiController extends Controller
                 'tempohbayar' => 0.00,
                 'lelong_tawarruq' => 1
             ));
-        
+
         $new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
-        
+
         $audit = new Audit();
         $audit->users = $request->teller;
         $audit->actions = $request->transaction;
@@ -271,7 +283,7 @@ class GadaiController extends Controller
         $audit->created_at = $current;
         $audit->updated_at = $current;
         $audit->save();
-        
+
         return response()->json($gadai, 200);
     }
 
@@ -315,7 +327,7 @@ class GadaiController extends Controller
         $upah_semasa_round = number_format($upahsemasa_raw,2);
         $upah_semasa = substr($upah_semasa_round, 0, -1);
 	    // $upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
-        if(strpos($upah_semasa,',')){                        
+        if(strpos($upah_semasa,',')){
             $upah_semasa = str_replace(',','',$upah_semasa);
         }
         return $upah_semasa;
@@ -336,7 +348,7 @@ class GadaiController extends Controller
 
         $upah_rebet_round = number_format($upahrebet_raw,2);
         $upah_rebet = substr($upah_rebet_round, 0, -1);
-        if(strpos($upah_rebet,',')){                        
+        if(strpos($upah_rebet,',')){
             $upah_rebet = str_replace(',','',$upah_rebet);
         }
         // $upah_rebet = floatval(preg_replace('/[^\d.]/', '', $upah_rebet));
@@ -353,7 +365,7 @@ class GadaiController extends Controller
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
         $upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
-        
+
         $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
 
         $total_bayaran_semasa = $total_bayaran_prev + $request->bayaran;
@@ -537,7 +549,7 @@ class GadaiController extends Controller
                 ->update(array(
                     'tagkomuditi' => 1
                     ));
-        
+
         return response()->json($gadai,200);
     }
 
@@ -581,7 +593,7 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-    
+
     public function barcodeScanTebus($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
@@ -605,7 +617,7 @@ class GadaiController extends Controller
             $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update([
                 'semakbarcode'=>'Lulus'
             ]);
-    
+
             return response()->json('success');
         }
     }
@@ -670,7 +682,7 @@ class GadaiController extends Controller
                 ]);
             }
         }
-        
+
         return response()->json($gadai);
     }
 
@@ -685,7 +697,7 @@ class GadaiController extends Controller
                 ->orderBy('t_gadai','asc')
                 ->orderBy('sirig','asc')
                 ->get();
-        
+
         return response()->json($gadai);
     }
 
@@ -696,7 +708,7 @@ class GadaiController extends Controller
                 ->where('tarikh','=',$tarikh)
                 ->orderBy('tarikh','desc')
                 ->get();
-        
+
         return response()->json($gadai);
     }
 
@@ -779,7 +791,7 @@ class GadaiController extends Controller
         foreach($gadai as $index=>$g)
         {
             array_push($arrayharian,$g);
-        } 
+        }
 
         foreach($tebus as $index1=>$t)
         {
@@ -816,7 +828,7 @@ class GadaiController extends Controller
         foreach($gadai as $index=>$g)
         {
             array_push($arrayharian,$g);
-        } 
+        }
 
         foreach($tebus as $index1=>$t)
         {
@@ -842,7 +854,7 @@ class GadaiController extends Controller
                 // ->whereYear('t_gadai','=',$current->year)
                 ->orderBy('t_gadai','desc')
                 ->get();
-       
+
 
         // $tebus = Gadai::on($cawangan['mysql'])
         // ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman, SUM(bakiupah) as upahsimpan')
@@ -911,10 +923,10 @@ class GadaiController extends Controller
         ->where('jenistebus','=','A')
         ->get();
 
-   
+
 
         array_push($array_terkumpul,["gadai" => $gadai,"tebus" => $tebus, "lelong" => $lelong,"lelongbaki" => $lelongbaki,"lelongrugi" => $lelongrugi,"bayarlebihanlelong" => $bayarlebihanlelong, "terimarugilelong" => $terimarugilelong, "cajlelong" => $cajlelong, "lelongupahsimpan" => $lelongupahsimpan,"hapuskira" => $hapuskira,"advansur" => $advansur]);
-        
+
         return response()->json($array_terkumpul);
     }
 
@@ -993,7 +1005,7 @@ class GadaiController extends Controller
         ->get();
 
         array_push($array_harian,["gadai" => $gadai,"tebus" => $tebus, "lelong" => $lelong,"lelongbaki" => $lelongbaki,"lelongrugi" => $lelongrugi,"bayarlebihanlelong" => $bayarlebihanlelong, "terimarugilelong" => $terimarugilelong, "cajlelong" => $cajlelong, "lelongupahsimpan" => $lelongupahsimpan, "wtd" => $wtd,"hapuskira" => $hapuskira,"advansur" => $advansur]);
-        
+
         return response()->json($array_harian);
     }
 
@@ -1019,7 +1031,7 @@ class GadaiController extends Controller
                 ->whereDate('transaction.created_at','=',$dateans)
                 ->orderBy('transaction.teller')
                 ->get();
-        
+
         $ansuran = [];
 
         if($ansuran_data){
@@ -1042,7 +1054,7 @@ class GadaiController extends Controller
                 ]);
             }
         }
-        
+
         return response()->json($ansuran);
     }
 
@@ -1082,7 +1094,7 @@ class GadaiController extends Controller
         $bilanganonline = $ansuransonline->count();
 
         $arrayansuran = ['totalpendahuluankaunter' => $pendahuluankaunter, 'totalkeuntungankaunter' => $keuntungankaunter, 'bilangankaunter' => $bilangankaunter,'totalpendahuluanonline' => $pendahuluanonline, 'totalkeuntunganonline' => $keuntunganonline, 'bilanganonline' => $bilanganonline];
-        
+
         return response()->json($arrayansuran,200);
     }
 
@@ -1113,19 +1125,19 @@ class GadaiController extends Controller
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [1, 400.99])
-                ->get();       
+                ->get();
 
         $gadai2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [401, 2000.99])
-                ->get(); 
-                
+                ->get();
+
         $gadai3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_gadai','<',$tarikh)
                 ->whereBetween('nilaimarhun', [2001, 1000000])
-                ->get();    
+                ->get();
 
 
         $gadaiini1 = Gadai::on($cawangan['mysql'])
@@ -1134,7 +1146,7 @@ class GadaiController extends Controller
                 // ->whereBetween('nilaimarhun', [1, 400.99])
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->get();  
+                ->get();
 
         $gadaiini2 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
@@ -1142,7 +1154,7 @@ class GadaiController extends Controller
                 // ->whereBetween('nilaimarhun', [401, 2000.99])
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->get();  
+                ->get();
 
         $gadaiini3 = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
@@ -1150,18 +1162,18 @@ class GadaiController extends Controller
                 // ->whereBetween('nilaimarhun', [2001, 100000])
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->get();  
-        
+                ->get();
+
         // dd($gadaiini3);
-                
-                
 
 
-        
+
+
+
         ////////////
         ///TEBUS////
         ///////////
-                
+
         $tebus1 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_tebus','<',$tarikh)
@@ -1174,37 +1186,37 @@ class GadaiController extends Controller
                 ->where('t_tebus','<',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->get();     
+                ->get();
 
         $tebus3 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_tebus','<',$tarikh)
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->get();    
+                ->get();
 
         $tebusini1 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_tebus','=',$tarikh)
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->get();                
+                ->get();
 
         $tebusini2 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_tebus','=',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->get();     
+                ->get();
 
         $tebusini3 = Tebus::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_tebus','=',$tarikh)
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->get();   
-                
-                
+                ->get();
+
+
         //////////////
         ///LELONG/////
         /////////////
@@ -1223,35 +1235,35 @@ class GadaiController extends Controller
                 ->where('t_jual','<',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->get();     
+                ->get();
 
         $lelong3 = Lelong::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_jual','<',$tarikh)
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->get();    
+                ->get();
 
         $lelongini1 = Lelong::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_jual','=',$tarikh)
                 ->where('nilaimarhun','>=',1)
                 ->where('nilaimarhun','<=',400.99)
-                ->get();                
+                ->get();
 
         $lelongini2 = Lelong::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_jual','=',$tarikh)
                 ->where('nilaimarhun','>=',401)
                 ->where('nilaimarhun','<=',2000.99)
-                ->get();     
+                ->get();
 
         $lelongini3 = Lelong::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(pinjaman) AS pinj')
                 ->where('t_jual','=',$tarikh)
                 ->where('nilaimarhun','>=',2001)
                 ->where('nilaimarhun','<=',1000000)
-                ->get();   
+                ->get();
 
         if($kodcaw == 'KB2')
         {
@@ -1261,7 +1273,7 @@ class GadaiController extends Controller
 
         //     foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
         //     {
-        //         //Gadai 
+        //         //Gadai
         //         $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilGad1']);
         //         $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilGad2']);
         //         $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilGad3']);
@@ -1368,7 +1380,7 @@ class GadaiController extends Controller
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
                     ->groupBy('trans.id')
-                    ->where('trans.kodcaw',$kodcaw) 
+                    ->where('trans.kodcaw',$kodcaw)
                     ->pluck('trans.norujukan');
 
 
@@ -1452,7 +1464,7 @@ class GadaiController extends Controller
                     ->groupBy('trans.id')
                     ->where('trans.kodcaw',$kodcaw)
                     ->pluck('trans.norujukan');
-        
+
         // $ansuranharini2 = [];
 
         // if($ansuranharini2_data){
@@ -1479,7 +1491,7 @@ class GadaiController extends Controller
                 ->where('kodcaw',$kodcaw)
                 ->where('bayaran_pembiayaan','>',0)
                 ->get();
-        
+
         $ansuran3_data = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
                             {
@@ -1489,7 +1501,7 @@ class GadaiController extends Controller
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
                     ->groupBy('trans.id')
-                    ->where('trans.kodcaw',$kodcaw) 
+                    ->where('trans.kodcaw',$kodcaw)
                     ->pluck('trans.norujukan');
 
         // $ansuran3 = [];
@@ -1520,7 +1532,7 @@ class GadaiController extends Controller
                 ->where('bayaran_pembiayaan','>',0)
                 ->get();
 
-        
+
         $ansuranharini3_data = TransaksiKeuntungan::on('mysql7')
                     ->leftJoin('transaction as trans', function($join)
                          {
@@ -1533,7 +1545,7 @@ class GadaiController extends Controller
                     ->where('trans.kodcaw',$kodcaw)
                     ->pluck('trans.norujukan');
 
-        
+
         // $ansuranharini3 = [];
 
         // if($ansuranharini3_data){
@@ -1546,7 +1558,7 @@ class GadaiController extends Controller
         //         }
         //     }
         // }
-        
+
 
         $ansuran3harini = Gadai::on($cawangan['mysql'])
                 ->whereIn('norujukan',$ansuranharini3_data)
@@ -1561,7 +1573,7 @@ class GadaiController extends Controller
                 ->where('kodcaw',$kodcaw)
                 ->where('bayaran_pembiayaan','>',0)
                 ->get();
-        
+
 
         ##push in array##
         $arrayans1 = ['bil' => $transaksi1[0]->bil, 'pinj' => $transaksi1[0]->total];
@@ -1570,7 +1582,7 @@ class GadaiController extends Controller
         $arrayharinians2 = ['bil' => $transaksi2harini[0]->bil, 'pinj' => $transaksi2harini[0]->total];
         $arrayans3 = ['bil' => $transaksi3[0]->bil, 'pinj' => $transaksi3[0]->total];
         $arrayharinians3 = ['bil' => $transaksi3harini[0]->bil, 'pinj' => $transaksi3harini[0]->total];
-        
+
 
         //////////////////
         ///HAPUS KIRA/////
@@ -1583,7 +1595,7 @@ class GadaiController extends Controller
                 ->where('n_marhun','>=',1)
                 ->where('n_marhun','<=',400.99)
                 ->orderBy('tarikh')
-                ->get();                
+                ->get();
 
         $hapuskira2 = HapusKira::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
@@ -1591,7 +1603,7 @@ class GadaiController extends Controller
                 ->where('n_marhun','>=',401)
                 ->where('n_marhun','<=',2000.99)
                 ->orderBy('tarikh')
-                ->get();     
+                ->get();
 
         $hapuskira3 = HapusKira::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
@@ -1599,15 +1611,15 @@ class GadaiController extends Controller
                 ->where('n_marhun','>=',2001)
                 ->where('n_marhun','<=',1000000)
                 ->orderBy('tarikh')
-                ->get();   
-                
+                ->get();
+
         $hapuskiraini1 = HapusKira::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
                 ->where('tarikh','=',$tarikh)
                 ->where('n_marhun','>=',1)
                 ->where('n_marhun','<=',400.99)
                 ->orderBy('tarikh')
-                ->get();                
+                ->get();
 
         $hapuskiraini2 = HapusKira::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
@@ -1615,7 +1627,7 @@ class GadaiController extends Controller
                 ->where('n_marhun','>=',401)
                 ->where('n_marhun','<=',2000.99)
                 ->orderBy('tarikh')
-                ->get();     
+                ->get();
 
         $hapuskiraini3 = HapusKira::on($cawangan['mysql'])
                 ->selectRaw('COUNT(norujukan) AS bil, SUM(bakipjm) AS pinj')
@@ -1623,7 +1635,7 @@ class GadaiController extends Controller
                 ->where('n_marhun','>=',2001)
                 ->where('n_marhun','<=',1000000)
                 ->orderBy('tarikh')
-                ->get();  
+                ->get();
 
 
         array_push($array_kawalanstok,["gadai1" => $gadai1, "gadai2" => $gadai2, "gadai3" => $gadai3,"gadaiini1" => $gadaiini1, "gadaiini2" => $gadaiini2, "gadaiini3" => $gadaiini3]);
@@ -1636,7 +1648,7 @@ class GadaiController extends Controller
     }
 
     public function showAllGadaiToday(){
-        
+
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
@@ -1673,7 +1685,7 @@ class GadaiController extends Controller
         foreach($cawangan_all as $index=>$cawangan){
             $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm');
             $tebus_last_week = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$lastweek)->sum('bakipjm');
-            
+
             $tebusToday += $tebus;
             $tebusLastWeek += $tebus_last_week;
         }
@@ -1730,7 +1742,7 @@ class GadaiController extends Controller
         foreach($cawangan_all as $index=>$cawangan){
             $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah');
             $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar');
-            
+
             $upah_tebus_lastweek = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$lastweek)->sum('bakiupah');
             $upah_lastweek = Advansur::on($cawangan['mysql'])->where('tarikh',$lastweek)->sum('upahDibayar');
 
@@ -1811,7 +1823,7 @@ class GadaiController extends Controller
                 }else{
                     $total_pembiayaan += $gadai_detail['pinjaman'];
                 }
-                
+
             }
         }
 
@@ -1980,7 +1992,7 @@ class GadaiController extends Controller
             }else{
                 array_push($petibesi_cawangan,['cawangan'=>$cawangan['details_caw'],'petibesi'=>0,'tarikh'=>$tarikh]);
             }
-            
+
         }
 
         return response()->json($petibesi_cawangan);
@@ -2033,20 +2045,20 @@ class GadaiController extends Controller
 
                      $totalkeluar = $keluar - ($tebus['addpinjaman'] + $tebus['pinjaman']);
                      $totalmasuk = $masuk - ($tebus['bakiupah'] + $tebus['pinjaman']);
-         
+
                     //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
                     $bakiakhir = $baki - $tebus['bakiupah'] + $tebus['addpinjaman'];
-         
+
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
                     'keluar' => $totalkeluar,
                     'masuk' => $totalmasuk,
                     'baki' => $bakiakhir
                     ));
-                    
-         
+
+
                 }else{
-         
+
                      $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
                      $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
                     //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
@@ -2055,7 +2067,7 @@ class GadaiController extends Controller
                         $bakiakhir = $baki - $tebus['bakipjm'];
 
                     //  dd($totalmasuk,$totalkeluar,$bakiakhir);
-         
+
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
                     'keluar' => $totalkeluar,
@@ -2072,7 +2084,7 @@ class GadaiController extends Controller
                 {
 
                     $bakiakhir = $bakiakhir - $tebus['bakiupah'] + $tebus['addpinjaman'];
-        
+
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
                     'keluar' => $keluar,
@@ -2105,9 +2117,9 @@ class GadaiController extends Controller
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
 
             TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
-            
+
             Transaction::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
-    
+
             Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete();
 
             Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
@@ -2119,7 +2131,7 @@ class GadaiController extends Controller
                 Marhun::on($cawangan['mysql'])->whereIn('norujukan',$gadaiDouble)->delete();
                 $this->batalKomuditi($gadai[0]['historygadaian'],$cawangan['mysql']);
             }
-    
+
             return response('Deleted Successfully', 200);
         }
         else
@@ -2128,7 +2140,7 @@ class GadaiController extends Controller
             if($gadai[0]['semakbarcode'] == 'Lulus')
             {
                 $totalkeluar = $keluar - $gadai[0]['pinjaman'];
-            
+
                 $bakiakhir = $baki;
 
                 $bakiakhir += $gadai[0]['pinjaman'];
@@ -2140,7 +2152,7 @@ class GadaiController extends Controller
                     'baki' => $bakiakhir
                 ));
             }else{
-                
+
                 $bakiakhir = $baki;
 
                 $bakiakhir += $gadai[0]['pinjaman'];
@@ -2152,15 +2164,15 @@ class GadaiController extends Controller
                     'baki' => $bakiakhir
                 ));
             }
-                
+
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
             Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
             TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
             Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
-            
+
             return response('Deleted Successfully', 200);
         }
-       
+
     }
 
     public function batalKomuditi($norujukan,$cawangan_mysql){
@@ -2221,64 +2233,64 @@ class GadaiController extends Controller
             $audit->created_at = $current;
             $audit->updated_at = $current;
             $audit->save();
-            
+
             if($tebus[0]['tagterima'] == 1)
             {
                 if($tebus[0]['jenistebus'] == 'T')
                 {
                     $totalmasuk = $masuk - $tebus[0]['bakipjm'];
-    
+
                     // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
                     $bakiakhir = $baki - $tebus[0]['bakipjm'];
-    
+
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
                     'keluar' => $keluar,
                     'masuk' => $totalmasuk,
                     'baki' => $bakiakhir
                     ));
-    
-    
+
+
                     Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
-    
+
                     Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
-    
+
                     TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
-                
+
                     Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
-            
+
                     return response('Deleted Successfully', 200);
                 }
                 else
                     return response('Bukan-Tebus', 200);
             }else{
-                
+
                 if($tebus[0]['jenistebus'] == 'T')
                 {
-    
+
                     $bakiakhir = $bakiakhir - $tebus[0]['bakipjm'];
-    
+
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
                     'keluar' => $keluar,
                     'masuk' => $masuk,
                     'baki' => $bakiakhir
                     ));
-    
+
                     Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
-    
+
                     Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
-    
+
                     TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
-                
+
                     Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
-            
+
                     return response('Deleted Successfully', 200);
                 }
                 else
-                    return response('Bukan-Tebus', 200);   
+                    return response('Bukan-Tebus', 200);
             }
-        }        
+        }
     }
 
     public function senaraiLelong($kodcaw,Request $request){
@@ -2326,7 +2338,7 @@ class GadaiController extends Controller
                 $percentage = 0;
             }else{
                 $percentage = ($array_cawangan[$index]['total_gadai']/$total_gadaian_cawangan)*100;
-            } 
+            }
             array_push($array_percentage,['cawangan'=>$cawangan['details_caw'],'percentage_gadai'=>number_format($percentage,2)]);
         }
         $count_cawangan = sizeof($cawangan_all);
@@ -2379,10 +2391,10 @@ class GadaiController extends Controller
             }else{
                 $percentage = ($top5['total_gadai']/$total_top5)*100;
             }
-            
+
             array_push($array_percentage,['cawangan'=>$top5['cawangan'],'percentage_gadai'=>number_format($percentage,2)]);
         }
-        // dd($array_percentage);   
+        // dd($array_percentage);
         return response()->json($array_percentage);
 
     }
@@ -2397,7 +2409,7 @@ class GadaiController extends Controller
             $gadai = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=',$current->toDateString()]])->sum('pinjaman');
             array_push($array_cawangan,['cawangan'=>$cawangan['details_caw'],'total_gadai'=>$gadai]);
             $total_gadaian_cawangan += $gadai;
-           
+
         }
         //sorting
         $count_cawangan = sizeof($cawangan_all);
@@ -2433,7 +2445,7 @@ class GadaiController extends Controller
         $monthly_array = new Carbon();
         $yearly_array = Carbon::now();
         $yearly_array = new Carbon();
-        
+
         $array_totalup = [];
 
         if($request->method == 'daily'){
@@ -2476,21 +2488,21 @@ class GadaiController extends Controller
             if($request->method == 'daily'){
                 $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect('t_gadai')->groupBy('t_gadai')->where('t_gadai','=',$current->toDateString())->orderBy('t_gadai','desc')->get();
                 $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect('t_tebus')->groupBy('t_tebus')->where('t_tebus','=',$current->toDateString())->orderBy('t_tebus','desc')->get();
-           
+
                 // $pembeliankomuditi = Komuditi::on('mysql7')->selectRaw('SUM(unit_komuditi) as totalkomoditi')->addSelect('date_purchase')->groupBy('date_purchase')
                 // ->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->get();
 
             }elseif($request->method == 'weekly'){
                 $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect('t_gadai')->groupBy('t_gadai')->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$weekly_date]])->orderBy('t_gadai','desc')->get();
                 $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect('t_tebus')->groupBy('t_tebus')->where([['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$weekly_date]])->orderBy('t_tebus','desc')->get();
-            
+
                 // $pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) as totalkomoditi')->addSelect('date_purchase')->groupBy('date_purchase')
                 // ->where([['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$weekly_date]])->orderBy('created_at','desc')->get();
 
             }elseif($request->method == 'monthly'){
                 $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_gadai,'%Y%m')"))->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])->orderBy('t_gadai','desc')->get();
                 $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_tebus,'%Y%m')"))->where([['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])->orderBy('t_tebus','desc')->get();
-                
+
                 // $pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) AS totalkomoditi')->addSelect(DB::connection('mysql')->raw('DATE_FORMAT(date_purchase, "%Y-%m") as date_purchase'))
                 // ->groupBy(DB::connection('mysql')->raw("DATE_FORMAT(date_purchase,'%Y%m')"))->where([['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$monthly_date]])
                 // ->orderBy('created_at','desc')->get();
@@ -2499,11 +2511,11 @@ class GadaiController extends Controller
                 $gadai = Gadai::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totalpinjaman')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_gadai, "%Y") as t_gadai'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_gadai,'%Y')"))->where([['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$yearly_date]])->orderBy('t_gadai','desc')->get();
                 // dd($gadai);
                 $tebus = Tebus::on($cawangan['mysql'])->selectRaw('SUM(pinjaman) AS totaltebus, SUM(bakiupah) AS totalupah')->addSelect(DB::connection($cawangan['mysql'])->raw('DATE_FORMAT(t_tebus, "%Y") as t_tebus'))->groupBy(DB::connection($cawangan['mysql'])->raw("DATE_FORMAT(t_tebus,'%Y')"))->where([['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$yearly_date]])->orderBy('t_tebus','desc')->get();
-            
+
                 // $pembeliankomuditi = Komuditi::on('mysql')->selectRaw('SUM(unit_komuditi) AS totalkomoditi')->addSelect(DB::connection('mysql')->raw('DATE_FORMAT(date_purchase, "%Y") as date_purchase'))
                 // ->groupBy(DB::connection('mysql')->raw("DATE_FORMAT(date_purchase,'%Y')"))->where([['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$yearly_date]])
                 // ->orderBy('created_at','desc')->get();
-              
+
             }
             //komoditi
             if($request->method == 'daily'){
@@ -2513,13 +2525,13 @@ class GadaiController extends Controller
             {
                 $pembeliankomuditi = Komuditi::on('mysql7')->selectRaw('SUM(unit_komuditi) as totalkomoditi')->addSelect('date_purchase')->groupBy('date_purchase')
                 ->where([['transaction_type','=','Beli Komoditi'],['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$weekly_date]])->orderBy('created_at','desc')->get();
-               
+
             }elseif($request->method == 'monthly')
             {
                 $pembeliankomuditi = Komuditi::on('mysql7')->selectRaw('SUM(unit_komuditi) AS totalkomoditi')->addSelect(DB::connection('mysql7')->raw('DATE_FORMAT(date_purchase, "%Y-%m") as date_purchase'))
                 ->groupBy(DB::connection('mysql7')->raw("DATE_FORMAT(date_purchase,'%Y%m')"))->where([['transaction_type','=','Beli Komoditi'],['date_purchase','<=',$current->toDateString()],['date_purchase','>=',$monthly_date]])
                 ->orderBy('created_at','desc')->get();
-           
+
             }elseif($request->method == 'yearly')
             {
                 $pembeliankomuditi = Komuditi::on('mysql7')->selectRaw('SUM(unit_komuditi) AS totalkomoditi')->addSelect(DB::connection('mysql7')->raw('DATE_FORMAT(date_purchase, "%Y") as date_purchase'))
@@ -2547,10 +2559,10 @@ class GadaiController extends Controller
                 }
 
             }
-            
+
 
         }
-        
+
         foreach($array_totalup as $array_index=>$totalup)
         {
             foreach($pembeliankomuditi as $indextebus=>$pembeliankomuditi_detail){
@@ -2566,7 +2578,7 @@ class GadaiController extends Controller
     }
 
     public function statistikGadaian(){
-        
+
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -2590,7 +2602,7 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $db=$cawangan['mysql'];
-            
+
         $gadai_aging=DB::connection($db)->select("SELECT count(norujukan) as a,sum(pinjaman)as b From gadai where (((period_diff(date_format('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1)=".$num.") and((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."'and t_gadai<='".$tarikh."'))");
         return response()->json($gadai_aging);
     }
@@ -2608,7 +2620,7 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $db=$cawangan['mysql'];
-    
+
         $gadai_aging=DB::connection($db)->select("SELECT kodcaw,count(norujukan) as a,sum(pinjaman)as b,((period_diff(date_format('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1) AS bln From gadai where ((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."' and t_gadai<='".$tarikh."'))");
         return response()->json($gadai_aging);
     }
@@ -2727,7 +2739,7 @@ class GadaiController extends Controller
             case '011233':
                 $tarikhtawarruq = '2021-06-28';
             break;
-          } 
+          }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
@@ -3032,7 +3044,7 @@ class GadaiController extends Controller
         ->where('tarikh_bayaran' ,'<=', $daterequest)
         ->where('kodcaw',$request->kodcaw)
         ->pluck('norujukan');
-        
+
         $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
             ->where([['sttebus',''],['hargajualan','<>','null']])
             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['hargajualan','<>','null']])
@@ -3088,7 +3100,7 @@ class GadaiController extends Controller
         //     ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
         //     ->where('kodcaw',$kodcaw)
         //     ->pluck('norujukan');
-        
+
         // $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
         //     ->where([['sttebus',''],['hargajualan','<>','null']])
         //     ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['hargajualan','<>','null']])
@@ -3166,7 +3178,7 @@ class GadaiController extends Controller
                             ->sum('bayaran_pembiayaan');
 
         $arraylejer = ["keluar" => $transaksi_debit,"masuk" => $transaksi_kredit];
-        
+
         return response($arraylejer);
     }
 
@@ -3276,7 +3288,7 @@ class GadaiController extends Controller
         $array_totalup = [];
 
         for($i=0;$i<12;$i++){
-                
+
                     switch($i+1){
                         case 1: $namabulan = 'Jan';
                                 $tarikh = $current->year . '-' . '01';
@@ -3314,14 +3326,14 @@ class GadaiController extends Controller
                         case 12: $namabulan = 'Dis';
                                 $tarikh = $current->year . '-' . '12';
                                 break;
-                                                    
+
                     }
                     array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'pembiayaan'=>0,'bayaran'=>0]);
-                
+
         }
 
         foreach($cawangan_all as $index=>$cawangan){
-          
+
             $gadai = Gadai::on($cawangan['mysql'])
                         ->selectRaw('SUM(pinjaman) AS totalpinjaman')
                         ->addSelect(DB::connection($cawangan['mysql'])
@@ -3342,7 +3354,7 @@ class GadaiController extends Controller
                     }
                 }
             }
-           
+
         }
 
         $bayaran = Transaction::on('mysql7')->selectRaw('SUM(duit_masuk) AS totalbayaran')
@@ -3394,7 +3406,7 @@ class GadaiController extends Controller
         if($totalKomoditi != 0){
             $percentUse = ($totalUse/($totalKomoditi-$totalKomoditiJual))*100;
         }
-        
+
         $dataKomoditi = [];
 
         array_push($dataKomoditi,['totalKomoditi'=>$totalKomoditi,'bakiKomoditi'=>$bakiKomoditi,'percentUse'=>$percentUse]);
@@ -3414,10 +3426,10 @@ class GadaiController extends Controller
                 $upah6bln_round = number_format($upah6bln_raw,2);
                 $upah6bln = substr($upah6bln_round, 0, -1);
                 //$upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
-		if(strpos($upah6bln,',')){                        
+		if(strpos($upah6bln,',')){
            		 $upah6bln = str_replace(',','',$upah6bln);
        		 }
-		
+
 
                 if($totalbayaran >= $upah6bln){
                    $update_gadai= Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
@@ -3551,7 +3563,7 @@ class GadaiController extends Controller
         }
 
         $total = $akru_cawangan_tebus + $akru_cawangan_masih_aktif;
-        
+
 
         return response()->json(number_format($total,2));
     }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 222b571..14c45db 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -93,7 +93,7 @@ class TebusController extends Controller
             $upah_rebet_round = str_replace(',','',$upah_rebet_round);
         }
         $upah_rebet = substr($upah_rebet_round, 0, -1);
-	    if(strpos($upah_rebet,',')){                        
+	    if(strpos($upah_rebet,',')){
             $upah_rebet = str_replace(',','',$upah_rebet);
         }
 
@@ -118,7 +118,7 @@ class TebusController extends Controller
             $upah_rebet_round = str_replace(',','',$upah_rebet_round);
         }
         $upah_rebet = substr($upah_rebet_round, 0, -1);
-	    if(strpos($upah_rebet,',')){                        
+	    if(strpos($upah_rebet,',')){
             $upah_rebet = str_replace(',','',$upah_rebet);
         }
 
@@ -131,14 +131,14 @@ class TebusController extends Controller
     }
 
     public function upahTawarruq($kodcaw,$norujukan){
-        
+
         $upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
         return response()->json(number_format($upah_semasa,2));
     }
 
     public function upahRebetTawarruq($kodcaw,$norujukan){
-        
+
         $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
 
         return response()->json(number_format($upah_rebet,2));
@@ -221,7 +221,7 @@ class TebusController extends Controller
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
-        
+
         $bln_mora = Moratorium::first();
 
         $upah_sebenar = $upah_asal - $rebet;
@@ -261,7 +261,7 @@ class TebusController extends Controller
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
-        
+
         $bln_mora = Moratorium::first();
 
         $upah_sebenar = $upah_asal - $rebet;
@@ -276,7 +276,7 @@ class TebusController extends Controller
             $upah_semasa = str_replace(',','',$upah_semasa);
         }
         $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
-	
+
 	    if($upah_semasa <= 0){
             $upah_semasa = 0;
         }
@@ -330,7 +330,7 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
             ->where('norujukan','=',$norujukan)
             ->first();
-        
+
         $upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
@@ -352,7 +352,7 @@ class TebusController extends Controller
         $transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
                     ->where('norujukan','=',$norujukan)
                     ->sum('keuntungan_rebet');
-        
+
         $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
 
         $rebet_raw =$gadai_data['upah12'] - $transaction_keuntungan - $upah_rebet;
@@ -364,7 +364,7 @@ class TebusController extends Controller
             $rebet_round = str_replace(',','',$rebet_round);
         }
         $rebet = substr($rebet_round, 0, -1);
-        
+
         return $rebet;
     }
 
@@ -387,13 +387,15 @@ class TebusController extends Controller
         }
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
-        
+
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
             'sttebus' => "T",
             't_update' => $current->toDateString(),
         ));
-
+        $harga_tebus = $this->tebusTawarruq($kodcaw,$norujukan);
         $upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
+        $upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan);
+        $upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
 
         $create_tebus = Tebus::on($cawangan['mysql'])->create([
             'kodcaw'=> $kodcaw,
@@ -403,20 +405,20 @@ class TebusController extends Controller
             'jenistebus' => $request->jenistebus,
             'glcode' => "0",
             't_tebus' => $current->toDateString(),
-            'jbg' => $request->jbg,
-            'kadarupah' => $request->kadarupah,
-            'nilaimarhun' => $request->nilai_marhun,
-            'pinjaman' => $request->pinjaman,
-            'ansuran' => $request->ansuran,
+            'jbg' => $gadai['tempoh'],
+            'kadarupah' => $gadai['kadarupah'],
+            'nilaimarhun' => $gadai['nilaimarhun'],
+            'pinjaman' => $gadai['pinjaman'],
+            'ansuran' => 0.00,
             'addpinjaman' => $request->addpinjaman,
-            'bakipjm' => $request->bakipinjaman,
-            'bakiupah' => $request->bakiupah,
+            'bakipjm' => $harga_tebus,
+            'bakiupah' => $upah_tebus,
             'terima' => "*",
             'kodgl' => "0",
             'nowakil' => $request->nowakil,
             'rebate' => $rebet,
             'marhuntebus' => $request->marhun,
-            'historygadaian' => $request->historygadaian,
+            'historygadaian' => $norujukan,
             'tarikhbyrn' => $current->toDateString(),
             'teller' => $request->teller
         ]);
@@ -437,9 +439,9 @@ class TebusController extends Controller
 
         $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $norujukan,
-            'bayaran_keuntungan' => $request->bakiupah,
+            'bayaran_keuntungan' => $upah_tebus,
             'bayaran_pembiayaan' => $gadai['bakipjm'],
-            'keuntungan_rebet' => $upah_rebet,
+            'keuntungan_rebet' => $upah_rebet_sebenar,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);
@@ -464,7 +466,7 @@ class TebusController extends Controller
                 'nokp' => $gadai['nokp'],
                 'teller' => $request->teller,
                 'kodcaw' => $kodcaw,
-                'duit_masuk' => $request->bakipinjaman,
+                'duit_masuk' => $harga_tebus,
                 'created_at' => $current,
                 'bakiharga' => $baki_hargajualan,
             ]);
@@ -478,14 +480,14 @@ class TebusController extends Controller
             $audit->actions = "Tebus Separuh";
         }else if($request->jenistebus == 'T'){
             $audit->actions = "Tebus Penuh";
-        }      
+        }
         $audit->norujukan = $norujukan;
         $audit->new_data = $create_tebus;
         $audit->kodcaw = $kodcaw;
         $audit->created_at = $current;
         $audit->updated_at = $current;
         $audit->save();
-       
+
         return response()->json($update_gadai, 201);
     }
 
@@ -508,7 +510,7 @@ class TebusController extends Controller
         }
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
-        
+
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
             'sttebus' => "T",
             't_update' => $current->toDateString(),
@@ -580,14 +582,14 @@ class TebusController extends Controller
 
         $audit = new Audit();
         $audit->users = $request->teller;
-        $audit->actions = "Auto Tawarruq";     
+        $audit->actions = "Auto Tawarruq";
         $audit->norujukan = $norujukan;
         $audit->new_data = $create_tebus;
         $audit->kodcaw = $kodcaw;
         $audit->created_at = $current;
         $audit->updated_at = $current;
         $audit->save();
-       
+
         return response()->json($update_gadai, 201);
     }
 
@@ -637,7 +639,7 @@ class TebusController extends Controller
                 ]);
             }
         }
-        
+
         return response()->json($tebus);
     }
 
@@ -682,20 +684,20 @@ class TebusController extends Controller
     }
 
     public function listPenebusanBaru($kodcaw){
-    
+
         $current = Carbon::now();
         $current = new Carbon();
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Tebus::on($cawangan['mysql'])
                     ->where([['t_tebus','=',$current->toDateString()],['tagterima','=',0]])
                     ->get();
-    
+
             return response()->json($gadai);
-    
+
     }
 
     public function listSerahKhazanah($kodcaw){
-    
+
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -718,7 +720,7 @@ class TebusController extends Controller
             $update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
                 'tagterima' => 1
             ));
-    
+
             return response()->json('success');
         }
     }
@@ -770,7 +772,7 @@ class TebusController extends Controller
         }else{
             $wakil = [];
         }
-        
+
 
         return response()->json($wakil,200);
     }
@@ -817,7 +819,7 @@ class TebusController extends Controller
             'alamat1' => $request->alamat,
             'telefon' => $request->telefon,
             'nota' => $request->nota
-            
+
         ]);
 
         return response()->json($wakil_create ,201);
@@ -842,7 +844,7 @@ class TebusController extends Controller
         $listtebus = Tebus::on($cawangan['mysql'])
                     ->where('norujukan','=',$request->norujukan)
                     ->get();
-    
+
             return response()->json($listtebus);
     }
 
@@ -1100,7 +1102,7 @@ class TebusController extends Controller
             // ->sum('bayaran_keuntungan');
             // ->get();
             ->pluck('norujukan');
-        
+
         $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $keuntungan_data)->whereNull('hargajualan')->pluck('norujukan');
 
         $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
@@ -1134,8 +1136,8 @@ class TebusController extends Controller
 
         $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
 
-        // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
-        
+        // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah;
+
         // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
 
         $total = $keuntungansebelumtawarruq + $keuntungan;
@@ -1189,7 +1191,7 @@ class TebusController extends Controller
             ->where('t_jual','>','2013-12-31')
             ->whereYear('t_jual','<',$current->year)
             ->sum('bakiupah');
-            
+
         //Upah Simpan Advansur
         $upahsimpanansur = Advansur::on($cawangan['mysql']) //--masuk
             ->whereYear('tarikh','<',$current->year)
@@ -1258,7 +1260,7 @@ class TebusController extends Controller
                 ->whereYear('tarikh_bayaran','<',$current->year)
                 ->where('kodcaw',$kodcaw)
                 ->pluck('norujukan');
-            
+
             $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
 
             $keuntungan = TransaksiKeuntungan::on('mysql7')
@@ -1283,7 +1285,7 @@ class TebusController extends Controller
                 ->whereDate('tarikh_bayaran','>=', $dateSM)
                 ->whereYear('tarikh_bayaran','<',$current->year)
                 ->sum('keuntungan_rebet');
-	    
+
             $keuntungansebenar = ($keuntungan + $keuntunganreducing);
 
 
@@ -1390,8 +1392,8 @@ class TebusController extends Controller
 
         if($kodcaw == '011229')
             $total -= 45390.37;
-        
-  
+
+
         return response()->json($total,200);
     }
 
@@ -1431,7 +1433,7 @@ class TebusController extends Controller
                 // ->whereNotNull('db2.hargajualan')
                 // ->sum('bayaran_keuntungan');
                 ->pluck('norujukan');
-            
+
             $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
 
             $keuntungan = TransaksiKeuntungan::on('mysql7')
@@ -1470,7 +1472,7 @@ class TebusController extends Controller
                 ->whereDate('tarikh_bayaran','>=', $dateSM)
                 ->whereYear('tarikh_bayaran','=',$tarikhyear->year)
                 ->sum('keuntungan_rebet');
-            
+
             // $keuntunganreducing = 0;
             // if($keuntunganreducing_data){
             //     foreach($keuntunganreducing_data as $index=>$keuntunganreducingData){
@@ -1480,7 +1482,7 @@ class TebusController extends Controller
             //         }
             //     }
             // }
-	    
+
             $total = ($keuntungan + $keuntunganreducing);
 
 
@@ -1501,7 +1503,7 @@ class TebusController extends Controller
         $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
 
         $keuntungan = TransaksiKeuntungan::on('mysql7')->whereIn('norujukan',$gadaiData)->sum('bayaran_keuntungan');
-        
+
         // $keuntungan = 0;
         // if($keuntungan_data){
         //     foreach($keuntungan_data as $index=>$keuntunganData){
@@ -1629,7 +1631,7 @@ class TebusController extends Controller
             ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
             ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$tarikhyear->year)
             ->sum('transaksi_keuntungan.bayaran_keuntungan');
-        
+
         // $ansuran = 0;
         // if($ansuran_data){
         //     foreach($ansuran_data as $index=>$ansuranData){
@@ -1665,7 +1667,7 @@ class TebusController extends Controller
 
 	if($request->hingga < '2021-06-01')
         {
-            
+
             $keuntungan_data = TransaksiKeuntungan::on('mysql7')
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->hingga)
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
@@ -1673,7 +1675,7 @@ class TebusController extends Controller
                 ->where('kodcaw',$request->kodcaw)
                 ->pluck('norujukan');
 
-        
+
             $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$keuntungan_data)->whereNotNull('hargajualan')->pluck('norujukan');
 
             $keuntungan = TransaksiKeuntungan::on('mysql7')
@@ -1771,7 +1773,7 @@ class TebusController extends Controller
                 ->where('tebus.t_tebus','<=',$request->tarikh)
                 ->where('db2.hargajualan','>','0') // tambahan 2021-05-07
                 ->whereNotNull('db2.hargajualan')
-                ->sum('rebate');      
+                ->sum('rebate');
 
         return response($rebet);
     }
@@ -1786,7 +1788,7 @@ class TebusController extends Controller
                 ->where('tebus.t_tebus','<=',$request->hingga)
                 ->where('db2.hargajualan','>','0')
                 ->whereNotNull('db2.hargajualan')
-                ->sum('rebate');      
+                ->sum('rebate');
 
         return response($rebet);
     }
@@ -1821,7 +1823,7 @@ class TebusController extends Controller
 
         $audit = new Audit();
         $audit->users = $request->teller;
-        $audit->actions = "Hapus Upah";     
+        $audit->actions = "Hapus Upah";
         $audit->norujukan = $norujukan;
         $audit->old_data = $data_ansuran;
         $audit->kodcaw = $kodcaw;
diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php
index 601b2d4..a0e7c24 100644
--- a/app/Http/Controllers/TransactionOnlineController.php
+++ b/app/Http/Controllers/TransactionOnlineController.php
@@ -32,6 +32,10 @@ class TransactionOnlineController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
+
+        $sag = Gadai::on($cawangan['mysql'])->where('norujukan',$request->norujukan)->first();
+
         $transaction = TransactionOnline::on('mysql7')->create([
             'nokp' => $request->nokp,
             'reference_no' => $request->reference_no,
@@ -42,7 +46,8 @@ class TransactionOnlineController extends Controller
             'total_payment' => $request->total_payment,
             'tarikh' => $current->toDateString(),
             'masa' => $current->toTimeString(),
-            'customer_name' => $request->customer_name
+            'customer_name' => $request->customer_name,
+            'tempohbayar'=>$sag['tempoh']
         ]);
 
         return response()->json($transaction,201);
@@ -68,12 +73,12 @@ class TransactionOnlineController extends Controller
             $gadai_data = Gadai::on($cawangan['mysql'])->where([['norujukan',$transaction['norujukan']],['nokp',$transaction['nokp']]])->first();
 
             if($gadai_data['hargajualan'] > 0){
-                $this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
+                $this->updateGadaiMarhunKaunter($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at'],$transaction['tempohbayar']);
             }else{
                 $this->createAdvansur($transaction['kodcaw'],$transaction['norujukan'],$transaction['total_payment'],$transaction['paid_at']);
             }
 
-            GlDetail::on($cawangan['mysql'])->create([ 
+            GlDetail::on($cawangan['mysql'])->create([
                 'kodcaw' => $transaction['kodcaw'],
                 'tarikh' => Carbon::parse($transaction['paid_at'])->format('Y-m-d'),
                 'dtacct' => '1000/010',
@@ -83,7 +88,7 @@ class TransactionOnlineController extends Controller
                 'teller' => 'ONLINE'
              ]);
 
-            TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan'],['billplz_id',$transaction['billplz_id']]]])->update([
+            TransactionOnline::on('mysql7')->where([['norujukan',$transaction['norujukan']],['billplz_id',$transaction['billplz_id']]])->update([
                 'update_status' => 1,
                 'update_serahan' => 1
             ]);
@@ -92,7 +97,7 @@ class TransactionOnlineController extends Controller
         return response()->json('success');
     }
 
-    public function kiraupahTawarruq($kodcaw,$norujukan){
+    public function kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar){
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
@@ -101,20 +106,20 @@ class TransactionOnlineController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+        $bilang_bln = $tempohbayar - $gadai_data['tempohbayar'];
 
         $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);
         $upah_semasa = substr($upah_semasa_round, 0, -1);
-        if(strpos($upah_semasa,',')){                        
+        if(strpos($upah_semasa,',')){
             $upah_semasa = str_replace(',','',$upah_semasa);
         }
 	    // $upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
         return $upah_semasa;
     }
 
-    public function kiraUpahRebet($kodcaw,$norujukan){
+    public function kiraUpahRebet($kodcaw,$norujukan,$tempohbayar){
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
@@ -123,13 +128,13 @@ class TransactionOnlineController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+        $bilang_bln = $tempohbayar - $gadai_data['tempohbayar'];
 
         $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
 
         $upah_rebet_round = number_format($upahrebet_raw,2);
         $upah_rebet = substr($upah_rebet_round, 0, -1);
-        if(strpos($upah_rebet,',')){                        
+        if(strpos($upah_rebet,',')){
             $upah_rebet = str_replace(',','',$upah_rebet);
         }
 	    // $upah_rebet = floatval(preg_replace('/[^\d.]/', '', $upah_rebet));
@@ -137,15 +142,19 @@ class TransactionOnlineController extends Controller
         return $upah_rebet;
     }
 
-    public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at){
+    public function updateGadaiMarhunKaunter($kodcaw,$norujukan,$bayaran,$paid_at,$tempohbayar){
         $current = Carbon::now();
         $current = new Carbon();
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
-        $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
-        $upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
+        if($tempohbayar == 0.0){
+            $tempohbayar = $gadai['tempoh'];
+        }
+
+        $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan,$tempohbayar);
+        $upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan,$tempohbayar);
 
         $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
 
@@ -188,7 +197,7 @@ class TransactionOnlineController extends Controller
             'jbg' => 0,
             't_update' => Carbon::parse($paid_at)->toDateString(),
             'bakihargajualan' => $baki_hargajualan,
-            'tempohbayar' => $gadai['tempoh'],
+            'tempohbayar' => $tempohbayar,
             'lelong_tawarruq' => $lelong_tawarruq
         ));
         return response()->json($update_gadai, 200);
@@ -243,4 +252,19 @@ class TransactionOnlineController extends Controller
             return response()->json(false);
         }
     }
+
+    public function getListUnsuccessful(){
+        $list = TransactionOnline::on('mysql7')->whereIn('status',['NOT PAID','UNSUCCESSFUL'])->get();
+
+        return response()->json($list);
+    }
+
+    public function updateUnsuccessfulTransaction(Request $request){
+        $transaction = TransactionOnline::on('mysql7')->where('billplz_id','=',$request->billplz_id)->update(array(
+            'status' => $request->status,
+            'paid_at' => $request->paid_at
+        ));
+
+        return response()->json($transaction,200);
+    }
 }
diff --git a/app/KadarUpah.php b/app/KadarUpah.php
new file mode 100644
index 0000000..fa897d6
--- /dev/null
+++ b/app/KadarUpah.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class KadarUpah extends Model
+{
+    protected $table = 'kadarupah';
+    protected $connection = 'mysql7';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    // protected $fillable = [
+
+    // ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
diff --git a/config/database.php b/config/database.php
index b8fa564..b7e9873 100644
--- a/config/database.php
+++ b/config/database.php
@@ -5,6 +5,18 @@ return [
    'default' => 'accounts',
 
    'connections' => [
+        'lelong' => [
+            'driver'    => 'mysql',
+            'host'      => env('DB_HOST_LELONG'),
+            'port'      => env('DB_PORT_LELONG'),
+            'database'  => env('DB_DATABASE_LELONG'),
+            'username'  => env('DB_USERNAME_LELONG'),
+            'password'  => env('DB_PASSWORD_LELONG'),
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ],
         'mysql' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST'),
diff --git a/routes/web.php b/routes/web.php
index 30ccbd7..d28e3f4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -224,6 +224,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('transaction/online/express',['uses'=>'TransactionOnlineController@getTransactionOnline']);
     $router->get('transaction/online/update',['uses'=>'TransactionOnlineController@updateTransactionOnline']);
     $router->get('transaction/online/login',['uses'=>'TransactionOnlineController@getTransactionOnlineLogin']);
+    $router->get('transaction/online/unsuccessful',['uses'=>'TransactionOnlineController@getListUnsuccessful']);
+    $router->put('transaction/online/unsuccesfull/update',['uses'=>'TransactionOnlineController@updateUnsuccessfulTransaction']);
+