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

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-09-23 14:25:40 +03:00
parent f62374b0d4 520d0e6290
commit 8f9ed000a2
54 changed files with 1364 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/auth/users/edit.blade.php
View File

@@ -49,7 +49,7 @@
@endif
@permission('read-common-companies')
{{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }}
{{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required', 'disabled' => (in_array('customer', $user->roles()->pluck('name')->toArray())) ? 'true' : 'false', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }}
@endpermission
@permission('read-auth-roles')

10
resources/views/partials/form/bulk_action_row_group.blade.php
View File

@@ -48,6 +48,16 @@
@if(!empty($action['message']))
data-message="{{ trans_choice($action['message'], 2, ['type' => $text]) }}"
@endif
@if(isset($action['path']) && !empty($action['path']))
data-path="{{ route('bulk-actions.action', $action['path']) }}"
@else
data-path=""
@endif
@if(isset($action['type']) && !empty($action['type']))
data-type="{{ $action['type'] }}"
@else
data-type=""
@endif
>{{ trans($action['name']) }}</option>
@endif
@endforeach

3
resources/views/partials/form/select_remote_group.blade.php
View File

@@ -55,7 +55,10 @@
remote-action="{{ $attributes['remote_action'] }}"
remote-type="'{{ $attributes['remote_type'] }}"
@if (!empty($attributes['currecny_code']))
currency-code="{{ $attributes['currecny_code'] }}"
@endif
loading-text="{{ trans('general.loading') }}"
no-data-text="{{ trans('general.no_data') }}"