fix imbang duga annur : cut off pelarasan rebate

2026-09-09 12:01:09 +08:00
parent 2363c2947d
commit 4da3744823
1 changed files with 39 additions and 12 deletions
@@ -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();
+
+    $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;

-        // 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])
+        ->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);
-    }
+}

    public function RebetCalculationLejer($kodcaw,Request $request)
    {