Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 02:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7222 from turbo124/v5-develop

Browse Source 
Fixes for unit cost precision
This commit is contained in:
David Bomba 2022-02-20 18:03:04 +11:00 committed by GitHub
commit 374ba354bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 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.60
5.3.61

1
app/Import/Providers/BaseImport.php
View File

@ -80,7 +80,6 @@ class BaseImport
public function getCsvData($entity_type)
{
nlog("get csv data = entity name = " . $entity_type);
$base64_encoded_csv = Cache::pull($this->hash . '-' . $entity_type);
if (empty($base64_encoded_csv)) {

9
app/Utils/Number.php
View File

@ -200,10 +200,13 @@ class Number
/* 08-01-2022 allow increased precision for unit price*/
$v = rtrim(sprintf('%f', $value),"0");
// $precision = strlen(substr(strrchr($v, $decimal), 1));
$precision = strlen(substr(strrchr($v, $decimal), 1));
if($v<1)
$precision = strlen($v) - strrpos($v, '.') - 1;
// if($v<1)
// $precision = strlen($v) - strrpos($v, '.') - 1;
if($precision == 1)
$precision = 2;
$value = number_format($v, $precision, $decimal, $thousand);
$symbol = $currency->symbol;

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.60',
'app_tag' => '5.3.60',
'app_version' => '5.3.61',
'app_tag' => '5.3.61',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),