shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2011 from burakcakirel/update_customer_user

Browse Source 
Update customer/user relationships
This commit is contained in:
Cüneyt Şentürk 2021-04-29 16:16:53 +03:00 committed by GitHub
commit ca0ef0a696
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Requests/Auth/User.php
View File

@ -6,6 +6,7 @@ use Illuminate\Foundation\Http\FormRequest;
class User extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
@ -29,12 +30,22 @@ class User extends FormRequest
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
$email = 'required|email';
if ($this->getMethod() == 'PATCH') {
// Updating user
$id = is_numeric($this->user) ? $this->user : $this->user->getAttribute('id');
$password = '';
$companies = $this->user->can('read-common-companies') ? 'required' : '';
$roles = $this->user->can('read-auth-roles') ? 'required' : '';
if ($this->user->contact) {
$email .= '|unique:contacts,NULL,'
. $this->user->contact->id . ',id'
. ',company_id,' . company_id()
. ',type,customer'
. ',deleted_at,NULL';
}
} else {
// Creating user
$id = null;
@ -43,9 +54,11 @@ class User extends FormRequest
$roles = 'required';
}
$email .= '|unique:users,email,' . $id . ',id,deleted_at,NULL';
return [
'name' => 'required|string',
'email' => 'required|email|unique:users,email,' . $id . ',id,deleted_at,NULL',
'email' => $email,
'password' => $password . 'confirmed',
'companies' => $companies,
'roles' => $roles,

10
app/Http/Requests/Common/Contact.php
View File

@ -43,7 +43,15 @@ class Contact extends FormRequest
}
if (!empty($this->request->get('email'))) {
$email = 'email|unique:contacts,NULL,' . $id . ',id,company_id,' . $company_id . ',type,' . $type . ',deleted_at,NULL';
$email .= 'email|unique:contacts,NULL,'
. $id . ',id'
. ',company_id,' . $company_id
. ',type,' . $type
. ',deleted_at,NULL';
if (isset($model) && $this->$model->user_id) {
$email .= '|unique:users,NULL,' . $this->$model->user_id . ',id,deleted_at,NULL';
}
}
return [

12
app/Http/Requests/Portal/Profile.php
View File

@ -31,9 +31,19 @@ class Profile extends FormRequest
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
$email = 'required|email|unique:users,email,' . $id . ',id,deleted_at,NULL';
if (user()->contact) {
$email .= '|unique:contacts,NULL,'
. user()->contact->id . ',id'
. ',company_id,' . company_id()
. ',type,customer'
. ',deleted_at,NULL';
}
return [
'name' => 'required|string',
'email' => 'required|email|unique:users,email,' . $id . ',id,deleted_at,NULL',
'email' => $email,
'password' => 'confirmed',
'picture' => $picture,
];

4
app/Jobs/Auth/UpdateUser.php
View File

@ -55,6 +55,10 @@ class UpdateUser extends Job
if ($this->request->has('companies')) {
$this->user->companies()->sync($this->request->get('companies'));
}
if ($this->user->contact) {
$this->user->contact->update($this->request->input());
}
});
return $this->user;

4
app/Jobs/Common/UpdateContact.php
View File

@ -38,12 +38,14 @@ class UpdateContact extends Job
\DB::transaction(function () {
if ($this->request->get('create_user', 'false') === 'true') {
$this->createUser();
} elseif ($this->contact->user) {
$this->contact->user->update($this->request->all());
}
// Upload logo
if ($this->request->file('logo')) {
$media = $this->getMedia($this->request->file('logo'), Str::plural($this->contact->type));
$this->contact->attachMedia($media, 'logo');
}