Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6603 from turbo124/v5-develop

Browse Source 
v5.3.8
This commit is contained in:
David Bomba 2021-09-08 07:52:18 +10:00 committed by GitHub
commit 52285b4a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.7 5.3.8

2
app/Http/Middleware/QueryLogging.php
View File

@ -55,7 +55,7 @@ class QueryLogging
// nlog("Query count = {$count}"); // nlog("Query count = {$count}");
if($count > 175){ if($count > 175){
nlog("Quer count = {$count}"); nlog("Query count = {$count}");
nlog($queries); nlog($queries);
} }

3
app/PaymentDrivers/Stripe/CreditCard.php
View File

@ -76,7 +76,8 @@ class CreditCard
private function decodeUnicodeString($string) 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){ private function decode_encoded_utf8($string){

6
app/Utils/HtmlEngine.php
View File

@ -184,8 +184,10 @@ class HtmlEngine
$data['$invoice.subtotal'] = &$data['$subtotal']; $data['$invoice.subtotal'] = &$data['$subtotal'];
if ($this->entity->partial > 0) { if ($this->entity->partial > 0) {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', '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.balance_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 { } else {
if($this->entity->status_id == 1){ if($this->entity->status_id == 1){

4
config/ninja.php
View File

@ -14,8 +14,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' => '5.3.7', 'app_version' => '5.3.8',
'app_tag' => '5.3.7', 'app_tag' => '5.3.8',
'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', ''), 'api_secret' => env('API_SECRET', ''),

0
dusk.sh Normal file → Executable file
View File