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) {