pelarasan rebate on imbang duga

app/Http/Controllers/TebusController.php

@@ -1656,6 +1656,22 @@ class TebusController extends Controller
         return response($rebet);
     }
 
+     public function PelarasanRebate($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        // Jumlah diskaun_rebate dari 13/5/2025 hingga tarikh semasa
+        $rebet = Tebus::on($cawangan['mysql'])
+        ->join('gadai as db2', 'tebus.norujukan', '=', 'db2.norujukan')
+        ->whereBetween('tebus.t_tebus', ['2025-05-13', $request->tarikh])
+        ->where('db2.hargajualan', '>', 0)
+        ->where('db2.t_gadai', '>', '2023-05-21')
+        ->whereNotNull('db2.hargajualan')
+        ->sum('diskaun_rebate');
+
+        return response($rebet);
+    }
+
     public function RebetCalculationLejer($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();

app/Http/Controllers/VaultController.php

@@ -371,37 +371,36 @@ class VaultController extends Controller
 
  public function TunaiDiTangan($kodcaw,Request $request)
    {
+     $current = Carbon::now();
+     $current = new Carbon();
+
      $totalbakiakhirtunai = 0;
 
-    $cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
-
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
       $vault=Vault::on($cawangan['mysql'])
-        ->where('kodcaw', $kodcaw)
+              ->where('kodcaw','=',$kodcaw)
               ->where('tarikh','<=', $request->tarikh)
-        ->orderBy('tarikh', 'desc')->first();
+              ->orderby('tarikh','desc')->first();
 
       $tunai = Tunai::on($cawangan['mysql'])
-        ->where('kodcaw', $kodcaw)
+               ->where('kodcaw','=',$kodcaw)
                ->where('tarikh','=', $request->tarikh)
                ->get();
 
-    // Jumlah diskaun_rebate dari 13/5/2025 hingga tarikh semasa
-    $rebet = Tebus::on($cawangan['mysql'])
-        ->join('gadai as db2', 'tebus.norujukan', '=', 'db2.norujukan')
-        ->whereBetween('tebus.t_tebus', ['2025-05-13', $request->tarikh])
-        ->where('db2.hargajualan', '>', 0)
-        ->where('db2.t_gadai', '>', '2023-05-21')
-        ->whereNotNull('db2.hargajualan')
-        ->sum('diskaun_rebate');
-
-    // Jumlahkan tunai
       $total = 0;
-    foreach ($tunai as $money) {
+      foreach($tunai as $index=>$money)
+      {
          $total+=$money['baki'];
       }
 
-    // Kira jumlah akhir termasuk rebate
-    $totalbakiakhirtunai = $vault['bakiakhir'] + $total + $rebet;
+
+      if($total != 0)
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'] + $total;
+      }else
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'];
+      }
 
       return response()->json($totalbakiakhirtunai);
    }

routes/web.php

@@ -529,6 +529,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']);
     $router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']);
     $router->get('RebetPromoCalculation/{kodcaw}',['uses'=>'TebusController@RebetPromoCalculation']);
+    $router->get('PelarasanRebate/{kodcaw}',['uses'=>'TebusController@PelarasanRebate']);
 
     //-- Harta Semasa --//
     $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']);