From 76dfbddca393904183c37a6dc316ca53254ae353 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 7 Jan 2023 02:48:25 +1100 Subject: [PATCH] Improve logic for migrating account plans from hosted and self hosted instances --- app/Jobs/Util/Import.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 43e9e67f0ff2..b2f9dfd33bdb 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -349,6 +349,26 @@ class Import implements ShouldQueue } $account = $this->company->account; + + /* If the user has upgraded their account, do not wipe their payment plan*/ + if($account->isPaid() || (isset($data['plan']) && $data['plan'] == 'white_label')) + { + if(isset($data['plan'])) + unset($data['plan']); + + if(isset($data['plan_term'])) + unset($data['plan_term']); + + if(isset($data['plan_paid'])) + unset($data['plan_paid']); + + if(isset($data['plan_started'])) + unset($data['plan_started']); + + if(isset($data['plan_expires'])) + unset($data['plan_expires']); + } + $account->fill($data); $account->save();