From 65eb1dfc629c6bf50ee504b54d8a341d6afcd4d2 Mon Sep 17 00:00:00 2001
From: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Date: Mon, 19 May 2025 16:31:27 +0800
Subject: [PATCH] add rebet to vault controller

---
 app/Http/Controllers/VaultController.php | 27 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index f772c46..9c94bac 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -10,6 +10,7 @@ use App\GlDetail;
 use App\imbangdugalama;
 use App\GlCode;
 use App\Panjar;
+use App\Tebus;
 
 use Illuminate\Http\Request;
 use Carbon\Carbon;
@@ -371,12 +372,12 @@ 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'])
+      $vault = Vault::on($cawangan['mysql'])
               ->where('kodcaw','=',$kodcaw)
               ->where('tarikh','<=', $request->tarikh)
               ->orderby('tarikh','desc')->first();
@@ -386,24 +387,34 @@ class VaultController extends Controller
                ->where('tarikh','=', $request->tarikh)
                ->get();
 
+      $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');
+
+     
       $total = 0;
       foreach($tunai as $index=>$money)
       {
          $total+=$money['baki'];
       }
 
-
       if($total != 0)
       {
-         $totalbakiakhirtunai = $vault['bakiakhir'] + $total;
+         $totalbakiakhirtunai = $vault['bakiakhir'] + $total + $rebet - $rebet;
       }else
       {
-         $totalbakiakhirtunai = $vault['bakiakhir'];
+         $totalbakiakhirtunai = $vault['bakiakhir'] + $rebet - $rebet;
       }
-
+   
       return response()->json($totalbakiakhirtunai);
    }
 
+
    public function TunaiDiTanganLejer($kodcaw,Request $request)
    {