From f8dd0b15afa269b01a2e17f7b5a067f4a4f3ce86 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 25 Nov 2025 09:21:24 +1100 Subject: [PATCH] Fixes for tax configuration --- app/Http/Controllers/Auth/LoginController.php | 4 ++-- app/Services/Tax/Providers/TaxProvider.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index e7b3c2409a..4fca7fdfe6 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -135,13 +135,13 @@ class LoginController extends BaseController if (strlen($request->input('one_time_password')) == 0 || !$google2fa->verifyKey(decrypt($user->google_2fa_secret), $request->input('one_time_password'))) { return response() - ->json(['message' => ctrans('texts.invalid_one_time_password')], 401) + ->json(['message' => ctrans('texts.invalid_one_time_password')], 422) ->header('X-App-Version', config('ninja.app_version')) ->header('X-Api-Version', config('ninja.minimum_client_version')); } } elseif (strlen($user->google_2fa_secret ?? '') > 2 && !$request->has('one_time_password')) { return response() - ->json(['message' => ctrans('texts.invalid_one_time_password')], 401) + ->json(['message' => ctrans('texts.invalid_one_time_password')], 422) ->header('X-App-Version', config('ninja.app_version')) ->header('X-Api-Version', config('ninja.minimum_client_version')); } diff --git a/app/Services/Tax/Providers/TaxProvider.php b/app/Services/Tax/Providers/TaxProvider.php index b5b16a1bbe..77985bb47d 100644 --- a/app/Services/Tax/Providers/TaxProvider.php +++ b/app/Services/Tax/Providers/TaxProvider.php @@ -168,7 +168,7 @@ class TaxProvider private function taxShippingAddress(): bool { - if ($this->client->shipping_country_id == "840" && strlen($this->client->shipping_postal_code) > 3) { + if ($this->client->shipping_country_id == "840" && strlen($this->client->shipping_postal_code ?? '') > 3) { return true; }