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

v5.3.37

Browse Source
This commit is contained in:
David Bomba 2021-12-17 16:06:20 +11:00
parent f6ac95378c
commit adef375aaf
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.36 5.3.37

1
app/Jobs/Company/CompanyImport.php
View File

@ -896,6 +896,7 @@ class CompanyImport implements ShouldQueue
['quotes' => 'quote_id'], ['quotes' => 'quote_id'],
['subscriptions' => 'subscription_id'], ['subscriptions' => 'subscription_id'],
['recurring_invoices' => 'recurring_invoice_id'], ['recurring_invoices' => 'recurring_invoice_id'],
['recurring_expenses' => 'recurring_expense_id'],
// ['invitations' => 'invitation_id'], // ['invitations' => 'invitation_id'],
], ],
'activities'); 'activities');

7
app/Services/Invoice/InvoiceService.php
View File

@ -136,7 +136,6 @@ class InvoiceService
*/ */
public function updateBalance($balance_adjustment, bool $is_draft = false) public function updateBalance($balance_adjustment, bool $is_draft = false)
{ {
// $this->invoice = (new UpdateBalance($this->invoice, $balance_adjustment, $is_draft))->run();
if ((bool)$this->invoice->is_deleted !== false) { if ((bool)$this->invoice->is_deleted !== false) {
nlog($this->invoice->number . " is deleted returning"); nlog($this->invoice->number . " is deleted returning");
@ -300,12 +299,6 @@ class InvoiceService
if($this->invoice->status_id == Invoice::STATUS_DRAFT) if($this->invoice->status_id == Invoice::STATUS_DRAFT)
return $this; return $this;
// if ((int)$this->invoice->balance == 0) {
// $this->setStatus(Invoice::STATUS_PAID)->workFlow();
// }
if ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) { if ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
$this->setStatus(Invoice::STATUS_PARTIAL); $this->setStatus(Invoice::STATUS_PARTIAL);
} }

4
config/ninja.php
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.36', 'app_version' => '5.3.37',
'app_tag' => '5.3.36', 'app_tag' => '5.3.37',
'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', ''),