From fb5a007fdcf7c0bfbd6422d77e4db211589873f1 Mon Sep 17 00:00:00 2001
From: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Date: Sun, 17 Aug 2025 16:05:57 +0800
Subject: [PATCH] pelarasan rebate on imbang duga

---
 app/Http/Controllers/TebusController.php | 16 +++++++
 app/Http/Controllers/VaultController.php | 57 ++++++++++++------------
 routes/web.php                           |  1 +
 3 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 1cb3606..49c4530 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/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();
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index 954ab16..a50e4c0 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -369,42 +369,41 @@ class VaultController extends Controller
       return response()->json($gldetail,200);
    }
 
-   public function TunaiDiTangan($kodcaw, Request $request)
-{
-    $totalbakiakhirtunai = 0;
+ public function TunaiDiTangan($kodcaw,Request $request)
+   {
+     $current = Carbon::now();
+     $current = new Carbon();
 
-    $cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
+     $totalbakiakhirtunai = 0;
 
-    $vault = Vault::on($cawangan['mysql'])
-        ->where('kodcaw', $kodcaw)
-        ->where('tarikh', '<=', $request->tarikh)
-        ->orderBy('tarikh', 'desc')->first();
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $vault=Vault::on($cawangan['mysql'])
+              ->where('kodcaw','=',$kodcaw)
+              ->where('tarikh','<=', $request->tarikh)
+              ->orderby('tarikh','desc')->first();
 
-    $tunai = Tunai::on($cawangan['mysql'])
-        ->where('kodcaw', $kodcaw)
-        ->where('tarikh', '=', $request->tarikh)
-        ->get();
+      $tunai = Tunai::on($cawangan['mysql'])
+               ->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');
+      $total = 0;
+      foreach($tunai as $index=>$money)
+      {
+         $total+=$money['baki'];
+      }
 
-    // Jumlahkan tunai
-    $total = 0;
-    foreach ($tunai as $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);
-}
+      return response()->json($totalbakiakhirtunai);
+   }
 
 
    public function TunaiDiTanganLejer($kodcaw,Request $request)
diff --git a/routes/web.php b/routes/web.php
index d2c3a5c..b22304c 100644
--- a/routes/web.php
+++ b/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']);