mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-21 17:01:33 +02:00
commit
a0a486e3bc
@ -1 +1 @@
|
|||||||
5.3.43
|
5.3.44
|
@ -78,11 +78,11 @@ class ApplePayDomain implements ShouldQueue
|
|||||||
if(Ninja::isHosted())
|
if(Ninja::isHosted())
|
||||||
{
|
{
|
||||||
|
|
||||||
if($this->company->portal_mode == 'domain'){
|
if($this->company_gateway->company->portal_mode == 'domain'){
|
||||||
$domain = $this->company->portal_domain;
|
$domain = $this->company_gateway->company->portal_domain;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
$domain = $this->company->subdomain . '.' . config('ninja.app_domain');
|
$domain = $this->company_gateway->company->subdomain . '.' . config('ninja.app_domain');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -306,8 +306,8 @@ trait MakesInvoiceValues
|
|||||||
|
|
||||||
//change quantity from localized number, to decimal format with no trailing zeroes 06/09/21
|
//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.'.quantity'] = rtrim($item->quantity, $locale_info['decimal_point']);
|
||||||
$data[$key][$table_type.'.unit_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::formatMoneyNoRounding($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);
|
$data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $this->client);
|
||||||
|
|
||||||
|
@ -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.43',
|
'app_version' => '5.3.44',
|
||||||
'app_tag' => '5.3.43',
|
'app_tag' => '5.3.44',
|
||||||
'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', ''),
|
||||||
|
Loading…
Reference in New Issue
Block a user