Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 17:01:33 +02:00
Code Issues Releases Activity

Merge pull request #7106 from turbo124/v5-develop

Browse Source 
v5.3.44
This commit is contained in:
David Bomba 2022-01-10 06:18:12 +11:00 committed by GitHub
commit a0a486e3bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.43
5.3.44

6
app/Jobs/Util/ApplePayDomain.php
View File

@ -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');
}
}

4
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -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);

4
config/ninja.php
View File

@ -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', ''),