diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index f430b16..905b3d3 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -707,4 +707,23 @@ class CustomerController extends Controller
 
         return response()->json($blacklist);
     }
+
+    public function showCustomerByEachCawangan($ic)
+    {
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $custcawangan = array();
+
+        foreach($cawangan_all as $index=>$cawangan)
+        {
+            $customer = Gadai::on($cawangan['mysql'])
+                ->select('kodcaw')
+                ->where('nokp', '=', $ic)
+                ->first();
+            
+            if($customer)    
+                array_push($custcawangan,['kodcaw' => $customer['kodcaw'], 'namacawangan' => $cawangan['details_caw']]);
+        }
+
+        return response()->json($custcawangan);
+    }
 }
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index db4fb98..3857108 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -658,20 +658,10 @@ class GadaiController extends Controller
 
         //Outstanding
         $outstanding = Gadai::on($cawangan['mysql'])
-       	->where([['tagpalsu','=',0],['t_gadai','<=',$current->toDateString()],['sttebus','=','']])
-        ->orWhere([['tagpalsu','=',0],['t_update','>',$current->toDateString()],['sttebus','!=',''],['t_gadai','<=',$current->toDateString()]])
-        ->get();
+        ->where('sttebus','=','')
+        ->sum('pinjaman');
 
-        $totaloutstanding = 0;
-        foreach($outstanding as $index1=>$os)
-        {
-            if($os['hargajualan'] == null)
-                $totaloutstanding += $os['pinjaman'];
-            else
-                $totaloutstanding += $os['bakipjm'];
-        }
-
-        array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $totaloutstanding]);
+        array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
 
         return response()->json($array_dashboard);
     }
@@ -2412,7 +2402,6 @@ class GadaiController extends Controller
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
@@ -2421,15 +2410,10 @@ class GadaiController extends Controller
             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
             ->sum('pinjaman');
 
-            // $gadaibaru = Gadai::on($cawangan['mysql'])
-            // ->where('tagpalsu','=',0)
-            // ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
-            // ->sum('pinjaman');
-
-            // $rekod_pinjamandiberi;
-
         if($kodcaw === '011232')
-          $rekod_pinjamandiberi -= 282;
+        {
+            $rekod_pinjamandiberi -= 282;
+        }            
 
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
@@ -2578,11 +2562,6 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-       // $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');
         $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman');
 
         $Tebus = Gadai::on($cawangan['mysql'])
@@ -2609,25 +2588,18 @@ class GadaiController extends Controller
 
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
-        // ->where('t_gadai','>=','2021-04-14')
         ->where('hargajualan','<>','null')
-        // ->where('sttebus','=','')
         ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
         ->whereNotNull('upah12')
         ->sum('upah12');
 
         $transaksi = 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)
         ->whereYear('tarikh_bayaran','=',$current->year)
         ->whereNotNull('db2.hargajualan')
         ->sum('bayaran_keuntungan');
 
-        // $transaksi = TransaksiKeuntungan::on('mysql7')
-        // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
-        // ->where('tarikh_bayaran' ,'<=', $daterequest)
-        // ->sum('bayaran_keuntungan');
 
         $totalkeuntungan = $keuntungan - $transaksi;
 
@@ -2649,16 +2621,6 @@ 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');
-
-
-        // $totalkeuntungan = $keuntungan - $transaksi;
         $totalkeuntungan = $keuntungan;
 
         return response()->json($totalkeuntungan,200);
@@ -2791,4 +2753,109 @@ class GadaiController extends Controller
         }
         return response()->json('successful',200);
     }
+
+    public function PembiayaanBulanan(Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $monthly = Carbon::now();
+        $monthly = new Carbon();
+        $monthly_array = Carbon::now();
+        $monthly_array = new Carbon();
+
+        $monthly_date = $monthly->startOfMonth()->subMonths(11)->toDateString();
+
+        $cawangan_all = Cawangan::on('mysql7')->get();
+
+        $arraybulanan = [];
+        $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){
+                        case 1: $namabulan = 'Jan';
+                                break;
+                        case 2: $namabulan = 'Feb';
+                                break;
+                        case 3: $namabulan = 'Mac';
+                                break;
+                        case 4: $namabulan = 'Apr';
+                                break;
+                        case 5: $namabulan = 'Mei';
+                                break;
+                        case 6: $namabulan = 'Jun';
+                                break;
+                        case 7: $namabulan = 'Jul';
+                                break;
+                        case 8: $namabulan = 'Aug';
+                                break;
+                        case 9: $namabulan = 'Sep';
+                                break;
+                        case 10: $namabulan = 'Okt';
+                                break;
+                        case 11: $namabulan = 'Nov';
+                                break;
+                        case 12: $namabulan = 'Dis';
+                                                    
+                    }
+                    array_push($array_totalup,['tarikh'=>$monthly_array_date->year.'-'.sprintf("%02d", $monthly_array_date->month),'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'])
+                        ->raw('DATE_FORMAT(t_gadai, "%Y-%m") as t_gadai'))
+                        ->groupBy(DB::connection($cawangan['mysql'])
+                        ->raw("DATE_FORMAT(t_gadai,'%Y%m')"))
+                        ->whereYear('t_gadai',2021)
+                        ->where([['nokp','=',$request->icno],['t_gadai','<=',$current->toDateString()],['t_gadai','>=',$monthly_date]])
+                        ->orderBy('t_gadai','desc')
+                        ->get();
+
+            foreach($array_totalup as $array_index=>$totalup){
+                foreach($gadai as $indexgadai=>$gadai_detail){
+                    if($totalup['tarikh'] == $gadai_detail['t_gadai']){
+                        $total_gadai = $totalup['pembiayaan'];
+                        $total_gadai += $gadai_detail['totalpinjaman'];
+                        $array_totalup[$array_index]['pembiayaan'] = $total_gadai;
+                    }
+                }
+            }
+           
+        }
+
+        $bayaran = Transaction::on('mysql7')->selectRaw('SUM(duit_masuk) AS totalbayaran')
+                ->addSelect(DB::connection('mysql7')
+                ->raw('DATE_FORMAT(created_at, "%Y-%m") as created_at'))
+                ->groupBy(DB::connection('mysql7')
+                ->raw("DATE_FORMAT(created_at,'%Y%m')"))
+                ->where([['nokp','=',$request->icno],['created_at','<=',$current->toDateString()],['created_at','>=',$monthly_date]])
+                ->orderBy('created_at','desc')
+                ->get();
+
+        foreach($array_totalup as $array_index=>$totalup){
+            foreach($bayaran as $indexbayaran=>$bayaran_detail){
+                if($totalup['tarikh'] == $bayaran_detail['created_at']){
+                    $total_bayaran = $totalup['bayaran'];
+                    $total_bayaran += $bayaran_detail['totalbayaran'];
+                    $array_totalup[$array_index]['bayaran'] = $total_bayaran;
+                }
+            }
+        }
+
+        // asort($array_totalup);
+
+        return response()->json($array_totalup);
+    }
 }
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 9381385..fe99a89 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -41,6 +41,7 @@ class LaporanController extends Controller
         $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah');
 
         $total_keuntunganansuran = 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');
@@ -49,12 +50,65 @@ class LaporanController extends Controller
                     ->whereDate('trans.created_at','=',$request->tarikh)
                     ->where('trans.kodcaw','=',$request->kodcaw)
                     ->where('trans.trans_type','=','A')
-                    // ->groupBy('trans.id')
+                    ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
 
+        $total_keuntunganbukanansuran = 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('trans.created_at','=',$request->tarikh)
+                    ->where('trans.kodcaw','=',$request->kodcaw)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('keuntungan_rebet');
 
-        // $total_ansuran = number_format($total_ansuran,2);
-        $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus);
+        $keuntungan = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh)
+                    ->whereNull('db2.hargajualan')
+                    ->sum('bayaran_keuntungan');
+
+        $upahtebus = Tebus::on($cawangan['mysql'])
+                    ->where('t_tebus','=',$request->tarikh)
+                    ->sum('upahdibayar');
+
+        $upahlelong = Lelong::on($cawangan['mysql'])
+                    ->where('t_jual','=',$request->tarikh)
+                    ->sum('bakiupah');
+
+        $upahansur = Advansur::on($cawangan['mysql'])
+                    ->where('tarikh','=',$request->tarikh)
+                    ->sum('upahdibayar');
+        
+
+        $upahsimpan = $keuntungan + $upahtebus + $upahlelong + $upahansur;
+        $keuntungansebenar = $total_keuntunganansuran + $total_keuntunganbukanansuran;
+
+
+        $total_keuntungan = floatval($upahsimpan) + floatval($keuntungansebenar);
+
+
+        $tebus = Tebus::on($cawangan['mysql'])
+                ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg')
+                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+                ->where('tebus.t_tebus','=',$request->tarikh)
+                ->get();
+
+        $totalpenebusan = 0;
+
+        foreach($tebus as $index1=>$teb)
+        {
+            if($teb['gad.hargajualan'] != $teb['bakihargajualan'])
+            {
+                $totalpenebusan += $teb['gadaibakipjm'];
+            }else{
+                $totalpenebusan += $teb['pinjaman'];
+            }
+        }
 
 
         //b
@@ -183,10 +237,12 @@ class LaporanController extends Controller
         }
 
         //g
-        $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh);
+        $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','<',0);
+        $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','>',0);
+
+        $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
+        $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
 
-        $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
-        $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
 
         //h
         $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman');
@@ -209,7 +265,7 @@ class LaporanController extends Controller
 
         array_push($laporan_harian,[
             'total_gadai'=>$total_gadai,
-            'total_tebus'=>$total_tebus,
+            'total_tebus'=>$totalpenebusan,
             'total_ansuran'=>$total_ansuran,
             'bilangan_gadai'=>$bilangan_gadai,
             'bilangan_tebus'=>$bilangan_tebus,
@@ -316,10 +372,11 @@ class LaporanController extends Controller
         }
 
         //g
-        $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]);
+        $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0);
+        $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0);
 
-        $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah');
-        $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah');
+        $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah');
+        $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah');
 
         //h
         $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman');
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 8035f8c..b2fb08e 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -223,7 +223,9 @@ class LelongController extends Controller
         }
 
         if($kodcaw === '011232')
+        {
             $bakilelong += 6;
+        }
 
         $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
 
@@ -472,7 +474,7 @@ class LelongController extends Controller
         ->sum('cajlelong');
 
         if($kodcaw === '011232')
-            $cajlelong += 122.5;
+            $cajlelong +=122.5;
 
         return response()->json($cajlelong,200);
     }
diff --git a/app/Http/Controllers/TacExpressPaymentController.php b/app/Http/Controllers/TacExpressPaymentController.php
index feb455a..5e5cf7d 100644
--- a/app/Http/Controllers/TacExpressPaymentController.php
+++ b/app/Http/Controllers/TacExpressPaymentController.php
@@ -26,8 +26,8 @@ class TacExpressPaymentController extends Controller
         $messages = 'SPARE : SMS-OTP '. $request->otp_token . ' for one time usage on ' . $expired_at . '. Call AR-RAHN CARELINE CENTRE 1300-22-4343 if not request';
 
         $status = Http::get('http://gateway.onewaysms.com.au:10001/api.aspx',[
-            'apiusername' => 'APIUK330HDAFO',
-            'apipassword' => 'APIUK330HDAFOUK330',
+            'apiusername' => 'APIQ4LP5EMKXM',
+            'apipassword' => 'APIQ4LP5EMKXM7CQOX',
             'senderid' => 'INFO',
             'mobileno' => $mobileno,
             'message'=> $messages,
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 9f0f36d..d066b36 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -205,10 +205,6 @@ class TebusController extends Controller
         }
         $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
 
-	if($upah_semasa <= 0){
-            $upah_semasa = 0;
-        }
-
         return $upah_semasa;
     }
 
@@ -244,10 +240,6 @@ class TebusController extends Controller
             $upah_semasa = str_replace(',','',$upah_semasa);
         }
         $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
-	
-	if($upah_semasa <= 0){
-            $upah_semasa = 0;
-        }
 
         return response()->json($upah_semasa);
     }
@@ -578,8 +570,9 @@ class TebusController extends Controller
         ->whereNotNull('hargajualan')
         ->where('hargajualan','<>','bakihargajualan');
 
+        // $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
         $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
-	$bilpenebusantawarruq = $tebustawarruq->count();
+        $bilpenebusantawarruq = $tebustawarruq->count();
         $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
         $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
 
@@ -939,7 +932,9 @@ class TebusController extends Controller
         $total = $keuntungansebelumtawarruq + $keuntungan;
 
         if($kodcaw === '011232')
-          $total += 623.5;
+        {
+            $total +=623.5;
+        }
 
         return response()->json($total,200);
     }
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index d29f2dc..6167d8a 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Transaction;
+use App\TransaksiKeuntungan;
 use App\Pengguna;
 use App\Cawangan;
 
@@ -103,4 +104,18 @@ class TransactionController extends Controller
 
         return response()->json($transaction);
     }
+
+    public function TransaksiPelanggan(Request $request){
+
+        $transaction = TransaksiKeuntungan::on('mysql7')
+            ->leftJoin('transaction as trans', function($join)
+                {
+                    $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
+                    $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
+                })
+            ->where('trans.norujukan','=',$request->norujukan)
+            ->get();
+
+        return response()->json($transaction);
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php
index f64ff7f..0cd76a5 100644
--- a/app/Http/Controllers/TunaiController.php
+++ b/app/Http/Controllers/TunaiController.php
@@ -393,7 +393,7 @@ class TunaiController extends Controller
 
         $teller = Tunai::on($cawangan['mysql'])
                     ->select('kodlaluan')
-                    ->whereRaw('LENGTH(kodlaluan) > 10')
+                    ->whereRaw('LENGTH(kodlaluan) > 14')
                     ->distinct()
                     ->get();
                     
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index ccd243e..66daf7f 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -400,16 +400,6 @@ class VaultController extends Controller
    {
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-      // $pendahuluan = Vault::on($cawangan['mysql'])
-      // ->where('kodcaw','=',$kodcaw)
-      // ->where('tarikh','<=', $request->tarikh)
-      // ->sum('pendahuluan');
-
-      // $serahan = Vault::on($cawangan['mysql'])
-      // ->where('kodcaw','=',$kodcaw)
-      // ->where('tarikh','<=', $request->tarikh)
-      // ->sum('serahan');
-
       $serahanpkb = '1000/020';
       $serahanjmc = '1000/026';
       $pendahuluanpkb = '7000/102';
diff --git a/routes/web.php b/routes/web.php
index 285a2fa..0804f6f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -39,28 +39,29 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('customers/information/update/admin', ['uses' => 'CustomerController@customerUpdateAdmin']);
     $router->get('admin/customers/nokp/search',['uses'=>'CustomerController@showOneCustomerByICAdmin']);
     $router->get('customer/blacklist',['uses'=>'CustomerController@blacklistCustomer']);
+    $router->get('customer/eachcawangan/{ic}',['uses'=>'CustomerController@showCustomerByEachCawangan']);
 
     //Gadai API
     $router->get('gadai',['uses'=>'GadaiController@showAllGadais']);
     $router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadai']);
-    $router->get('gadai/cawangan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@showOneGadaiByCawanganOnly']); //stokaudit
+    $router->get('gadai/cawangan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@showOneGadaiByCawanganOnly']); 
     $router->get('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@showOneGadaiByNorujukan']);
     $router->get('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showOneGadaibyRujukanAndCawangan']);
     $router->post('gadai/{kodcaw}',['uses'=>'GadaiController@create']);
-    $router->post('gadaiold/{kodcaw}',['uses'=>'GadaiController@createold']); //create old sag
+    $router->post('gadaiold/{kodcaw}',['uses'=>'GadaiController@createold']); 
     $router->get('gadai/{cawangan_code}/{date}',['uses'=>'GadaiController@gadaiTransactionByCawanganAndDay']);
     $router->put('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@updateOneGadaiByNorujukan']);
-    $router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']); // gadai online ansuran
+    $router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']); 
     $router->put('gadaikaunter/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunKaunter']); 
     $router->put('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@daftarGadaiMarhun']);
     $router->put('gadai/norujukan/komuditi/{kodcaw}/{norujukan}',['uses'=>'GadaiController@pembelianKomuditi']);
     $router->put('gadai/norujukan/cetak/{kodcaw}/{norujukan}',['uses'=>'GadaiController@cetakSAG']);
     $router->put('gadai/norujukan/serah/{kodcaw}/{norujukan}',['uses'=>'GadaiController@serahMarhun']);
-    $router->get('batalgadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanBatalGadai']); //laporan batalgadai
-    $router->get('gadai/laporan/ringkasan/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); //ringkasan terkumpul
-    $router->get('gadai/laporan/ringkasanharian/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanHarian']); //ringkasan harian
-    $router->get('gadaitebus/listharini/{kodcaw}',['uses'=>'GadaiController@GadaiTebusList']); // Kesemua Gadai Harini
-    $router->get('gadaitebus/listharini/{kodcaw}/teller',['uses'=>'GadaiController@GadaiTebusListTeller']); //Mengikut Teller
+    $router->get('batalgadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanBatalGadai']); 
+    $router->get('gadai/laporan/ringkasan/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanTerkumpul']); 
+    $router->get('gadai/laporan/ringkasanharian/{kodcaw}',['uses'=>'GadaiController@gadaiRingkasanHarian']); 
+    $router->get('gadaitebus/listharini/{kodcaw}',['uses'=>'GadaiController@GadaiTebusList']); 
+    $router->get('gadaitebus/listharini/{kodcaw}/teller',['uses'=>'GadaiController@GadaiTebusListTeller']); 
     $router->get('gadai/list/rekod/old',['uses'=>'GadaiController@rekodGadaian']);
     $router->get('gadai/online/search/detail',['uses'=>'GadaiController@searchGadaiOnline']);
 
@@ -78,7 +79,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('gadaiansemasa/{kodcaw}',['uses'=>'GadaiController@getGadaianSemasa']);
     $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']);
     $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']);
-    $router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); //Range Date
+    $router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); 
 
 
     $router->get('gadai/customers/{ic}/outstandingsemasa/{kodcaw}',['uses'=>'GadaiController@outstandingSemasaCustomer']);
@@ -123,8 +124,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('bakilelong/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelong']);
     $router->get('bakilelong/cawangan/{kodcaw}/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelongEachCawangan']);
     $router->get('bilangandilelong/{noic}',['uses'=>'LelongController@BilAkanDilelong']);
-    $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); //laporan lelong
-    $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); //laporan lelong
+    $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); 
+    $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); 
 
     $router->get('keluar/lelong',['uses'=>'LelongController@keluarLelong']);
 
@@ -191,8 +192,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']);
 
 
-    $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
+    $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  
+    $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  
 
 
     //OTP API
@@ -233,10 +234,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
 
     //LAPORAN API
-    $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
-    $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); //laporan stokaudit Aktif
-    $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); //laporan takaktif
-    $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
+    $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); 
+    $router->get('stokaudit/aktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditAktif']); 
+    $router->get('stokaudit/takaktif/{kodcaw}',['uses'=>'GadaiController@LaporanAuditTakAktif']); 
+    $router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); 
     $router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']);
     $router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);
     $router->get('gadai/JumlahagingBulanan/test/{kodcaw}/{tarikh}',['uses'=>'GadaiController@carian_Seluruh_AgingBulanan']);
@@ -268,12 +269,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('getAddTunaiLatest/{kodcaw}',['uses' =>'TunaiController@getAddTunaibyKodlaluanLatest']);
     $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
     $router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']);
-    $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit
-    $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit
-    $router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); //Gldetail Online
-    $router->post('gldetailkaunter/{kodcaw}',['uses'=> 'VaultController@creategldetail']); //Gldetail Kaunter
-    $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); //Gldetail List Kaunter
-    $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); //Gldetail List Kaunter
+    $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); 
+    $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); 
+    $router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); 
+    $router->post('gldetailkaunter/{kodcaw}',['uses'=> 'VaultController@creategldetail']); 
+    $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); 
+    $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); 
     $router->get('GetTunaiSemalam/{kodcaw}',['uses' =>'TunaiController@getTunaiSemalam']);
 
     //API PANJAR KHAZANAH
@@ -342,7 +343,6 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //Tuntut Baki
     $router->get('TuntutBaki/{kodcaw}',['uses'=>'LelongController@showTuntutBaki']);
-    $router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBakiTarikh']);
     $router->get('TuntutBaki/{kodcaw}/teller',['uses'=>'LelongController@showTuntutBakiTeller']);
     $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']);
     $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']);
@@ -360,7 +360,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //API GLDETAILS
     $router->get('jumlahTerkumpulBayaranUpah/{kodcaw}', ['uses'=>'TebusController@JumUpahDibayar_keseluruhan']);
-    $router->get('gldetailkira_pendahuluan_2013/data/{kodcaw}',['uses'=>'GlDetailsController@sum_gldetails']);  // GLDETAILS 7000/102
+    $router->get('gldetailkira_pendahuluan_2013/data/{kodcaw}',['uses'=>'GlDetailsController@sum_gldetails']); 
     $router->get('gldetailkira_pendahuluan_2014/data/{kodcaw}',['uses'=>'GlDetailsController@sum_advance_2014']);  
     $router->get('gldetailkira_pendahuluanJMC_2015/data/{kodcaw}', ['uses' =>'GlDetailsController@sumJMC_2015']);
     $router->get('gldetailkira_pendahuluanJMC_2014/data/{kodcaw}', ['uses' =>'GlDetailsController@sumJMC_2014']);
@@ -382,11 +382,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('getTunaiGadTeb/{kodcaw}',['uses'=>'TunaiGadTebController@getCurrentTunaiGadTeb']);
     $router->post('daftarTunaiGadteb/{kodcaw}',['uses'=>'TunaiGadTebController@createTunaiGadTeb']);
     $router->put('updateTunaiGadteb/{kodcaw}',['uses'=>'TunaiGadTebController@UpdateTunaiGadTeb']);  
-    $router->put('updateBakiEOD_Vault/{kodcaw}',['uses'=>'VaultController@update_onlyBakiEod']); // add 0n 2021-02-11
+    $router->put('updateBakiEOD_Vault/{kodcaw}',['uses'=>'VaultController@update_onlyBakiEod']); 
 
-    $router->get('transaction_spesifik/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific']);  //transaction specific by cawangan & tarikh 
+    $router->get('transaction_spesifik/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific']);  
     $router->get('transaction_spesifik_tarikh/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan_specific_tarikh']);
-    $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']);  //transaction kira sum  all bayaran online cawangan
+    $router->get('jumlahBayaranOnlineAll/data/{kodcaw}',['uses'=>'TransactionController@JumlahBayaranOnline_Keseluruhan']); 
     
 
     //NAMA PENGGUNA TAMBAH KODLALUAN
@@ -398,57 +398,49 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //IMBANG DUGA//
 
     //Dua-Dua Table
-    $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //pendahuluan dan serahan
-    $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); //Penghutang Ar-Rahn dan Keuntungan Terakru
-    $router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']); //Penghutang Ar-Rahn dan Keuntungan Terakru
+    $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); 
+    $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); 
+    $router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']); 
 
     //-- Harta Semasa --//
-    $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
-    $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
-    $router->get('BayaranPendahuluan/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq
+    $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); 
+    $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); 
+    $router->get('BayaranPendahuluan/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); 
 
-    $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
-    $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
+    $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); 
+    $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); 
 
     //-- Tanggungan Semasa --//
-    $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar
-    $router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong
-    $router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut
-    $router->get('SerahBaki/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut
-    $router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun
-    $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
-    $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
-    $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
-    $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
-    $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Hapus Kira
+    $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); 
+    $router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); 
+    $router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); 
+    $router->get('SerahBaki/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); 
+    $router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); 
+    $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']);
+    $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); 
+    $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); 
+    $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); 
+    $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); 
 
 
     //LEJER AM//
 
     //Dua-Dua Table
-    $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); //pendahuluan dan serahan
-    $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
-    $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
+    $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); 
+    $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); 
+    $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); 
 
     // //-- Harta Semasa --//
-    $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); //pinjaman diberi
-    $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); //pembiayaan tawarruq
-    $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); //pembiayaan tawarruq
+    $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); 
+    $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); 
+    $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); 
 
-    $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); //Tunai di tangan
-    // $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
+    $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); 
 
     // //-- Tanggungan Semasa --//
-    $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); //panjar
-    $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']); //baki lelong & Rugi lelong
-    // $router->get('WTDLejer/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut
-    // $router->get('SerahBakiLejer/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut
-    // $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun
-    $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); //Keuntungan Sebenar
-    // $router->get('UntungRugiTerkumpulLejer/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
-    // $router->get('cajperkhidmatanterkumpulLejer/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
-    // $router->get('CalculationHapusKiraLejer/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
-    // $router->get('XtraLejer/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Xtra
+    $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); 
+    $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']);
+    $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); 
 
 
     // //-- Untung Rugi --//
@@ -460,8 +452,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //ADDED LEJER AM
 
-    $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
+    $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  
+    $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  
 
     //-- Ansuran GLEJER --//
     $router->get('ansuranByrKaunter/{kodcaw}/{norujukan}',['uses'=>'TransactionController@getSumBayaran_Ansuran']);
@@ -560,3 +552,10 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){
     $router->get('komoditi/jumlah/baki',['uses'=>'KomuditiController@jumlahKomoditiDashboard']);
     $router->post('komoditi/statistik',['uses'=>'KomuditiController@statistikKomoditiDashboard']);
 });
+
+$router->group(['prefix'=>'portal'], function () use ($router){
+    $router->get('financeMonth',['uses'=>'GadaiController@PembiayaanBulanan']);
+    $router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']);
+});
+
+