Work on item filters for reports
This commit is contained in:
parent
2887a6a34d
commit
ec5a834779
|
|
@ -1043,7 +1043,7 @@ class BaseExport
|
||||||
|
|
||||||
/** @var array $status_parameters */
|
/** @var array $status_parameters */
|
||||||
$status_parameters = explode(',', $status);
|
$status_parameters = explode(',', $status);
|
||||||
|
nlog($status_parameters);
|
||||||
if (in_array('all', $status_parameters) || count($status_parameters) == 0) {
|
if (in_array('all', $status_parameters) || count($status_parameters) == 0) {
|
||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ class RecurringInvoiceItemExport extends BaseExport
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->input['status'] ?? false) {
|
if ($this->input['status'] ?? false) {
|
||||||
$query = $this->addInvoiceStatusFilter($query, $this->input['status']);
|
$query = $this->addRecurringInvoiceStatusFilter($query, $this->input['status']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$query = $this->applyProductFilters($query);
|
$query = $this->applyProductFilters($query);
|
||||||
|
|
|
||||||
|
|
@ -5590,6 +5590,7 @@ $lang = array(
|
||||||
'docuninja_change_users' => 'New DocuNinja user limit',
|
'docuninja_change_users' => 'New DocuNinja user limit',
|
||||||
'docuninja_disable_warning' => 'This will remove all access to your DocuNinja account.',
|
'docuninja_disable_warning' => 'This will remove all access to your DocuNinja account.',
|
||||||
'docuninja_downgrade_info' => 'Your user limit will automatically be reduced at the end of the current billing cycle.',
|
'docuninja_downgrade_info' => 'Your user limit will automatically be reduced at the end of the current billing cycle.',
|
||||||
|
'recurring_invoice_item' => 'Recurring Invoice Item',
|
||||||
);
|
);
|
||||||
|
|
||||||
return $lang;
|
return $lang;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue