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

Merge branch 'dillon/90-e-invoice-f-2' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2025-11-04 11:55:43 +08:00
parent 119581fc79 b7eeb3fcac
commit 58b8213cea
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/DateRangeNoData.php
+15 -14
View File
@@ -92,14 +92,14 @@ class DateRangeNoData implements Filter
$q->where('created_at', '<', '2025-07-01 00:00:00');
});
})
->whereHas('transactions', function ($query) {
$query->where('type', TransactionType::INVOICE)
->whereDoesntHave('attributesKVP', function ($invoiceQuery) {
$invoiceQuery->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE);
->where(function ($query){
$query
->whereDoesntHave('transactions.attributesKVP', function ($subQuery) {
$subQuery->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE);
})
->whereDoesntHave('attributesKVP', function ($subQuery) {
$subQuery->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE);
});
})
->whereDoesntHave('attributesKVP', function ($invoiceQuery) {
$invoiceQuery->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE);
});
})
// OR bookings with refunds
@@ -119,14 +119,15 @@ class DateRangeNoData implements Filter
$q->where('created_at', '<', '2025-07-01 00:00:00');
});
})
->whereHas('transactions', function ($query) {
$query->where('type', TransactionType::INVOICE)
->whereDoesntHave('attributesKVP', function ($invoiceQuery) {
$invoiceQuery->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE);
->where(function ($query){
$query
->whereDoesntHave('transactions.attributesKVP', function ($subQuery) {
$subQuery->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE);
})
->whereDoesntHave('attributesKVP', function ($subQuery) {
$subQuery->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE);
});
})
->whereDoesntHave('attributesKVP', function ($invoiceQuery) {
$invoiceQuery->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE);
});
});
})