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

Minor fixes for company imports

Browse Source
This commit is contained in:
David Bomba 2022-06-29 10:38:48 +10:00
parent a170c4a4d1
commit 8bd3f54bb0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Jobs/Company/CompanyImport.php
View File

@ -1423,21 +1423,21 @@ class CompanyImport implements ShouldQueue
$new_obj->company_id = $this->company->id; $new_obj->company_id = $this->company->id;
$new_obj->fill($obj_array); $new_obj->fill($obj_array);
$new_obj->save(['timestamps' => false]); $new_obj->save(['timestamps' => false]);
$new_obj->number = $this->getNextInvoiceNumber($client = Client::find($obj_array['client_id']),$new_obj); $new_obj->number = $this->getNextInvoiceNumber($client = Client::withTrashed()->find($obj_array['client_id']),$new_obj);
} }
elseif($class == 'App\Models\Payment' && is_null($obj->{$match_key})){ elseif($class == 'App\Models\Payment' && is_null($obj->{$match_key})){
$new_obj = new Payment(); $new_obj = new Payment();
$new_obj->company_id = $this->company->id; $new_obj->company_id = $this->company->id;
$new_obj->fill($obj_array); $new_obj->fill($obj_array);
$new_obj->save(['timestamps' => false]); $new_obj->save(['timestamps' => false]);
$new_obj->number = $this->getNextPaymentNumber($client = Client::find($obj_array['client_id']), $new_obj); $new_obj->number = $this->getNextPaymentNumber($client = Client::withTrashed()->find($obj_array['client_id']), $new_obj);
} }
elseif($class == 'App\Models\Quote' && is_null($obj->{$match_key})){ elseif($class == 'App\Models\Quote' && is_null($obj->{$match_key})){
$new_obj = new Quote(); $new_obj = new Quote();
$new_obj->company_id = $this->company->id; $new_obj->company_id = $this->company->id;
$new_obj->fill($obj_array); $new_obj->fill($obj_array);
$new_obj->save(['timestamps' => false]); $new_obj->save(['timestamps' => false]);
$new_obj->number = $this->getNextQuoteNumber($client = Client::find($obj_array['client_id']), $new_obj); $new_obj->number = $this->getNextQuoteNumber($client = Client::withTrashed()->find($obj_array['client_id']), $new_obj);
} }
elseif($class == 'App\Models\ClientContact'){ elseif($class == 'App\Models\ClientContact'){
$new_obj = new ClientContact(); $new_obj = new ClientContact();