Merge branch 'migration-issue' into 'master'

solve migration issue

See merge request mohit.panjvani/crater-web!1330
This commit is contained in:
Mohit Panjwani
2021-12-08 13:10:00 +00:00

View File

@ -1,5 +1,6 @@
<?php <?php
use Crater\Models\Address;
use Crater\Models\CompanySetting; use Crater\Models\CompanySetting;
use Crater\Models\Estimate; use Crater\Models\Estimate;
use Crater\Models\Expense; use Crater\Models\Expense;
@ -35,14 +36,10 @@ class UpdateCraterVersion400 extends Migration
// Update language // Update language
$user->setSettings(['language' => CompanySetting::getSetting('language', $user->company_id)]); $user->setSettings(['language' => CompanySetting::getSetting('language', $user->company_id)]);
// Update user's addresses Address::where('user_id', $user->id)->update([
if ($user->addresses()->exists()) { 'company_id' => $user->company_id,
foreach ($user->addresses as $address) { 'user_id' => null
$address->company_id = $user->company_id; ]);
$address->user_id = null;
$address->save();
}
}
// Update company settings // Update company settings
$this->updateCompanySettings($user); $this->updateCompanySettings($user);
@ -131,6 +128,6 @@ class UpdateCraterVersion400 extends Migration
'payment_from_customer_address_format' => $paymentFromCustomerAddress, 'payment_from_customer_address_format' => $paymentFromCustomerAddress,
]; ];
CompanySetting::setSettings($settings, $user->companies()->first()->id); CompanySetting::setSettings($settings, $user->company_id);
} }
} }