diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 69dd843..a8f2163 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1937,6 +1937,10 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
+            if($request->tarikh > '2021-02-25')
+            {
+                $request->tarikh = '2021-02-25';
+            }
         
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
@@ -1955,11 +1959,13 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
+        if($request->tarikh > '2021-02-25'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
         ->where('tagpalsu','=',0)
-        ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-        ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
+        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-02-25'],['sttebus','=','']])
+        // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
         ->sum('pinjaman');
+        }
 
         return response()->json($rekod_pinjamandiberi);
     }
@@ -1976,7 +1982,27 @@ class GadaiController extends Controller
         ->whereNotNull('upah12')
         ->sum('upah12');
 
+        // $keuntungandibayar = 
+
         return response()->json($keuntungan,200);
     }
 
+    public function CalculationBayaranPendahuluan($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $datetawarruq = new Carbon('2021-02-25');
+        $daterequest = new Carbon($request->tarikh);
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->sum('bayaran_pembiayaan');
+
+        return response($transaksi);
+    }
+
 }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 2ff8b52..aff7ca3 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -76,6 +76,8 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
+        // $totalnmhargasemasa = $request->tnmhargasemasa;
+
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
         $array_recno_marhun = $request->array_recno;
@@ -632,4 +634,9 @@ class TebusController extends Controller
         return response()->json($penghutangkaki,200);
     }
 
+    public function untungrugicalculation($kodcaw,Request $request)
+    {
+
+    }
+
 }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index ee936a6..bb6392c 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -243,15 +243,31 @@ class VaultController extends Controller
    public function TunaiDiTangan($kodcaw,Request $request)
    {
      $current = Carbon::now();
-     $current = new Carbon();    
+     $current = new Carbon();   
+     
+     $totalbakiakhirtunai = 0;
   
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
       $vault=Vault::on($cawangan['mysql'])
               ->where('kodcaw','=',$kodcaw)
-              ->where('tarikh','=', $request->tarikh)
+              ->where('tarikh','<=', $request->tarikh)
               ->orderby('tarikh','desc')->first();
-  
-      return response()->json($vault);
+
+      $tunai = Tunai::on($cawangan['mysql'])
+               ->where('kodcaw','=',$kodcaw)
+               ->where('tarikh','<=', $request->tarikh)
+               ->orderby('tarikh','desc')->first();
+
+
+      if($tunai['baki'] != 0)
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'] + $tunai['baki'];
+      }else
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'];
+      }
+   
+      return response()->json($totalbakiakhirtunai);
    }
 
 
diff --git a/routes/web.php b/routes/web.php
index cf672b0..ac66731 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -328,6 +328,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //-- 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('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
     $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
@@ -340,6 +341,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $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
+
+    //-- Untung Rugi --//
+    $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
+    
     
     //END IMBANG DUGA//