From 54a9e6385104b7deaeedbf58984543d33343c770 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 18 May 2021 00:36:26 +0300 Subject: [PATCH 1/5] Update version --- app/Constants.php | 2 +- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Constants.php b/app/Constants.php index 0231b54d38a5..c4b547502982 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -361,7 +361,7 @@ if (! defined('APP_NAME')) { define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest')); define('NINJA_DATE', '2000-01-01'); - define('NINJA_VERSION', '4.5.38' . env('NINJA_VERSION_SUFFIX')); + define('NINJA_VERSION', '4.5.39' . env('NINJA_VERSION_SUFFIX')); define('NINJA_TERMS_VERSION', '1.0.1'); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); diff --git a/docs/conf.py b/docs/conf.py index 01a27935488e..d59ca31d2009 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,7 +59,7 @@ author = u'Invoice Ninja' # The short X.Y version. version = u'4.5' # The full version, including alpha/beta/rc tags. -release = u'4.5.38' +release = u'4.5.39' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From d61a3d89b7623bccc97a0d9d19d1a9f549407df8 Mon Sep 17 00:00:00 2001 From: Florent Pellet Date: Tue, 18 May 2021 15:30:01 +0200 Subject: [PATCH 2/5] Fix issue on Safari 14 Safari 14 freeze if the preview is enable https://github.com/invoiceninja/invoiceninja/issues/4305 --- resources/views/invoices/pdf.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php index bff62bc1819a..075c6579fdc8 100644 --- a/resources/views/invoices/pdf.blade.php +++ b/resources/views/invoices/pdf.blade.php @@ -1,5 +1,5 @@ @if (empty($hide_pdf)) - + From fef994b99ecea07d5aac0c385b4bdd4d9ef4cdab Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 23 May 2021 09:09:57 +0300 Subject: [PATCH 3/5] Adjust check data order --- app/Console/Commands/CheckData.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php index 4a20d1f23a21..368aa5c22201 100644 --- a/app/Console/Commands/CheckData.php +++ b/app/Console/Commands/CheckData.php @@ -75,6 +75,8 @@ class CheckData extends Command config(['database.default' => $database]); } + $this->checkContacts(); + if (! $this->option('client_id')) { $this->checkBlankInvoiceHistory(); $this->checkPaidToDate(); @@ -84,7 +86,6 @@ class CheckData extends Command //$this->checkInvoices(); $this->checkInvoiceBalances(); $this->checkClientBalances(); - $this->checkContacts(); $this->checkUserAccounts(); //$this->checkLogoFiles(); From 30c302d1b6746714f107153bbd11422a946c074a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 May 2021 07:29:53 +1000 Subject: [PATCH 4/5] Add timestamps to company gateways migration --- app/Traits/GenerateMigrationResources.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index f9239df278eb..ddec49941529 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -1361,6 +1361,9 @@ info("translated gateway_type = {$translated_gateway_type}"); 'custom_value2' => '', 'custom_value3' => '', 'custom_value4' => '', + 'created_at' => $account_gateway->created_at ? Carbon::parse($account_gateway->created_at)->toDateString() : null, + 'updated_at' => $account_gateway->updated_at ? Carbon::parse($account_gateway->updated_at)->toDateString() : null, + 'deleted_at' => $account_gateway->deleted_at ? Carbon::parse($account_gateway->deleted_at)->toDateString() : null, ]; // } } From b0d6a9ce5b64e1554f8614047dae2549e0ccecf9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 5 Jun 2021 13:38:00 +1000 Subject: [PATCH 5/5] Adjustments for migration --- app/Traits/GenerateMigrationResources.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index b995a5520a06..dd535484080f 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -840,7 +840,13 @@ info("get company"); return 1; } - +/** + const STATUS_DRAFT = 1; + const STATUS_SENT = 2; + const STATUS_APPROVED = 3; + const STATUS_CONVERTED = 4; + const STATUS_EXPIRED = -1; + */ private function transformQuoteStatusId($quote) { if(!$quote->is_public) @@ -1058,6 +1064,7 @@ info("get company"); 'tax_name2' => $quote->tax_name2, 'tax_rate1' => $quote->tax_rate1, 'tax_rate2' => $quote->tax_rate2, + 'invoice_id' => $quote->quote_invoice_id, 'custom_surcharge1' => $quote->custom_value1 ?: '', 'custom_surcharge2' => $quote->custom_value2 ?: '', 'custom_value1' => $quote->custom_text_value1 ?: '',