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

Fixes for uses_inclusive_taxes

Browse Source
This commit is contained in:
David Bomba 2021-07-17 20:36:51 +10:00
parent 3605b18d2a
commit 0a77e571fe
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,6 +430,9 @@ class Import implements ShouldQueue
private function transformCompanyData(array $data): array private function transformCompanyData(array $data): array
{ {
nlog("pre transformed");
nlog($data['settings']);
$company_settings = CompanySettings::defaults(); $company_settings = CompanySettings::defaults();
if (array_key_exists('settings', $data)) { if (array_key_exists('settings', $data)) {
@ -452,6 +455,9 @@ class Import implements ShouldQueue
$data['settings'] = $company_settings; $data['settings'] = $company_settings;
} }
nlog("transformed Settings");
nlog($data['settings']);
return $data; return $data;
} }
@ -566,6 +572,7 @@ class Import implements ShouldQueue
$model_query = $model::where($column, $value) $model_query = $model::where($column, $value)
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)
->withTrashed()
->exists(); ->exists();
if($model_query) if($model_query)

1
app/Models/Invoice.php
View File

@ -93,6 +93,7 @@ class Invoice extends BaseModel
'exchange_rate', 'exchange_rate',
'subscription_id', 'subscription_id',
'auto_bill_enabled', 'auto_bill_enabled',
'uses_inclusive_taxes',
]; ];
protected $casts = [ protected $casts = [