diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 87db736..c6bb1ae 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -9,7 +9,7 @@ use App\Gadai;
 use App\Lelong;
 use App\Tebus;
 use App\Vault;
-use App\Gldetail;
+use App\GlDetail;
 use App\Panjar;
 use App\TransactionOnline;
 use App\Tunai;
@@ -195,7 +195,7 @@ class AdminPageController extends Controller
 
         $tebus = Gadai::on($cawangan['mysql'])
                 ->whereYear('t_update',$current->year)
-                ->where('sttebus','=','T')
+                ->where('sttebus','!=','')
                 ->sum('pinjaman');
 
                 
@@ -597,7 +597,7 @@ class AdminPageController extends Controller
                         ->groupBy(DB::connection($cawangan['mysql'])
                         ->raw("DATE_FORMAT(t_update,'%Y%m')"))
                         ->whereYear('t_update',$current->year)
-                        ->where([['sttebus','=','T'],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]])
+                        ->where([['sttebus','!=',''],['t_update','<=',$current->toDateString()],['t_update','>=',$monthly_date]])
                         ->orderBy('t_update','asc')
                         ->get();
 
@@ -986,7 +986,7 @@ class AdminPageController extends Controller
 
         $tebuslatest = Gadai::on($cawangan['mysql'])
                 ->whereYear('t_update',$current->year)
-                ->where([['sttebus','=','T'],['t_update','<=',$harini],['t_update','>=',$monthly_date]])
+                ->where([['sttebus','!=',''],['t_update','<=',$harini],['t_update','>=',$monthly_date]])
                 ->orderBy('t_update','asc')
                 ->sum('pinjaman');
 
@@ -1039,9 +1039,10 @@ class AdminPageController extends Controller
         }
 
 
-        $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakipjm');
+        $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('pinjaman');
+        $lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$harini)->sum('pinjaman');
         
-        $tebusToday += $tebus;
+        $tebusToday = $tebus + $lelong;
         
         $diffTebusPercent = 0;
         
@@ -1140,11 +1141,31 @@ class AdminPageController extends Controller
         $upah_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$harini)->sum('bakiupah');
         $upah_today = Advansur::on($cawangan['mysql'])->where('tarikh',$harini)->sum('upahDibayar');
         
-        $upahToday = $upahToday + $upah_tebus_today + $upah_today;
+        $upahToday += $upah_today;
         
-        $ansuran_today = TransaksiKeuntungan::on('mysql7')->where([['tarikh_bayaran','>=',$harini . ' 00:00:00'],['tarikh_bayaran','<=',$harini . ' 23:59:59']])->where('kodcaw','=',$request->kodcaw)->sum('bayaran_keuntungan');
+        $ansuran_today = Transaction::on('mysql7')
+                        ->leftJoin('transaksi_keuntungan as trans', function($join)
+                        {
+                                $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                        })
+                        ->where('transaction.trans_type','=','A')
+                        ->where([['trans.tarikh_bayaran','>=',$harini . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']])
+                        ->where('trans.kodcaw','=',$request->kodcaw)
+                        ->sum('bayaran_keuntungan');
 
-        $upahToday = $upahToday + $ansuran_today;
+        $upah_tebus_today = Transaction::on('mysql7')
+                        ->leftJoin('transaksi_keuntungan as trans', function($join)
+                        {
+                                $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                                $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                        })
+                        ->where('transaction.trans_type','!=','A')
+                        ->where([['trans.tarikh_bayaran','>=',$harini . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']])
+                        ->where('trans.kodcaw','=',$request->kodcaw)
+                        ->sum('keuntungan_rebet');
+
+        $upahToday = $upah_tebus_today + $ansuran_today;
 
         $diffUpah = 0;
 
@@ -1446,4 +1467,10 @@ class AdminPageController extends Controller
         return response()->json($blacklist, 201);
     }
 
+    public function DeleteBlackList(Request $request)
+    {
+        $blacklist = Blacklist::where('id',$request->id)->delete();
+
+        return response()->json($blacklist, 201);
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index e1a1edd..3e5aba2 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -3270,45 +3270,50 @@ class GadaiController extends Controller
         $array_totalup = [];
 
         for($i=0;$i<12;$i++){
-                if($i == 0){
-                    $monthly_array_date = $monthly_array->startOfMonth()->subMonths(0);
-                }else{
-                    $monthly_array_date = $monthly_array->startOfMonth()->subMonths(1);
-                }
-
-                if($monthly_array_date->year === $current->year)
-                {
-                    switch($monthly_array_date->month){
+                
+                    switch($i+1){
                         case 1: $namabulan = 'Jan';
+                                $tarikh = $current->year . '-' . '01';
                                 break;
                         case 2: $namabulan = 'Feb';
+                                $tarikh = $current->year . '-' . '02';
                                 break;
                         case 3: $namabulan = 'Mac';
+                                $tarikh = $current->year . '-' . '03';
                                 break;
                         case 4: $namabulan = 'Apr';
+                                $tarikh = $current->year . '-' . '04';
                                 break;
                         case 5: $namabulan = 'Mei';
+                                $tarikh = $current->year . '-' . '05';
                                 break;
                         case 6: $namabulan = 'Jun';
+                                $tarikh = $current->year . '-' . '06';
                                 break;
                         case 7: $namabulan = 'Jul';
+                                $tarikh = $current->year . '-' . '07';
                                 break;
                         case 8: $namabulan = 'Aug';
+                                $tarikh = $current->year . '-' . '08';
                                 break;
                         case 9: $namabulan = 'Sep';
+                                $tarikh = $current->year . '-' . '09';
                                 break;
                         case 10: $namabulan = 'Okt';
+                                $tarikh = $current->year . '-' . '10';
                                 break;
                         case 11: $namabulan = 'Nov';
+                                $tarikh = $current->year . '-' . '11';
                                 break;
                         case 12: $namabulan = 'Dis';
+                                $tarikh = $current->year . '-' . '12';
+                                break;
                                                     
                     }
-                    array_push($array_totalup,['tarikh'=>$monthly_array_date->year.'-'.sprintf("%02d", $monthly_array_date->month),'namabulan'=>$namabulan,'pembiayaan'=>0,'bayaran'=>0]);
-                }
+                    array_push($array_totalup,['tarikh'=>$tarikh,'namabulan'=>$namabulan,'pembiayaan'=>0,'bayaran'=>0]);
+                
         }
 
-
         foreach($cawangan_all as $index=>$cawangan){
           
             $gadai = Gadai::on($cawangan['mysql'])
diff --git a/routes/web.php b/routes/web.php
index 8446d2e..f313ee0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -660,6 +660,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->post('simpanStatus',['uses'=>'AdminPageController@SimpanStatus']);
 
     $router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']);
+    $router->post('DeleteBlacklist',['uses'=>'AdminPageController@DeleteBlackList']);
     $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);