Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 08:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Migrate company_user with users (#3598)

Browse Source
This commit is contained in:
Benjamin Beganović 2020-04-07 22:43:44 +02:00 committed by GitHub
parent 28cc7d5e52
commit 6a0ddd6c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Util/Import.php
View File

@ -281,7 +281,7 @@ class Import implements ShouldQueue
$modified = $resource; $modified = $resource;
unset($modified['id']); unset($modified['id']);
$user = $user_repository->save($modified, $this->fetchUser($resource['email']), true); $user = $user_repository->save($modified, $this->fetchUser($resource['email']), true, false);
$user_agent = array_key_exists('token_name', $resource) ?: request()->server('HTTP_USER_AGENT'); $user_agent = array_key_exists('token_name', $resource) ?: request()->server('HTTP_USER_AGENT');

16
app/Repositories/UserRepository.php
View File

@ -45,12 +45,24 @@ class UserRepository extends BaseRepository
* *
* @return user|\App\Models\user|null user Object * @return user|\App\Models\user|null user Object
*/ */
public function save(array $data, User $user, $is_migrating = false) public function save(array $data, User $user, $is_migrating = false, $unset_company_user = false)
{ {
$details = $data;
/**
* Getting: SQLSTATE[42S22]: Column not found: 1054 Unknown column 'company_user'
* because of User::unguard().
* Solution. Unset company_user per request.
*/
if ($unset_company_user) {
unset($details['company_user']);
}
$company = auth()->user()->company(); $company = auth()->user()->company();
$account_id = $company->account->id; $account_id = $company->account->id;
$user->fill($data); $user->fill($details);
$user->account_id = $account_id; $user->account_id = $account_id;
$user->save(); $user->save();