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

Merge branch 'master' into user-works

Browse Source
This commit is contained in:
Sevan Nerse
2022-06-29 22:40:55 +03:00
parent cf26bc5998 c27c236d31
commit a63b9938da
16 changed files with 99 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Jobs/Common/CreateContact.php
View File

@ -43,13 +43,13 @@ class CreateContact extends Job implements HasOwner, HasSource, ShouldCreate
throw new \Exception($message);
}
$customer_role = Role::all()->filter(function ($role) {
$customer_role_id = Role::all()->filter(function ($role) {
return $role->hasPermission('read-client-portal');
})->pluck('id')->toArray();
})->pluck('id')->first();
$this->request->merge([
'locale' => setting('default.locale', 'en-GB'),
'roles' => $customer_role,
'roles' => $customer_role_id,
'companies' => [$this->request->get('company_id')],
]);

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

@ -57,13 +57,13 @@ class UpdateContact extends Job implements ShouldUpdate
throw new \Exception($message);
}
$customer_role = Role::all()->filter(function ($role) {
$customer_role_id = Role::all()->filter(function ($role) {
return $role->hasPermission('read-client-portal');
})->pluck('id')->toArray();
})->pluck('id')->first();
$this->request->merge([
'locale' => setting('default.locale', 'en-GB'),
'roles' => $customer_role,
'roles' => $customer_role_id,
'companies' => [$this->request->get('company_id')],
]);

5
app/View/Components/Index/Country.php
View File

@ -27,6 +27,7 @@ class Country extends Component
*/
public function __construct($code) {
$this->code = $code;
$this->country = trans('general.na');
}
/**
@ -36,7 +37,9 @@ class Country extends Component
*/
public function render()
{
$this->country = trans('countries.' . $this->code);
if (! empty($this->code)) {
$this->country = trans('countries.' . $this->code);
}
return view('components.index.country');
}