From 770960e9ac72cd278644282108f3528304d4aa53 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 9 Jan 2022 19:57:13 +1100 Subject: [PATCH 1/3] Fixes for Apple Pay Domain --- app/Jobs/Util/ApplePayDomain.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Jobs/Util/ApplePayDomain.php b/app/Jobs/Util/ApplePayDomain.php index 8dc6230b557f..45c0017fd093 100644 --- a/app/Jobs/Util/ApplePayDomain.php +++ b/app/Jobs/Util/ApplePayDomain.php @@ -78,11 +78,11 @@ class ApplePayDomain implements ShouldQueue if(Ninja::isHosted()) { - if($this->company->portal_mode == 'domain'){ - $domain = $this->company->portal_domain; + if($this->company_gateway->company->portal_mode == 'domain'){ + $domain = $this->company_gateway->company->portal_domain; } else{ - $domain = $this->company->subdomain . '.' . config('ninja.app_domain'); + $domain = $this->company_gateway->company->subdomain . '.' . config('ninja.app_domain'); } } From 16a158e251329c00a0d88a1bc8bf489c7d368bdd Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 10 Jan 2022 06:14:56 +1100 Subject: [PATCH 2/3] Rollback precision --- app/Utils/Traits/MakesInvoiceValues.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index 8ba43416d1fe..f284bcae9458 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -306,8 +306,8 @@ trait MakesInvoiceValues //change quantity from localized number, to decimal format with no trailing zeroes 06/09/21 $data[$key][$table_type.'.quantity'] = rtrim($item->quantity, $locale_info['decimal_point']); - $data[$key][$table_type.'.unit_cost'] = Number::formatMoneyNoRounding($item->cost, $this->client); - $data[$key][$table_type.'.cost'] = Number::formatMoneyNoRounding($item->cost, $this->client); + $data[$key][$table_type.'.unit_cost'] = Number::formatMoney($item->cost, $this->client); + $data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $this->client); $data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $this->client); From 8939f687afae556ae2b2aa0b2427ea4c6abccc2d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 10 Jan 2022 06:15:34 +1100 Subject: [PATCH 3/3] 5.3.44 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index bb5c61465643..1690fa814b5b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.43 \ No newline at end of file +5.3.44 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 01e71b7bf538..a485bc0f5733 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.43', - 'app_tag' => '5.3.43', + 'app_version' => '5.3.44', + 'app_tag' => '5.3.44', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),