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

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
= 2020-12-30 09:02:20 +11:00
commit f2a171080e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -629,6 +629,8 @@ class Import implements ShouldQueue
unset($modified['id']); unset($modified['id']);
if(array_key_exists('invitations', $resource))
{
foreach($resource['invitations'] as $key => $invite) foreach($resource['invitations'] as $key => $invite)
{ {
@ -638,7 +640,8 @@ class Import implements ShouldQueue
unset($resource['invitations'][$key]['recurring_invoice_id']); unset($resource['invitations'][$key]['recurring_invoice_id']);
} }
}
$invoice = $invoice_repository->save( $invoice = $invoice_repository->save(
$modified, $modified,
RecurringInvoiceFactory::create($this->company->id, $modified['user_id']) RecurringInvoiceFactory::create($this->company->id, $modified['user_id'])
@ -704,7 +707,6 @@ class Import implements ShouldQueue
$modified['invitations'] = $resource['invitations']; $modified['invitations'] = $resource['invitations'];
} }
$invoice = $invoice_repository->save( $invoice = $invoice_repository->save(
$modified, $modified,
InvoiceFactory::create($this->company->id, $modified['user_id']) InvoiceFactory::create($this->company->id, $modified['user_id'])