From ba771c5cec91bbee7d48eb63ea7776b1eba22b56 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 14 May 2022 16:52:31 +1000 Subject: [PATCH 1/3] Better handling of failed downloads for .zip --- app/Http/Controllers/SelfUpdateController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index fe83bfd3a7..bd0b74df60 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -120,7 +120,11 @@ class SelfUpdateController extends BaseController nlog("copying release file"); - copy($this->getDownloadUrl(), storage_path('app/invoiceninja.zip')); + if(copy($this->getDownloadUrl(), storage_path('app/invoiceninja.zip'))){ + nlog("Copied file from URL"); + } + else + return response()->json(['message' => 'Download not yet available. Please try again shortly.'], 410); nlog("Finished copying"); From 026336de09330c847f53b6072c992a026f9654e0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 14 May 2022 17:00:24 +1000 Subject: [PATCH 2/3] Fixes for statements --- app/Services/PdfMaker/Design.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index 8522ba9133..9cbb6c3048 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -226,7 +226,7 @@ class Design extends BaseDesign { if ($this->type === 'statement') { - $s_date = $this->translateDate(now()->format($client->company->date_format()), $this->client->date_format(), $this->client->locale()); + $s_date = $this->translateDate(now()->format($this->client->company->date_format()), $this->client->date_format(), $this->client->locale()); return [ ['element' => 'tr', 'properties' => ['data-ref' => 'statement-label'], 'elements' => [ From 0d69531fc5ea0c60a3c1b02cce5f89be4ebf4ce1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 14 May 2022 17:02:12 +1000 Subject: [PATCH 3/3] v5.3.88 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 177bdc1ceb..e042e08fb4 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.87 \ No newline at end of file +5.3.88 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 6b0d96f50a..bb03bc1040 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.3.87', - 'app_tag' => '5.3.87', + 'app_version' => '5.3.88', + 'app_tag' => '5.3.88', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),