From 82117f83619ccde4fe86570f382443536417b680 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 2 Mar 2024 10:14:36 +1100 Subject: [PATCH] v5.8.32 --- VERSION.txt | 2 +- app/Helpers/Invoice/InvoiceSum.php | 6 +++--- config/ninja.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 1dcfa2b739..577d1e25e9 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.8.31 \ No newline at end of file +5.8.32 \ No newline at end of file diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php index fd1472c18e..d6379356cd 100644 --- a/app/Helpers/Invoice/InvoiceSum.php +++ b/app/Helpers/Invoice/InvoiceSum.php @@ -122,7 +122,7 @@ class InvoiceSum private function calculateInvoiceTaxes(): self { - if (is_string($this->invoice->tax_name1) && strlen($this->invoice->tax_name1) > 2) { + if (is_string($this->invoice->tax_name1) && strlen($this->invoice->tax_name1) >= 2) { $tax = $this->taxer($this->total, $this->invoice->tax_rate1); $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name1, $this->invoice->tax_rate1); @@ -130,7 +130,7 @@ class InvoiceSum $this->total_tax_map[] = ['name' => $this->invoice->tax_name1.' '.floatval($this->invoice->tax_rate1).'%', 'total' => $tax]; } - if (is_string($this->invoice->tax_name2) && strlen($this->invoice->tax_name2) > 2) { + if (is_string($this->invoice->tax_name2) && strlen($this->invoice->tax_name2) >= 2) { $tax = $this->taxer($this->total, $this->invoice->tax_rate2); $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name2, $this->invoice->tax_rate2); @@ -138,7 +138,7 @@ class InvoiceSum $this->total_tax_map[] = ['name' => $this->invoice->tax_name2.' '.floatval($this->invoice->tax_rate2).'%', 'total' => $tax]; } - if (is_string($this->invoice->tax_name3) && strlen($this->invoice->tax_name3) > 2) { + if (is_string($this->invoice->tax_name3) && strlen($this->invoice->tax_name3) >= 2) { $tax = $this->taxer($this->total, $this->invoice->tax_rate3); $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name3, $this->invoice->tax_rate3); diff --git a/config/ninja.php b/config/ninja.php index d9174d5372..660b465a20 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.8.31'), - 'app_tag' => env('APP_TAG', '5.8.31'), + 'app_version' => env('APP_VERSION', '5.8.32'), + 'app_tag' => env('APP_TAG', '5.8.32'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),