From 716013f4a06883a5de789c3b3372f0451cf1d4b3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Apr 2023 15:58:49 +1000 Subject: [PATCH 1/3] Revert cache --- .../views/portal/ninja2020/components/no-cache.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/components/no-cache.blade.php b/resources/views/portal/ninja2020/components/no-cache.blade.php index 3ef938bef28e..4a7bc88647a9 100644 --- a/resources/views/portal/ninja2020/components/no-cache.blade.php +++ b/resources/views/portal/ninja2020/components/no-cache.blade.php @@ -1,3 +1,5 @@ - + + + From f80a437b0ba6b4711b3b716c2c100bb71b8e19fc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Apr 2023 16:12:12 +1000 Subject: [PATCH 2/3] Fixes for updating PDFs on updated invoice --- app/Services/Invoice/InvoiceService.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php index 6977b4925910..7b750f46cdab 100644 --- a/app/Services/Invoice/InvoiceService.php +++ b/app/Services/Invoice/InvoiceService.php @@ -460,14 +460,15 @@ class InvoiceService return $this; } - if($this->invoice->company->enable_e_invoice) { - $this->invoice->invitations->each(function ($invitation) { - CreateEntityPdf::dispatch($invitation); - if ($invitation instanceof InvoiceInvitation) { - CreateEInvoice::dispatch($invitation->invoice, true); - } - }); - } + + $this->invoice->invitations->each(function ($invitation) { + CreateEntityPdf::dispatch($invitation); + + if ($invitation->company->enable_e_invoice && $invitation instanceof InvoiceInvitation) { + CreateEInvoice::dispatch($invitation->invoice, true); + } + + }); } catch (\Exception $e) { nlog('failed creating invoices in Touch PDF'); From 8e98381dccc0783ad7564a46d67c4c51e3a6afe8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 Apr 2023 16:15:19 +1000 Subject: [PATCH 3/3] Fix for regression --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 1b20908eee99..93fcf1c992d4 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.5.108 \ No newline at end of file +5.5.109 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index df1a3dc957d0..d3c1054807b2 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.5.108', - 'app_tag' => '5.5.108', + 'app_version' => '5.5.109', + 'app_tag' => '5.5.109', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),