From c7cb9b0f507d6a8653f48fba4552cc2a81b7363c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 17 Mar 2025 11:48:35 +1100 Subject: [PATCH 1/3] Additional middleware granularity --- app/Jobs/Report/PreviewReport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/Report/PreviewReport.php b/app/Jobs/Report/PreviewReport.php index c78911cd8f..94abf8deae 100644 --- a/app/Jobs/Report/PreviewReport.php +++ b/app/Jobs/Report/PreviewReport.php @@ -53,6 +53,6 @@ class PreviewReport implements ShouldQueue public function middleware() { - return [new WithoutOverlapping("report-{$this->company->company_key}")]; + return [new WithoutOverlapping("report-{$this->company->company_key}-{$this->report_class}")]; } } From 278d9247a1cb0ce7979e0569c425af81ab65dde4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 17 Mar 2025 12:56:09 +1100 Subject: [PATCH 2/3] Additional middleware granularity --- app/Jobs/Report/SendToAdmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/Report/SendToAdmin.php b/app/Jobs/Report/SendToAdmin.php index f0348c4c75..ddbbaa4bd6 100644 --- a/app/Jobs/Report/SendToAdmin.php +++ b/app/Jobs/Report/SendToAdmin.php @@ -91,6 +91,6 @@ class SendToAdmin implements ShouldQueue public function middleware() { - return [new WithoutOverlapping("report-{$this->company->company_key}")]; + return [new WithoutOverlapping("report-{$this->company->company_key}-{$this->report_class}")]; } } From 284f07129118eb7108d1c181cd226f451c8c9fb9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 17 Mar 2025 14:11:19 +1100 Subject: [PATCH 3/3] v5.11.58 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 129d63b684..847bc853e4 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.11.57 \ No newline at end of file +5.11.58 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index f992604748..64f6819c31 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -17,8 +17,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION', '5.11.57'), - 'app_tag' => env('APP_TAG', '5.11.57'), + 'app_version' => env('APP_VERSION', '5.11.58'), + 'app_tag' => env('APP_TAG', '5.11.58'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),