diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 745824c..083c67a 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -558,14 +558,15 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $gadai = Gadai::on($cawangan['mysql'])
-                ->select('Gadai.t_gadai','Gadai.norujukan','cust.nama','Gadai.nokp','Gadai.semakbarcode','Gadai.masa','Gadai.berat','Gadai.nilaimarhun','Gadai.pinjaman','Gadai.upah12','Gadai.percentpinj','cust.alamat1','Gadai.teller')
-                ->join('Customer as cust', function($join)
+                ->select('gadai.t_gadai','gadai.norujukan','cust.nama','gadai.nokp','gadai.semakbarcode','gadai.masa','gadai.berat','gadai.nilaimarhun','gadai.pinjaman','gadai.upah12','gadai.percentpinj','cust.alamat1','gadai.teller')
+                ->join('online_arrahn.customer as cust', function($join)
                 {
-                    $join->on('Gadai.nokp', '=', 'cust.kpbaru');
-                    $join->orOn('Gadai.nokp', '=', 'cust.kplama');
+                    $join->on('gadai.nokp', '=', 'cust.kpbaru');
+                    $join->orOn('gadai.nokp', '=', 'cust.kplama');
                 })
-                ->where('Gadai.t_gadai','=',$tarikh)
-                ->orderBy('Gadai.teller')
+                ->where('gadai.t_gadai','=',$tarikh)
+                ->orderBy('gadai.teller')
+                ->orderBy('gadai.sirig')
                 ->get();
         
         return response()->json($gadai);
@@ -2338,7 +2339,16 @@ class GadaiController extends Controller
             case '011412':
                 $tarikhtawarruq = '2021-06-23';
             break;
-          }
+            case '011234':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '020303':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '010618':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+          } 
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
@@ -2451,18 +2461,20 @@ class GadaiController extends Controller
             break;
           }
 
-        $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',1)
-            ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=','']])
-            ->sum('pinjaman');
-
-        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        $gadai = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
-            ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['t_update','<=',$request->hingga],['t_gadai','<=',$tarikhtawarruq]])
+            ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]])
             ->sum('pinjaman');
 
-        $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
+        $tebus = Gadai::on($cawangan['mysql'])
+            ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan')
+            ->where('Gadai.tagpalsu','=',0)
+            ->where([['Gadai.t_gadai','<=',$tarikhtawarruq],['Gadai.sttebus','=','T']])
+            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
+            ->sum('teb.pinjaman');
+
+        $array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus];
 
         return response()->json($array_rekodemas);
     }
@@ -2486,12 +2498,20 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        $Gadai = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']])
             ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
             ->sum('pinjaman');
 
+        $Tebus = Gadai::on($cawangan['mysql'])
+            ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan')
+            ->where('Gadai.tagpalsu','=',0)
+            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['Gadai.sttebus','=','T'],['Gadai.hargajualan','<>','NULL']])
+            ->sum('teb.pinjaman');
+
+            $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
+
         return response()->json($rekod_pinjamandiberi);
     }
 
@@ -2548,16 +2568,17 @@ class GadaiController extends Controller
         ->whereNotNull('upah12')
         ->sum('upah12');
 
-        $transaksi = TransaksiKeuntungan::on('mysql7')
-        ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-        ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
-        ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
-        ->whereYear('tarikh_bayaran','=',$current->year)
-        ->whereNotNull('db2.hargajualan')
-        ->sum('bayaran_keuntungan');
+        // $transaksi = TransaksiKeuntungan::on('mysql7')
+        // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+        // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
+        // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
+        // ->whereYear('tarikh_bayaran','=',$current->year)
+        // ->whereNotNull('db2.hargajualan')
+        // ->sum('bayaran_keuntungan');
 
 
-        $totalkeuntungan = $keuntungan - $transaksi;
+        // $totalkeuntungan = $keuntungan - $transaksi;
+        $totalkeuntungan = $keuntungan;
 
         return response()->json($totalkeuntungan,200);
     }
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index bce3ce8..66f7748 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -264,8 +264,9 @@ class LaporanController extends Controller
                     ->whereDate('trans.created_at','>=',$request->mula)
                     ->whereDate('trans.created_at','<=',$request->akhir)
                     ->where('trans.trans_type','=','A')
+                    ->where('trans.kodcaw','=',$request->kodcaw)
                     ->groupBy('trans.id')
-                    ->sum('keuntungan_rebet');
+                    ->sum('bayaran_keuntungan');
 
         // $total_ansuran = number_format($total_ansuran,2);
 
@@ -304,7 +305,7 @@ class LaporanController extends Controller
 
         //h
         $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
-        $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',75]])->sum('pinjaman');
+        $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman');
         $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman');
 
         $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('nilaimarhun');
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 9e8baa9..7570541 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -494,15 +494,16 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $tebus = Tebus::on($cawangan['mysql'])
-                ->select('tebus.t_tebus', 'gad.t_gadai','Tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
-                ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan')
-                ->join('Customer as cust', function($join)
+                ->select('tebus.t_tebus', 'gad.t_gadai','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->join('online_arrahn.customer as cust', function($join)
                 {
                     $join->on('gad.nokp', '=', 'cust.kpbaru');
                     $join->orOn('gad.nokp', '=', 'cust.kplama');
                 })
-                ->where('Tebus.t_tebus','=',$tarikh)
-                ->orderBy('Tebus.teller')
+                ->where('tebus.t_tebus','=',$tarikh)
+                ->orderBy('tebus.teller')
+                ->orderBy('tebus.sirit')
                 ->get();
         
         return response()->json($tebus);
@@ -1036,6 +1037,34 @@ class TebusController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
+
+        if($request->tarikh < '2021-06-09')
+        {
+            $keuntungan = TransaksiKeuntungan::on('mysql7')
+                ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<', $request->tarikh)
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
+                ->whereYear('tarikh_bayaran','=',$current->year)
+                ->whereNotNull('db2.hargajualan')
+                ->sum('bayaran_keuntungan');
+
+
+            $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
+                ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh)
+                ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
+                ->whereYear('tarikh_bayaran','=',$current->year)
+                ->whereNotNull('db2.hargajualan')
+                ->sum('keuntungan_rebet');
+
+
+            // dd($keuntungan,$keuntunganreducing);
+
+            $total = ($keuntungan + $keuntunganreducing);
+
+
+        }else{
+
         $keuntungan = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
@@ -1083,7 +1112,9 @@ class TebusController extends Controller
                     ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
 
-	$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
+        $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
+
+        }
 
         return response($total);
     }
diff --git a/config/database.php b/config/database.php
index da7a044..afbd7f8 100644
--- a/config/database.php
+++ b/config/database.php
@@ -16,6 +16,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
          ],
         'mysql2' => [
             'driver'    => 'mysql',
@@ -28,6 +29,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql3' => [
             'driver'    => 'mysql',
@@ -40,6 +42,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql4' => [
             'driver'    => 'mysql',
@@ -52,6 +55,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql5' => [
             'driver'    => 'mysql',
@@ -64,6 +68,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
 
@@ -78,6 +83,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
 
@@ -92,6 +98,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql8' => [
             'driver'    => 'mysql',
@@ -104,6 +111,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql9' => [
@@ -117,6 +125,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql10' => [
             'driver'    => 'mysql',
@@ -129,6 +138,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql11' => [
             'driver'    => 'mysql',
@@ -141,6 +151,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql12' => [
@@ -154,6 +165,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql13' => [
             'driver'    => 'mysql',
@@ -166,6 +178,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql14' => [
             'driver'    => 'mysql',
@@ -178,6 +191,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql15' => [
@@ -191,6 +205,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql16' => [
             'driver'    => 'mysql',
@@ -203,6 +218,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql17' => [
@@ -216,6 +232,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql18' => [
             'driver'    => 'mysql',
@@ -228,6 +245,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql19' => [
             'driver'    => 'mysql',
@@ -240,6 +258,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql20' => [
             'driver'    => 'mysql',
@@ -252,6 +271,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql21' => [
             'driver'    => 'mysql',
@@ -264,6 +284,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql22' => [
@@ -277,6 +298,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql23' => [
             'driver'    => 'mysql',
@@ -289,6 +311,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql24' => [
@@ -302,6 +325,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql25' => [
@@ -315,6 +339,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql26' => [
             'driver'    => 'mysql',
@@ -327,6 +352,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql27' => [
             'driver'    => 'mysql',
@@ -339,6 +365,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
 
         ],
         'mysql28' => [
@@ -352,6 +379,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql29' => [
             'driver'    => 'mysql',
@@ -364,6 +392,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql30' => [
             'driver'    => 'mysql',
@@ -376,6 +405,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql31' => [
             'driver'    => 'mysql',
@@ -388,6 +418,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql32' => [
             'driver'    => 'mysql',
@@ -400,6 +431,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
         'mysql33' => [
             'driver'    => 'mysql',
@@ -412,6 +444,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+            'unix_socket'   => env('UNIX_SOCKET',    '/Applications/MAMP/tmp/mysql/mysql.sock'),
         ],
     ],
 ];