From 0f13744b3cf4d83c19b0da89b3a5453012a08f47 Mon Sep 17 00:00:00 2001
From: Nur Izzati <zatizul@gmail.com>
Date: Tue, 15 Jul 2025 20:28:21 +0800
Subject: [PATCH] update data untuk gadai tebus AT

---
 app/Services/Reports/GadaianService.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Services/Reports/GadaianService.php b/app/Services/Reports/GadaianService.php
index 1faa5ed..c7ff57a 100644
--- a/app/Services/Reports/GadaianService.php
+++ b/app/Services/Reports/GadaianService.php
@@ -223,7 +223,7 @@ class GadaianService
 
         // 3. Ambil transaksi tebus dari online server
         $transaksi_tebus = DB::connection($online_connection)->table('transaction')
-            ->where('trans_type', 'T')
+            ->whereIn('trans_type', ['T', 'AT'])
             ->whereIn('norujukan', $norujukans)
             ->whereIn(DB::raw('DATE(created_at)'), $tarikh_set)
             ->get()
@@ -343,6 +343,7 @@ class GadaianService
             'gadai.bakipjm',
             'gadai.bakiupah',
             DB::raw('TIMEDIFF(TIME(trans.created_at), gadai.masa) as beza_minit'))
+            ->where('gadai.upah12', '>=', 0.00) 
             ->orderBy('gadai.teller')
             ->orderBy('gadai.sirig')
             ->get();
@@ -371,6 +372,7 @@ class GadaianService
             sum(gadai.pinjaman) as total_pembiayaan,
             sum(gadai.bakipjm) as total_bakipjm,
             sum(gadai.bakiupah) as total_keuntungan')
+            ->where('gadai.upah12', '>=', 0.00) 
             ->groupBy('gadai.teller')
             ->get();
         return $total_summary_gadaian_groupByTeller;