Skip to content

Commit 0981061

Browse files
committed
Member list: Disable agent deletion
1 parent fd6d91b commit 0981061

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/Translations/ca/admin.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
'member-updated-ok' => 'El membre ":name" s\'ha actualitzat correctament',
189189
'member-deleted' => 'El membre ":name" s\'ha ELIMINAT',
190190
'member-delete-own-user-error' => 'No pots eliminar el teu propi compte d\'usuari',
191+
'member-delete-agent' => 'Per a poder eliminar aquest membre, elimina primer els seus rols d\'agent',
191192
'member-with-tickets-delete' => 'No pots eliminar un membre amb tiquets relacionats',
192193

193194
// $admin_route_path/priority/____

src/Translations/en/admin.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
'member-updated-ok' => 'Member ":name" has been updated correctly',
190190
'member-deleted' => 'Member ":name" has been DELETED',
191191
'member-delete-own-user-error' => 'You cannot delete your own user account',
192+
'member-delete-agent' => 'To enable this member deletion, delete it\'ts agent roles first',
192193
'member-with-tickets-delete' => 'You cannot delete a member with related tickets',
193194

194195
// $admin_route_path/priority/____

src/Views/admin/member/index.blade.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
@if ($member->panichd_admin == '1')
4747
<button type="button" disabled="disabled" class="btn btn-danger btn-xs">{{ trans('panichd::admin.admin') }}</button>
4848
@elseif ($member->panichd_agent == '1')
49-
<button type="button" disabled="disabled" class="btn btn-warning btn-xs">{{ trans('panichd::lang.agent') }}</button>
49+
<a href="{{ route($setting->grab('admin_route') . '.agent.index')}}" class="btn btn-warning btn-xs">{{ trans('panichd::lang.agent') }}</button>
5050
@else
5151
<button type="button" disabled="disabled" class="btn btn-default btn-xs">{{ trans('panichd::lang.user') }}</button>
5252
@endif
@@ -56,7 +56,13 @@
5656
<td>
5757
<button type="button" class="btn btn-default btn_member_modal" data-member_id="{{ $member->id }}" data-member_name="{{ $member->name }}" data-member_email="{{ $member->email }}" data-route="update" data-form_action="{{ route($setting->grab('admin_route').'.member.update', ['id' => $member->id ]) }}">{{ trans('panichd::admin.btn-edit') }}</button>
5858
@if ($member->panichd_admin != '1')
59-
@if ($member->user_tickets_count == 0 && $member->agent_total_tickets_count == 0)
59+
@if ($member->user_tickets_count != 0 || $member->agent_total_tickets_count != 0)
60+
<button type="button" class="btn btn-default" disabled="disabled" title="{{ trans('panichd::admin.member-with-tickets-delete') }}"><strike>{{ trans('panichd::admin.btn-delete') }}</strike></button>
61+
62+
@elseif($member->isAgent())
63+
<button type="button" class="btn btn-default" disabled="disabled" title="{{ trans('panichd::admin.member-delete-agent') }}"><strike>{{ trans('panichd::admin.btn-delete') }}</strike></button>
64+
65+
@else
6066
{!! link_to_route(
6167
$setting->grab('admin_route').'.member.destroy', trans('panichd::admin.btn-delete'), $member->id,
6268
[
@@ -76,10 +82,8 @@
7682
])
7783
!!}
7884
{!! CollectiveForm::close() !!}
79-
@else
80-
<button type="button" class="btn btn-default" disabled="disabled" title="{{ trans('panichd::admin.member-with-tickets-delete') }}"><strike>{{ trans('panichd::admin.btn-delete') }}</strike></button>
85+
8186
@endif
82-
8387
@endif
8488
</td>
8589
</tr>

0 commit comments

Comments
 (0)