From 192a70d46e5f4c42633bfcdda211801f0d9afe34 Mon Sep 17 00:00:00 2001
From: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Date: Sun, 15 Jun 2025 16:42:36 +0800
Subject: [PATCH] fix vault controller for rebate annur

---
 app/Http/Controllers/VaultController.php | 72 +++++++++++-------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index 9c94bac..954ab16 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -369,50 +369,42 @@ class VaultController extends Controller
       return response()->json($gldetail,200);
    }
 
-   public function TunaiDiTangan($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->tarikh)
-              ->orderby('tarikh','desc')->first();
+   public function TunaiDiTangan($kodcaw, Request $request)
+{
+    $totalbakiakhirtunai = 0;
 
-      $tunai = Tunai::on($cawangan['mysql'])
-               ->where('kodcaw','=',$kodcaw)
-               ->where('tarikh','=', $request->tarikh)
-               ->get();
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
 
-      $rebet = Tebus::on($cawangan['mysql'])
-               ->join('gadai as db2','tebus.norujukan','=','db2.norujukan')
-               // ->where('tebus.t_tebus','>','2021-04-13')
-               ->where('tebus.t_tebus','<=',$request->tarikh)
-               ->where('db2.hargajualan','>','0') // tambahan 2021-05-07
-               ->where('db2.t_gadai','>','2023-05-21')
-               ->whereNotNull('db2.hargajualan')
-               ->sum('diskaun_rebate');
+    $vault = Vault::on($cawangan['mysql'])
+        ->where('kodcaw', $kodcaw)
+        ->where('tarikh', '<=', $request->tarikh)
+        ->orderBy('tarikh', 'desc')->first();
 
-     
-      $total = 0;
-      foreach($tunai as $index=>$money)
-      {
-         $total+=$money['baki'];
-      }
+    $tunai = Tunai::on($cawangan['mysql'])
+        ->where('kodcaw', $kodcaw)
+        ->where('tarikh', '=', $request->tarikh)
+        ->get();
 
-      if($total != 0)
-      {
-         $totalbakiakhirtunai = $vault['bakiakhir'] + $total + $rebet - $rebet;
-      }else
-      {
-         $totalbakiakhirtunai = $vault['bakiakhir'] + $rebet - $rebet;
-      }
-   
-      return response()->json($totalbakiakhirtunai);
-   }
+    // 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) {
+        $total += $money['baki'];
+    }
+
+    // Kira jumlah akhir termasuk rebate
+    $totalbakiakhirtunai = $vault['bakiakhir'] + $total + $rebet;
+
+    return response()->json($totalbakiakhirtunai);
+}
 
 
    public function TunaiDiTanganLejer($kodcaw,Request $request)