diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 90473a3..745824c 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2364,6 +2364,109 @@ class GadaiController extends Controller
         return response()->json($array_rekodemas);
     }
 
+    public function CalculationPinjamanDiberiLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $tarikhtawarruq = '';
+
+        switch ($kodcaw) {
+            case 'KB2':
+                $tarikhtawarruq = '2021-04-13';
+              break;
+            case 'WCY':
+                $tarikhtawarruq = '2021-05-04';
+              break;
+            case '1STOP':
+                $tarikhtawarruq = '2021-05-09';
+            break;
+            case '020301':
+                $tarikhtawarruq = '2021-05-18';
+            break;
+            case 'ALS':
+                $tarikhtawarruq = '2021-05-24';
+            break;
+            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;
+            case '010621':
+                $tarikhtawarruq = '2021-06-15';
+            break;
+            case 'ARP':
+                $tarikhtawarruq = '2021-06-15';
+            break;
+            case '010621':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010136':
+                $tarikhtawarruq = '2021-06-20';
+            break;
+            case '011235':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '011227':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010620':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010617':
+                $tarikhtawarruq = '2021-06-21';
+            break;
+            case '010915':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011228':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '010219':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011229':
+                $tarikhtawarruq = '2021-06-22';
+            break;
+            case '011013':
+                $tarikhtawarruq = '2021-06-23';
+            break;
+            case '011412':
+                $tarikhtawarruq = '2021-06-23';
+            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'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['t_update','<=',$request->hingga],['t_gadai','<=',$tarikhtawarruq]])
+            ->sum('pinjaman');
+
+        $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
+
+        return response()->json($array_rekodemas);
+    }
+
     public function CalculationPembiayaanTawarruq($kodcaw,Request $request)
     {
 
@@ -2378,6 +2481,20 @@ class GadaiController extends Controller
         return response()->json($rekod_pinjamandiberi);
     }
 
+    public function CalculationPembiayaanTawarruqLejer($kodcaw,Request $request)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rekod_pinjamandiberi = 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');
+
+        return response()->json($rekod_pinjamandiberi);
+    }
+
     public function CalculationKeuntungan($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
@@ -2465,6 +2582,29 @@ class GadaiController extends Controller
         return response($transaksi);
     }
 
+    public function CalculationBayaranPendahuluanLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $datetawarruq = new Carbon('2021-04-14');
+        $datemula = new Carbon($request->mula);
+        $datemula->addDays(1);
+
+        $datehingga = new Carbon($request->hingga);
+        $datehingga->addDays(1);
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+                    ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]])
+                    ->sum('bayaran_pembiayaan');
+
+        return response($transaksi);
+    }
+
     public function LaporanAuditAktif($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 75000fc..a69250f 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -217,6 +217,70 @@ class LelongController extends Controller
         return response()->json($arraylelong,200);
     }
 
+    public function BakiLelongCalculationLejer($kodcaw,Request $request)
+    {
+
+        $tarikhbaru = $request->mula;
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        if($kodcaw == 'KB2')
+        {
+            if($request->tarikh <= '2021-02-25')
+            {
+                $bakilelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','>=',$request->mula)
+                ->where('t_jual','<=',$request->hingga)
+                ->where(function($query) use ($tarikhbaru){
+                    $query->whereNull('trkhtuntut')
+                        ->orWhere('trkhtuntut','>',$tarikhbaru);
+                })
+                ->where('baki','>=',0)
+                ->sum('baki');
+            }else{
+                $bakilelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','>=',$request->mula)
+                ->where('t_jual','<=',$request->hingga)
+                ->where(function($query) use ($tarikhbaru){
+                    $query->whereNull('trkhtuntut')
+                        ->orWhere('trkhtuntut','>','2021-02-25');
+                })
+                ->where('baki','>=',0)
+                ->sum('baki');
+            } 
+        }else{
+            $bakilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','>=',$request->mula)
+            ->where('t_jual','<=',$request->hingga)
+            ->where(function($query) use ($tarikhbaru){
+                $query->whereNull('trkhtuntut')
+                    ->orWhere('trkhtuntut','>',$tarikhbaru);
+            })
+            ->where('baki','>=',0)
+            ->sum('baki');
+        }
+
+        $ansrugi = AnsRugi::on($cawangan['mysql'])
+            ->sum('bayaran');
+                
+        $rugilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','>=',$request->mula)
+            ->where('t_jual','<=',$request->hingga)
+            ->where(function($query) use ($tarikhbaru)
+            {
+                $query->whereNull('trkhtuntut')
+                    ->orWhere('trkhtuntut','>',$tarikhbaru);
+            })
+            ->where('baki','<',0)
+            ->sum('baki');
+
+        // $rugitotal = $rugilelong + $ansrugi; 
+        $rugitotal = $rugilelong;  
+        
+        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
+
+        return response()->json($arraylelong,200);
+    }
+
     public function BilAkanDilelong($noic)
     {
         $cawangan_all = Cawangan::on('mysql7')->get();
diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php
index fc5b93d..acbd576 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -152,5 +152,50 @@ class PanjarController extends Controller
 
    }
 
+   public function calculationpanjarLejer(Request $request,$kodcaw)
+   {
+
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+      $current = Carbon::now();
+      $current = new Carbon($request->tarikh);
+
+
+
+      $baikidanselenggara = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','<=', $request->hingga)
+      ->where('tag', '=', 2)
+      ->sum('bayaran');
+
+      $perubatan = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','<=', $request->hingga)
+      ->where('tag', '=', 1)
+      ->sum('bayaran'); 
+
+      $keraian = Panjar::on($cawangan['mysql'])
+      // ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','>=', $request->mula)
+      ->where('tarikh','<=', $request->hingga)
+      ->where('tag', '=', 3)
+      ->sum('bayaran');
+
+
+
+      if($kodcaw == 'APM')
+      {
+         $perubatan = $perubatan - 10;
+         $baikidanselenggara = $baikidanselenggara - 10;
+      }
+
+      $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
+
+      return response()->json($arraycalculation);
+
+   }
+
 
 }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 5c0aeda..9e8baa9 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -868,6 +868,56 @@ class TebusController extends Controller
         return response()->json($total,200);
     }
 
+    public function calculationKeuntunganSebenarLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $current = new Carbon($request->tarikh);
+
+        $total = 0;
+        $keuntunganselepastawarruq = 0;
+        $keuntungansebelumtawarruq = 0;
+
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
+        //Keuntungan Selepas Tawarruq
+        $keuntungan = 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('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
+            ->whereNull('db2.hargajualan')
+            ->sum('bayaran_keuntungan');
+
+        $upahtebus = Tebus::on($cawangan['mysql'])
+            ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']])
+            ->whereYear('t_tebus','=',$current->year)
+            ->sum('upahdibayar');
+
+        $upahlelong = Lelong::on($cawangan['mysql'])
+            ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']])
+            ->whereYear('t_jual','=',$current->year)
+            ->sum('bakiupah');
+
+        $upahansur = Advansur::on($cawangan['mysql'])
+            ->where('tarikh','>=',$request->mula)
+            ->where('tarikh','<=',$request->hingga)
+            ->whereYear('tarikh','=',$current->year)
+            ->sum('upahdibayar');
+
+
+        $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
+
+        // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+        
+        // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
+
+        $total = $keuntungansebelumtawarruq + $keuntungan;
+
+        return response()->json($total,200);
+    }
+
     public function calculationUntungRugiTerkumpul($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -1038,6 +1088,52 @@ class TebusController extends Controller
         return response($total);
     }
 
+    public function untungrugicalculationLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        // $datetawarruq = new Carbon('2021-04-14');
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
+        $dateSM = '2021-04-24';
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $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->mula)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
+                    ->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->mula)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('bayaran_keuntungan');
+
+	$total = ($ansuran + $bukanansuran);
+
+        return response($total);
+    }
+
     public function RebetCalculation($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
@@ -1053,4 +1149,19 @@ class TebusController extends Controller
         return response($rebet);
     }
 
+    public function RebetCalculationLejer($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rebet = Tebus::on($cawangan['mysql'])
+                ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
+                ->where('tebus.t_tebus','>=',$request->mula)
+                ->where('tebus.t_tebus','<=',$request->hingga)
+                ->where('db2.hargajualan','>','0')
+                ->whereNotNull('db2.hargajualan')
+                ->sum('rebate');      
+
+        return response($rebet);
+    }
+
 }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index 63be5e0..151e93e 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -276,6 +276,50 @@ class VaultController extends Controller
       return response()->json($totalbakiakhirtunai);
    }
 
+   public function TunaiDiTanganLejer($kodcaw,Request $request)
+   {
+
+
+     $current = Carbon::now();
+     $current = new Carbon();   
+     
+     $totalbakiakhirtunai = 0;
+  
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $vault=Vault::on($cawangan['mysql'])
+              ->where('kodcaw','=',$kodcaw)
+              ->where('tarikh','>=', $request->mula)
+              ->where('tarikh','<=', $request->hingga)
+              ->orderby('tarikh','desc')->first();
+
+      $tunai = Tunai::on($cawangan['mysql'])
+               ->where('kodcaw','=',$kodcaw)
+               ->where('tarikh','>=', $request->mula)
+              ->where('tarikh','<=', $request->hingga)
+               ->get();
+
+      $total = 0;
+      foreach($tunai as $index=>$money)
+      {
+         $total+=$money['baki'];
+      }
+
+
+      if($total != 0)
+      {
+         $totalmasuk = $vault['masuk'] + $vault['pendahuluan'] + $total;
+      }else
+      {
+         $totalmasuk = $vault['masuk'];
+      }
+
+      $totalkeluar = $vault['keluar'] + $vault['serahan'] + $vault['totpanjar'];
+
+      $arraytunaiditangan = ['totalmasuk' => $totalmasuk, 'totalkeluar' => $totalkeluar];
+   
+      return response()->json($arraytunaiditangan,200);
+   }
+
 
    public function laporanPetiBesi($kodcaw,$tarikh)
    {
diff --git a/routes/web.php b/routes/web.php
index af862d3..5fb6807 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -392,23 +392,23 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //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('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru
 
     // //-- Harta Semasa --//
-    // $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
-    // $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
-    // $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq
+    $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('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
+    $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); //Tunai di tangan
     // $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
 
     // //-- Tanggungan Semasa --//
-    // $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar
-    // $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong
+    $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@calculationKeuntunganSebenar']); //Keuntungan Sebenar
+    $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
@@ -416,7 +416,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
 
     // //-- Untung Rugi --//
-    // $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); 
+    $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); 
+    $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculationLejer']); 
+    
 
     //END IMBANG DUGA & LEJER AM//