From c8b6e271e377d55d3a2a3d3b4e55158b019896be Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 1 Jul 2024 12:57:23 +0800
Subject: [PATCH] export based on payment date

---
 .../Exports/Services/ExportsPaymentTransactions.php   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
index 9fd483bc..e2a147f6 100644
--- a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
@@ -81,10 +81,13 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->whereIn('status', [$approvalStatus]);
 
         if($start_date && $end_date) {
-            $query->whereBetween('updated_at', [
-                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
-                Carbon::parse($end_date)->format('Y-m-d 23:59:59')
-            ]);
+            $query->whereHas('transactions', function($transaction) use ($start_date, $end_date) {
+                $transaction->where('type', TransactionType::PAYMENT)
+                    ->whereBetween('updated_at', [
+                        Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
+                        Carbon::parse($end_date)->format('Y-m-d 23:59:59')
+                    ]);
+            });
         }
         elseif($start_date && !$end_date) {
             $query->whereHas('transactions', function($transaction) use ($start_date) {