Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 16:54:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5588 from turbo124/v5-develop

Browse Source 
v5.1.59
This commit is contained in:
David Bomba 2021-05-03 20:52:49 +10:00 committed by GitHub
commit 4302ca69de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.58 5.1.59

3
app/Jobs/Product/UpdateOrCreateProduct.php
View File

@ -85,7 +85,10 @@ class UpdateOrCreateProduct implements ShouldQueue
$product->notes = isset($item->notes) ? $item->notes : ''; $product->notes = isset($item->notes) ? $item->notes : '';
//$product->cost = isset($item->cost) ? $item->cost : 0; //this value shouldn't be updated. //$product->cost = isset($item->cost) ? $item->cost : 0; //this value shouldn't be updated.
$product->price = isset($item->cost) ? $item->cost : 0; $product->price = isset($item->cost) ? $item->cost : 0;
if(!$product->id)
$product->quantity = isset($item->quantity) ? $item->quantity : 0; $product->quantity = isset($item->quantity) ? $item->quantity : 0;
$product->tax_name1 = isset($item->tax_name1) ? $item->tax_name1 : ''; $product->tax_name1 = isset($item->tax_name1) ? $item->tax_name1 : '';
$product->tax_rate1 = isset($item->tax_rate1) ? $item->tax_rate1 : 0; $product->tax_rate1 = isset($item->tax_rate1) ? $item->tax_rate1 : 0;
$product->tax_name2 = isset($item->tax_name2) ? $item->tax_name2 : ''; $product->tax_name2 = isset($item->tax_name2) ? $item->tax_name2 : '';

4
app/Jobs/Util/Import.php
View File

@ -226,8 +226,8 @@ class Import implements ShouldQueue
//company size check //company size check
if ($this->company->invoices()->count() > 1000 || $this->company->products()->count() > 1000 || $this->company->clients()->count() > 1000) { if ($this->company->invoices()->count() > 1000 || $this->company->products()->count() > 1000 || $this->company->clients()->count() > 1000) {
$company->is_large = true; $this->company->is_large = true;
$company->save(); $this->company->save();
} }
info('Completed🚀🚀🚀🚀🚀 at '.now()); info('Completed🚀🚀🚀🚀🚀 at '.now());

3
app/Jobs/Util/SystemLogger.php
View File

@ -54,6 +54,9 @@ class SystemLogger implements ShouldQueue
'type_id' => $this->type_id, 'type_id' => $this->type_id,
]; ];
if(!$this->log)
return;
SystemLog::create($sl); SystemLog::create($sl);
} }
} }

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.1.58', 'app_version' => '5.1.59',
'app_tag' => '5.1.58-release', 'app_tag' => '5.1.59-release',
'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', false), 'api_secret' => env('API_SECRET', false),