Merge branch 'master' of https://github.com/brkcvn/akaunting
This commit is contained in:
Burak Civan
@ -32,21 +32,23 @@
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
<x-form.section.head title="{{ trans('general.assign') }}" description="{!! trans('auth.form_description.assign', ['url' => $roles_url]) !!}" />
|
||||
</x-slot>
|
||||
@if (user()->can('read-common-companies') || user()->hasRole(['admin', 'manager']))
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
<x-form.section.head title="{{ trans('general.assign') }}" description="{!! trans('auth.form_description.assign', ['url' => $roles_url]) !!}" />
|
||||
</x-slot>
|
||||
|
||||
<x-slot name="body">
|
||||
@can('read-common-companies')
|
||||
<x-form.group.select multiple remote name="companies" label="{{ trans_choice('general.companies', 2) }}" :options="$companies" remote_action="{{ route('companies.index') }}" form-group-class="sm:col-span-6" />
|
||||
@endcan
|
||||
<x-slot name="body">
|
||||
@can('read-common-companies')
|
||||
<x-form.group.select multiple remote name="companies" label="{{ trans_choice('general.companies', 2) }}" :options="$companies" remote_action="{{ route('companies.index') }}" form-group-class="sm:col-span-6" />
|
||||
@endcan
|
||||
|
||||
@role('admin|manager')
|
||||
<x-form.group.select name="roles" label="{{ trans_choice('general.roles', 1) }}" :options="$roles" />
|
||||
@endrole
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@role('admin|manager')
|
||||
<x-form.group.select name="roles" label="{{ trans_choice('general.roles', 1) }}" :options="$roles" />
|
||||
@endrole
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@endif
|
||||
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
@if (setting('default.use_gravatar', '0') == '1')
|
||||
<x-form.group.text name="fake_picture" label="{{ trans_choice('general.pictures', 1) }}" disabled placeholder="{{ trans('settings.default.use_gravatar') }}" form-group-class="sm:col-span-3 sm:row-span-2" />
|
||||
@else
|
||||
<x-form.group.file name="picture" label="{{ trans_choice('general.pictures', 1) }}" not-required form-group-class="sm:col-span-3 sm:row-span-2" />
|
||||
<x-form.group.file name="picture" :value="$user->picture" label="{{ trans_choice('general.pictures', 1) }}" not-required form-group-class="sm:col-span-3 sm:row-span-2" />
|
||||
@endif
|
||||
|
||||
@if (user()->id == $user->id)
|
||||
@ -38,21 +38,23 @@
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
<x-form.section.head title="{{ trans('general.assign') }}" description="{!! trans('auth.form_description.assign', ['url' => $roles_url]) !!}" />
|
||||
</x-slot>
|
||||
@if (user()->can('read-common-companies') || user()->hasRole(['admin', 'manager']))
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
<x-form.section.head title="{{ trans('general.assign') }}" description="{!! trans('auth.form_description.assign', ['url' => $roles_url]) !!}" />
|
||||
</x-slot>
|
||||
|
||||
<x-slot name="body">
|
||||
@can('read-common-companies')
|
||||
<x-form.group.select multiple remote name="companies" label="{{ trans_choice('general.companies', 2) }}" :options="$companies" selected-key="company_ids" :remote_action="route('companies.index')" form-group-class="sm:col-span-6" />
|
||||
@endcan
|
||||
<x-slot name="body">
|
||||
@can('read-common-companies')
|
||||
<x-form.group.select multiple remote name="companies" label="{{ trans_choice('general.companies', 2) }}" :options="$companies" selected-key="company_ids" :remote_action="route('companies.index')" form-group-class="sm:col-span-6" />
|
||||
@endcan
|
||||
|
||||
@role('admin|manager')
|
||||
<x-form.group.select name="roles" label="{{ trans_choice('general.roles', 1) }}" :options="$roles" selected-key="roles.id" />
|
||||
@endrole
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@role('admin|manager')
|
||||
<x-form.group.select name="roles" label="{{ trans_choice('general.roles', 1) }}" :options="$roles" selected-key="roles.id" />
|
||||
@endrole
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@endif
|
||||
|
||||
<x-form.section>
|
||||
<x-slot name="head">
|
||||
@ -69,15 +71,15 @@
|
||||
<x-form.group.switch name="enabled" label="{{ trans('general.enabled') }}" />
|
||||
|
||||
@canany(['update-auth-users', 'update-auth-profile'])
|
||||
<x-form.section>
|
||||
<x-slot name="foot">
|
||||
@if (user()->can('read-auth-users'))
|
||||
<x-form.buttons cancel-route="users.index" />
|
||||
@else
|
||||
<x-form.buttons cancel-route="dashboard" />
|
||||
@endif
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
<x-form.section>
|
||||
<x-slot name="foot">
|
||||
@if (user()->can('read-auth-users'))
|
||||
<x-form.buttons cancel-route="users.index" />
|
||||
@else
|
||||
<x-form.buttons cancel-route="dashboard" />
|
||||
@endif
|
||||
</x-slot>
|
||||
</x-form.section>
|
||||
@endcanany
|
||||
</x-form>
|
||||
</x-form.container>
|
||||
|
||||
@ -44,22 +44,24 @@
|
||||
@endif
|
||||
@endforeach
|
||||
|
||||
@if (! empty($suggestion))
|
||||
<li class="border-b p-2 hover:bg-gray-100">
|
||||
<x-link href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs" override="class">
|
||||
<div class="truncate">
|
||||
<h2>
|
||||
{{ $suggestion->name }}
|
||||
</h2>
|
||||
@if (! empty($suggestions))
|
||||
@foreach ($suggestions as $suggestion)
|
||||
<li class="border-b p-2 hover:bg-gray-100">
|
||||
<x-link href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs" override="class">
|
||||
<div class="truncate">
|
||||
<h2>
|
||||
{{ $suggestion->name }}
|
||||
</h2>
|
||||
|
||||
<div class="h-4 overflow-hidden text-black-400 truncate">
|
||||
{{ $suggestion->description ?? '' }}
|
||||
<div class="h-4 overflow-hidden text-black-400 truncate">
|
||||
{{ $suggestion->description ?? '' }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<span class="material-icons text-gray-500">chevron_right</span>
|
||||
</x-link>
|
||||
</li>
|
||||
<span class="material-icons text-gray-500">chevron_right</span>
|
||||
</x-link>
|
||||
</li>
|
||||
@endforeach
|
||||
@endif
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
@if (setting('default.use_gravatar', '0') == '1')
|
||||
<x-form.group.text name="fake_picture" label="{{ trans_choice('general.pictures', 1) }}" disabled placeholder="{{ trans('settings.default.use_gravatar') }}" form-group-class="sm:col-span-3 sm:row-span-3" />
|
||||
@else
|
||||
<x-form.group.file name="picture" label="{{ trans_choice('general.pictures', 1) }}" not-required form-group-class="sm:col-span-3 sm:row-span-3" />
|
||||
<x-form.group.file name="picture" label="{{ trans_choice('general.pictures', 1) }}" :value="$user->picture" not-required form-group-class="sm:col-span-3 sm:row-span-3" />
|
||||
@endif
|
||||
|
||||
<x-form.group.password name="current_password" :label="trans('auth.password.current')" v-show="show_password" />
|
||||
|
||||
Reference in New Issue
Block a user