From 41aed16d76fe4d940089cbeed70376272c4de536 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 2 Mar 2025 08:08:47 +1100 Subject: [PATCH 1/2] Add catchs for null client countries --- app/Services/Invoice/LocationData.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Services/Invoice/LocationData.php b/app/Services/Invoice/LocationData.php index 6c5e06e5e8..e9ff1f957b 100644 --- a/app/Services/Invoice/LocationData.php +++ b/app/Services/Invoice/LocationData.php @@ -224,7 +224,7 @@ class LocationData extends AbstractService return $this->businessLocation->country->name; } - return $this->entity->client->country->name; + return $this->entity->client->country->name ?? $this->entity->company->country()->name; } private function getBusinessCountryCode(): string @@ -233,7 +233,7 @@ class LocationData extends AbstractService return $this->businessLocation->country->iso_3166_2; } - return $this->entity->client->country->iso_3166_2; + return $this->entity->client->country->iso_3166_2 ?? $this->entity->company->country()->iso_3166_2; } private function getShippingAddress1(): string From 5a7ecd47ebbe591122aa2f0f87e0006af8ef7cff Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 2 Mar 2025 08:10:11 +1100 Subject: [PATCH 2/2] v5.11.43 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index d465745efe..08229f2bf8 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.11.42 \ No newline at end of file +5.11.43 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 917b365d0d..ca2be18a0c 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.42'), - 'app_tag' => env('APP_TAG', '5.11.42'), + 'app_version' => env('APP_VERSION', '5.11.43'), + 'app_tag' => env('APP_TAG', '5.11.43'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),