cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

E-Invoice - Fix Sales Invoice Report (with refund) inaccurate with missing records

Browse Source
This commit is contained in:
Dillon Ngo
2025-10-08 15:11:22 +08:00
parent 6ba76f336a
commit 97183ae52c
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsSalesInvoiceWithRefundReport.php
+23 -7
View File
@@ -59,12 +59,27 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi
Log::info('ExportsSalesInvoiceWithRefundReport startDate: ' . $startDate->format('Y-m-d H:i:s'));
Log::info('ExportsSalesInvoiceWithRefundReport endDate: ' . $endDate->format('Y-m-d H:i:s'));
return Booking::whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED, ApprovalStatus::SUSPENDED])
->whereHas('transactions', function ($query) use ($startDate, $endDate) {
$query->payments()
->where('status', ApprovalStatus::REFUNDED)
->whereBetween('created_at', [$startDate, $endDate])
->latest('created_at');
// return Booking::whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED, ApprovalStatus::SUSPENDED])
// ->whereHas('transactions', function ($query) use ($startDate, $endDate) {
// $query->payments()
// ->where('status', ApprovalStatus::REFUNDED)
// ->whereBetween('created_at', [$startDate, $endDate])
// ->latest('created_at');
// });
return Booking::whereIn('status', [
ApprovalStatus::APPROVED,
ApprovalStatus::COMPLETED,
ApprovalStatus::SUSPENDED,
])
->whereHas('transactions', function ($transactionQuery) use ($startDate, $endDate) {
$transactionQuery->payments()
->whereBetween('created_at', [$startDate, $endDate])
->latest('created_at')
->whereHas('transactions', function ($refundQuery) {
$refundQuery->refunds()
->whereIn('status', [ApprovalStatus::APPROVED]);
});
});
}
@@ -83,7 +98,8 @@ class ExportsSalesInvoiceWithRefundReport implements FromQuery, WithHeadings, Wi
$company = $booking->company()->first();
// $lastPaymentTransaction = $booking->transactions()->payments()->complete()->latest()->first();
$lastPaymentTransaction = $booking->transactions()->payments()->where('status', ApprovalStatus::REFUNDED)->latest()->first();
// $lastPaymentTransaction = $booking->transactions()->payments()->where('status', ApprovalStatus::REFUNDED)->latest()->first();
$lastPaymentTransaction = $booking->transactions()->payments()->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::REFUNDED])->latest()->first();
if(!$lastPaymentTransaction){
return $records;
}