Skip to content

Commit 1b9a6a4

Browse files
committed
Delete of agentTickets() Member relation and replacement with other eloquent methods
1 parent 57fa7cc commit 1b9a6a4

2 files changed

Lines changed: 7 additions & 20 deletions

File tree

src/Models/Member.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -375,18 +375,6 @@ public function getEditTicketCategories()
375375
}
376376
}
377377

378-
/**
379-
* Get related agent tickets (To be deprecated).
380-
*/
381-
public function agentTickets($complete = false)
382-
{
383-
if ($complete) {
384-
return $this->hasMany('PanicHD\PanicHD\Models\Ticket', 'agent_id')->whereNotNull('completed_at');
385-
} else {
386-
return $this->hasMany('PanicHD\PanicHD\Models\Ticket', 'agent_id')->whereNull('completed_at');
387-
}
388-
}
389-
390378
/**
391379
* Get related user tickets (To be deprecated).
392380
*

src/Views/admin/index.blade.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@
175175
</li>
176176
@foreach($agents as $agent)
177177
<li class="list-group-item d-flex">
178-
<?php $agent_text = $agent->name . ' <span class="badge">' . ($agent->agentTickets(false)->count() +
179-
$agent->agentTickets(true)->count()) . '</span>'; ?>
178+
<?php $agent_text = $agent->name . ' <span class="badge">' . $agent->ticketsAsAgent()->count() . '</span>'; ?>
180179
<span class="mr-auto">
181180
@if ($setting->grab('user_route') != 'disabled')
182181
<a href="{{ route($setting->grab('user_route'), ['user' => $agent->id]) }}">{!! $agent_text !!}</a>
@@ -187,29 +186,29 @@
187186
<span class="small">
188187
<?php
189188
$a_button = [
190-
'newest' => $agent->agentTickets(false)->newest()->count() . ' ' . trans('panichd::lang.newest-tickets-adjective'),
191-
'active' => $agent->agentTickets(false)->active()->count() . ' ' . trans('panichd::lang.active-tickets-adjective'),
192-
'complete' => $agent->agentTickets(true)->count() . ' ' . trans('panichd::lang.complete-tickets-adjective')
189+
'newest' => $agent->ticketsAsAgent()->newest()->count() . ' ' . trans('panichd::lang.newest-tickets-adjective'),
190+
'active' => $agent->ticketsAsAgent()->active()->count() . ' ' . trans('panichd::lang.active-tickets-adjective'),
191+
'complete' => $agent->ticketsAsAgent()->complete()->count() . ' ' . trans('panichd::lang.complete-tickets-adjective')
193192
];
194193
?>
195194

196-
@if ($agent->agentTickets(false)->newest()->count() == 0)
195+
@if ($agent->ticketsAsAgent()->newest()->count() == 0)
197196
{{ $a_button['newest'] }}
198197
@else
199198
<a href="{{ route($setting->grab('main_route') . '-filteronly', ['filter' => 'agent', 'value' => $agent->id, 'list' => 'newest']) }}" class="btn btn-light btn-xs" title="{{ trans('panichd::admin.index-view-agent-tickets', ['list' =>trans('panichd::lang.newest-tickets-adjective')]) }}">
200199
{{ $a_button['newest'] }}
201200
</a>
202201
@endif
203202
-
204-
@if ($agent->agentTickets(false)->active()->count() == 0)
203+
@if ($agent->ticketsAsAgent()->active()->count() == 0)
205204
{{ $a_button['active'] }}
206205
@else
207206
<a href="{{ route($setting->grab('main_route') . '-filteronly', ['filter' => 'agent', 'value' => $agent->id, 'list' => 'active']) }}" class="btn btn-light btn-xs" title="{{ trans('panichd::admin.index-view-agent-tickets', ['list' =>trans('panichd::lang.active-tickets-adjective')]) }}">
208207
{{ $a_button['active'] }}
209208
</a>
210209
@endif
211210
-
212-
@if ($agent->agentTickets(true)->count() == 0)
211+
@if ($agent->ticketsAsAgent()->complete()->count() == 0)
213212
{{ $a_button['complete'] }}
214213
@else
215214
<a href="{{ route($setting->grab('main_route') . '-filteronly', ['filter' => 'agent', 'value' => $agent->id, 'list' => 'complete']) }}" class="btn btn-light btn-xs" title="{{ trans('panichd::admin.index-view-agent-tickets', ['list' =>trans('panichd::lang.complete-tickets-adjective')]) }}">

0 commit comments

Comments
 (0)