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

Merge pull request #4594 from turbo124/v5-develop

Browse Source 
Fixes for importing recurring invoices"
This commit is contained in:
David Bomba 2020-12-30 09:25:14 +11:00 committed by GitHub
commit acf4e90170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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,10 @@ class Import implements ShouldQueue
unset($resource['invitations'][$key]['recurring_invoice_id']); unset($resource['invitations'][$key]['recurring_invoice_id']);
} }
$modified['invitations'] = $resource['invitations'];
}
$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 +709,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'])