cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

export based on payment date

Browse Source
This commit is contained in:
Omair Saleh
2024-07-01 12:57:23 +08:00
parent dcec8cb33b
commit c8b6e271e3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
+4 -1
View File
@@ -81,10 +81,13 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
$query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->whereIn('status', [$approvalStatus]); $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->whereIn('status', [$approvalStatus]);
if($start_date && $end_date) { if($start_date && $end_date) {
$query->whereBetween('updated_at', [ $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($start_date)->format('Y-m-d 0:00:00'),
Carbon::parse($end_date)->format('Y-m-d 23:59:59') Carbon::parse($end_date)->format('Y-m-d 23:59:59')
]); ]);
});
} }
elseif($start_date && !$end_date) { elseif($start_date && !$end_date) {
$query->whereHas('transactions', function($transaction) use ($start_date) { $query->whereHas('transactions', function($transaction) use ($start_date) {