diff --git a/VERSION.txt b/VERSION.txt index 2e0c25f79a62..d758bc62f66a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.7 \ No newline at end of file +5.3.8 \ No newline at end of file diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index 647dc030f5ff..30b4adc32a0e 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -55,7 +55,7 @@ class QueryLogging // nlog("Query count = {$count}"); if($count > 175){ - nlog("Quer count = {$count}"); + nlog("Query count = {$count}"); nlog($queries); } diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php index 43fd5eb47098..7d187185db9e 100644 --- a/app/PaymentDrivers/Stripe/CreditCard.php +++ b/app/PaymentDrivers/Stripe/CreditCard.php @@ -76,7 +76,8 @@ class CreditCard private function decodeUnicodeString($string) { - return iconv("UTF-8", "ISO-8859-1//TRANSLIT", $this->decode_encoded_utf8($string)); + return html_entity_decode($string, ENT_QUOTES, 'UTF-8'); + // return iconv("UTF-8", "ISO-8859-1//TRANSLIT", $this->decode_encoded_utf8($string)); } private function decode_encoded_utf8($string){ diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 0914431dc49a..7cf6d86a321b 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -184,8 +184,10 @@ class HtmlEngine $data['$invoice.subtotal'] = &$data['$subtotal']; if ($this->entity->partial > 0) { - $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')]; - $data['$balance_due_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.balance_due')]; + $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')]; + $data['$balance_due_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')]; + $data['$due_date'] = ['value' => $this->translateDate($this->entity->partial_due_date, $this->entity->client->date_format(), $this->entity->client->locale()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')]; + } else { if($this->entity->status_id == 1){ diff --git a/config/ninja.php b/config/ninja.php index 72a1e1a6911d..15096ac5dad9 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.7', - 'app_tag' => '5.3.7', + 'app_version' => '5.3.8', + 'app_tag' => '5.3.8', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/dusk.sh b/dusk.sh old mode 100644 new mode 100755