From d8bdf23f8fa76f6e96bde4426fd142892e9a4505 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 13 Dec 2021 18:19:01 +1100 Subject: [PATCH] Minor fixes for company imports --- app/Jobs/Company/CompanyImport.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 605614b36367..d14b042dc778 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -1332,15 +1332,17 @@ class CompanyImport implements ShouldQueue if(array_key_exists('deleted_at', $obj_array) && $obj_array['deleted_at'] > 1){ $obj_array['deleted_at'] = now(); } - + /* New to convert product ids from old hashes to new hashes*/ if($class == 'App\Models\Subscription'){ - //$obj_array['product_ids'] = $this->recordProductIds($obj_array['product_ids']); - //$obj_array['recurring_product_ids'] = $this->recordProductIds($obj_array['recurring_product_ids']); - // $obj_array['webhook_configuration'] = json_encode($obj_array['webhook_configuration']); - $obj_array['webhook_configuration'] = ''; + + if(array_key_exists('company', $obj_array)) + unset($obj_array['company']); + + $obj_array['webhook_configuration'] = (array)$obj_array['webhook_configuration']; $obj_array['recurring_product_ids'] = ''; $obj_array['product_ids'] = ''; + nlog($obj_array); } /* Expenses that don't have a number will not be inserted - so need to override here*/