Merge pull request #7452 from turbo124/v5-develop

v5.3.90
This commit is contained in:
David Bomba 2022-05-20 16:55:29 +10:00 committed by GitHub
commit e1bec4f30a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 7 deletions

View File

@ -1 +1 @@
5.3.89 5.3.90

View File

@ -138,6 +138,27 @@ class InvoiceFilters extends QueryFilters
}); });
} }
public function upcoming()
{
return $this->builder
->where(function ($query) {
$query->whereNull('due_date')
->orWhere('due_date', '>', now());
})
->orderBy('due_date', 'ASC');
}
public function overdue()
{
$this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
->where('is_deleted', 0)
->where(function ($query) {
$query->where('due_date', '<', now())
->orWhere('partial_due_date', '<', now());
})
->orderBy('due_date', 'ASC');
}
public function payable(string $client_id) public function payable(string $client_id)
{ {
if (strlen($client_id) == 0) { if (strlen($client_id) == 0) {

View File

@ -54,7 +54,7 @@ return [
| |
*/ */
'asset_url' => env('ASSET_URL', null), 'asset_url' => null,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.3.89', 'app_version' => '5.3.90',
'app_tag' => '5.3.89', 'app_tag' => '5.3.90',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"/livewire.js":"/livewire.js?id=940557fc56b15ccb9a2d"} {"/livewire.js":"/livewire.js?id=c69d0f2801c01fcf8166"}