diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 40494b60d2d3..077ac8ebd856 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -887,6 +887,7 @@ class CompanyImport implements ShouldQueue [ 'hashed_id', 'company_id', + 'backup', ], [ ['users' => 'user_id'], @@ -1192,6 +1193,10 @@ class CompanyImport implements ShouldQueue } + if(array_key_exists('deleted_at', $obj_array) && $obj_array['deleted_at'] > 1){ + $obj_array['deleted_at'] = now(); + } + $activity_invitation_key = false; if($class == 'App\Models\Activity'){ @@ -1270,6 +1275,10 @@ 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']); @@ -1320,6 +1329,10 @@ 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']); diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php index 6f6831e0b696..408a71b52b92 100644 --- a/app/Services/Invoice/MarkPaid.php +++ b/app/Services/Invoice/MarkPaid.php @@ -82,6 +82,9 @@ class MarkPaid extends AbstractService ->updateBalance($payment->amount * -1) ->updatePaidToDate($payment->amount) ->setStatus(Invoice::STATUS_PAID) + ->save(); + + $this->invoice->service() ->applyNumber() ->deletePdf() ->save(); @@ -103,7 +106,10 @@ class MarkPaid extends AbstractService ->updatePaidToDate($payment->amount) ->save(); - $this->invoice->service()->workFlow()->save(); + $this->invoice + ->service() + ->workFlow() + ->save(); return $this->invoice; }