Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-10 18:54:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for credits on statements

Browse Source
This commit is contained in:
David Bomba 2024-05-11 09:22:59 +10:00
parent 7d17fcc779
commit c0c818d918
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Services/Client/Statement.php
View File

@ -375,7 +375,8 @@ class Statement
->whereIn('status_id', [Credit::STATUS_SENT, Credit::STATUS_PARTIAL, Credit::STATUS_APPLIED]) ->whereIn('status_id', [Credit::STATUS_SENT, Credit::STATUS_PARTIAL, Credit::STATUS_APPLIED])
->whereBetween('date', [Carbon::parse($this->options['start_date']), Carbon::parse($this->options['end_date'])]) ->whereBetween('date', [Carbon::parse($this->options['start_date']), Carbon::parse($this->options['end_date'])])
->where(function ($query) { ->where(function ($query) {
$query->whereDate('due_date', '>=', $this->options['end_date']) // $query->whereDate('due_date', '>=', $this->options['end_date'])
$query->whereDate('due_date', '>=', now())
->orWhereNull('due_date'); ->orWhereNull('due_date');
}) })
->orderBy('date', 'ASC'); ->orderBy('date', 'ASC');