From 4da37448234ee90d0ebdc0e1a89b335e6e537e04 Mon Sep 17 00:00:00 2001
From: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Date: Wed, 9 Sep 2026 12:01:09 +0800
Subject: [PATCH] fix imbang duga annur : cut off pelarasan rebate

---
 app/Http/Controllers/TebusController.php | 51 ++++++++++++++++++------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 538672f..4df7305 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -1690,21 +1690,48 @@ class TebusController extends Controller
         return response($rebet);
     }
 
-     public function PelarasanRebate($kodcaw,Request $request)
-    {
-        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+     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])
+    $tarikhLaporan = Carbon::parse(
+        $request->tarikh
+    )->toDateString();
+
+    // Tarikh terakhir pelarasan rebate
+    $tarikhTamatPelarasan = '2026-09-02';
+
+    // Laporan sebelum 2/9 ikut tarikh laporan.
+    // Laporan 3/9 dan seterusnya berhenti pada 2/9.
+    $tarikhAkhir = $tarikhLaporan > $tarikhTamatPelarasan
+        ? $tarikhTamatPelarasan
+        : $tarikhLaporan;
+
+    $rebet = Tebus::on($cawangan['mysql'])
+        ->join(
+            'gadai as db2',
+            'tebus.norujukan',
+            '=',
+            'db2.norujukan'
+        )
+        ->whereDate(
+            'tebus.t_tebus',
+            '>=',
+            '2025-05-13'
+        )
+        ->whereDate(
+            'tebus.t_tebus',
+            '<=',
+            $tarikhAkhir
+        )
         ->where('db2.hargajualan', '>', 0)
-        ->where('db2.t_gadai', '>', '2023-05-21')
-        ->whereNotNull('db2.hargajualan')
-        ->sum('diskaun_rebate');
+        ->whereDate('db2.t_gadai', '>', '2023-05-21')
+        ->sum('tebus.diskaun_rebate');
 
-        return response($rebet);
-    }
+    return response($rebet);
+}
 
     public function RebetCalculationLejer($kodcaw,Request $request)
     {