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

E-Invoice - API, Sales Invoice Report (update to exclude data that is marked not to be imported)

Browse Source
This commit is contained in:
Dillon Ngo
2025-11-15 12:19:53 +08:00
parent b7eeb3fcac
commit f0f6822b7e
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/DateRange.php
+6 -1
View File
@@ -61,8 +61,13 @@ class DateRange implements Filter
ApprovalStatus::SUSPENDED,
])
->where(function ($q) use ($startDate, $endDate) {
$q->where(function ($q) {
$q->whereDoesntHave('company', function ($query) {
$query->where('debtor', 'N/A NO NEED TO IMPORT');
});
})
// Bookings without refunds
$q->where(function ($q1) use ($startDate, $endDate) {
->where(function ($q1) use ($startDate, $endDate) {
$q1->where('status', ApprovalStatus::COMPLETED)
->whereHas('transactions', function ($query) use ($startDate, $endDate){
$query->payments()
app/Classes/General/Eloquent/Filters/DateRangeNoData.php
+6 -1
View File
@@ -77,8 +77,13 @@ class DateRangeNoData implements Filter
ApprovalStatus::SUSPENDED,
])
->where(function ($q) use ($startDate, $endDate) {
$q->where(function ($q) {
$q->whereDoesntHave('company', function ($query) {
$query->where('debtor', 'N/A NO NEED TO IMPORT');
});
})
// Bookings without refunds
$q->where(function ($q1) use ($startDate, $endDate) {
->where(function ($q1) use ($startDate, $endDate) {
$q1->where('status', ApprovalStatus::COMPLETED)
->whereHas('transactions', function ($query) use ($startDate, $endDate){
$query->payments()
app/Classes/General/Eloquent/Filters/DateRangeWithData.php
+6 -1
View File
@@ -78,8 +78,13 @@ class DateRangeWithData implements Filter
ApprovalStatus::SUSPENDED,
])
->where(function ($q) use ($startDate, $endDate) {
$q->where(function ($q) {
$q->whereDoesntHave('company', function ($query) {
$query->where('debtor', 'N/A NO NEED TO IMPORT');
});
})
// Bookings without refunds
$q->where(function ($q1) use ($startDate, $endDate) {
->where(function ($q1) use ($startDate, $endDate) {
$q1->where('status', ApprovalStatus::COMPLETED)
->whereHas('transactions', function ($query) use ($startDate, $endDate){
$query->payments()