From 389c80ca13040874f15ff266e95f9e2a4a4a2172 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 30 Dec 2020 08:58:48 +1100 Subject: [PATCH 1/2] Fixes for import --- app/Jobs/Util/Import.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 44b101edd00c..d511ac2f3de0 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -629,6 +629,8 @@ class Import implements ShouldQueue unset($modified['id']); + if(array_key_exists('invitations', $resource)) + { foreach($resource['invitations'] as $key => $invite) { @@ -638,7 +640,8 @@ class Import implements ShouldQueue unset($resource['invitations'][$key]['recurring_invoice_id']); } - + } + $invoice = $invoice_repository->save( $modified, RecurringInvoiceFactory::create($this->company->id, $modified['user_id']) @@ -704,7 +707,6 @@ class Import implements ShouldQueue $modified['invitations'] = $resource['invitations']; } - $invoice = $invoice_repository->save( $modified, InvoiceFactory::create($this->company->id, $modified['user_id']) From ccc4133094910fe59b4a6600e88c0644d8e77885 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 30 Dec 2020 09:24:33 +1100 Subject: [PATCH 2/2] Fixes for recurring --- app/Jobs/Util/Import.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index d511ac2f3de0..cd5f6806a16f 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -640,6 +640,8 @@ class Import implements ShouldQueue unset($resource['invitations'][$key]['recurring_invoice_id']); } + + $modified['invitations'] = $resource['invitations']; } $invoice = $invoice_repository->save(