Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Quote filters for expired and upcoming

Browse Source
This commit is contained in:
David Bomba 2022-12-12 10:05:14 +11:00
parent 4e793c7bea
commit 20e0a87630
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filters/QuoteFilters.php
View File

@ -80,7 +80,13 @@ class QuoteFilters extends QueryFilters
if (in_array('expired', $status_parameters)) { if (in_array('expired', $status_parameters)) {
$this->builder->where('status_id', Quote::STATUS_SENT) $this->builder->where('status_id', Quote::STATUS_SENT)
->where('due_date', '<=', now()->toDateString()); ->where('due_date', '>=', now()->toDateString());
}
if (in_array('upcoming', $status_parameters)) {
$this->builder->where('status_id', Quote::STATUS_SENT)
->where('due_date', '<=', now()->toDateString())
->orderBy('due_date', 'DESC');
} }
return $this->builder; return $this->builder;

2
lang/en/texts.php
View File

@ -4898,6 +4898,8 @@ $LANG = array(
'otp_code_message' => 'Enter the code emailed.', 'otp_code_message' => 'Enter the code emailed.',
'otp_code_subject' => 'Your one time passcode code', 'otp_code_subject' => 'Your one time passcode code',
'otp_code_body' => 'Your one time passcode is :code', 'otp_code_body' => 'Your one time passcode is :code',
'delete_tax_rate' => 'Delete Tax Rate',
'restore_tax_rate' => 'Restore Tax Rate',
); );
return $LANG; return $LANG;