Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v5-develop' into v5-stable

This commit is contained in:
David Bomba 2025-03-02 08:10:20 +11:00
parent 99d41a3794 5a7ecd47eb
commit d49b63d18d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.11.42 5.11.43

4
app/Services/Invoice/LocationData.php
View File

@ -224,7 +224,7 @@ class LocationData extends AbstractService
return $this->businessLocation->country->name; 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 private function getBusinessCountryCode(): string
@ -233,7 +233,7 @@ class LocationData extends AbstractService
return $this->businessLocation->country->iso_3166_2; 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 private function getShippingAddress1(): string

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.11.42'), 'app_version' => env('APP_VERSION', '5.11.43'),
'app_tag' => env('APP_TAG', '5.11.42'), 'app_tag' => env('APP_TAG', '5.11.43'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),