diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index ca57849..ab8f95a 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -300,7 +300,7 @@ class CustomerController extends Controller
         // $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $gadai = Customer::on('mysql7')
-                ->where('tarikhdaftar','=',$tarikh)
+                ->where([['tarikhdaftar','=',$tarikh],['kodcaw',$kodcaw]])
                 ->orderBy('tarikhdaftar', 'desc')
                 ->get();
         
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index af65b0e..7aa80a0 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2196,6 +2196,24 @@ class GadaiController extends Controller
             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;
           }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 6fd78a8..b4e27c2 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -60,7 +60,7 @@ class LaporanController extends Controller
         $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count();
         $bilangan_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->count();
         $bilangan_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->count();
-        $bilangan_customer_baru = Customer::on('mysql7')->where('tarikhdaftar','=',$request->tarikh)->count();
+        $bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','=',$request->tarikh],['kodcaw',$request->kodcaw]])->count();
 
         //c
         /* Sistem */
@@ -252,8 +252,9 @@ class LaporanController extends Controller
 
     public function CalcXtra($kodcaw,Request $request)
     {
-        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+	
         $upahsimpan = GlCode::on($cawangan['mysql'])
                         ->where('glcode','=','5000/413')
                         ->sum('amaun');
@@ -261,12 +262,16 @@ class LaporanController extends Controller
         $bakilelongxtra = GlCode::on($cawangan['mysql'])
                         ->where('glcode','=','7000/190')
                         ->sum('amaun');
-
+	
         $untungrugiterkumpul = GlCode::on($cawangan['mysql'])
                         ->where('glcode','=','7000/201')
                         ->sum('amaun');
 
-        $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul)];
+	$kerugianlelongxtra = GlCode::on($cawangan['mysql'])
+                        ->where('glcode','=','3000/120')
+                        ->sum('amaun');	
+
+        $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)];
 
         return response()->json($arrayxtra);
     }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 3b3fb1b..49c77de 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -936,8 +936,10 @@ class TebusController extends Controller
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
-        $dateSM = new Carbon('2021-04-24');
-        $dateSM->addDays(1);
+        //$dateSM = new Carbon('2021-04-24');
+        //$dateSM->addDays(1);
+
+	$dateSM = '2021-04-24';
 
         $current = Carbon::now();
         $current = new Carbon();
@@ -945,8 +947,8 @@ class TebusController extends Controller
         $keuntungan = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
-		    ->where('transaksi_keuntungan.tarikh_bayaran', '<=', $daterequest)
-                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
+		    ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
@@ -954,13 +956,41 @@ class TebusController extends Controller
         $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh)
 		    ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('keuntungan_rebet');
 
-        $total = $keuntungan + $keuntunganreducing;
+        $bukanansuran = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->leftJoin('transaction as trans', function($join)
+                    {
+                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                    })
+                    ->where('trans.trans_type','!=','A')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('keuntungan_rebet');
+
+        $ansuran = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->leftJoin('transaction as trans', function($join)
+                    {
+                        $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                        $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                    })
+                    ->where('trans.trans_type','=','A')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('bayaran_keuntungan');
+
+	$total = ($keuntungan+$keuntunganreducing + $ansuran + $bukanansuran);
 
         return response($total);
     }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index d3985ad..eac632c 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -321,7 +321,7 @@ class VaultController extends Controller
 
 
       //Sebelum Tawarruq
-      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP')
+      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM')
       {
          $serahanpkb = GlDetail::on($cawangan['mysql'])
             ->where('dtacct','=',$serahanpkb)
diff --git a/routes/web.php b/routes/web.php
index ae1e4b3..b858815 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -175,7 +175,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']);
 
 
-    $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  // new added 20210413
+    $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  // new added 20210413
     $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  // new added  20210413
 
 
@@ -489,4 +489,4 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
 
     $router->get('komoditi/jumlah/baki',['uses'=>'KomuditiController@jumlahKomoditiDashboard']);
     $router->post('komoditi/statistik',['uses'=>'KomuditiController@statistikKomoditiDashboard']);
-});
\ No newline at end of file
+});