Delete of member->tickets() and replacement of entries with ->ticketsAsOwner()

Author: xaviqv

src/Models/Member.php

@@ -375,16 +375,6 @@ public function getEditTicketCategories()
         }
     }
 
-    /**
-     * Get ALL member tickets.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function tickets($complete = false)
-    {
-        return $this->hasMany('PanicHD\PanicHD\Models\Ticket', 'user_id');
-    }
-
     /**
      * Get related tickets as agent
      */
@@ -410,7 +400,7 @@ public function agentOpenTickets()
     }
 
     /**
-     * Get related tickets as owner
+     * Get related owner tickets.
      */
     public function ticketsAsOwner()
     {

src/Views/admin/index.blade.php

@@ -231,7 +231,7 @@
                         </li>
                         @foreach($users as $user)
                             <li class="list-group-item d-flex">
-                                <?php $user_text = $user->name . ' <span class="badge">' . $user->tickets()->count() . '</span>'; ?>
+                                <?php $user_text = $user->name . ' <span class="badge">' . $user->ticketsAsOwner()->count() . '</span>'; ?>
                               <span class="mr-auto">
                                 @if ($setting->grab('user_route') != 'disabled')
                 									<a href="{{ route($setting->grab('user_route'), ['user' => $user->id]) }}">{!! $user_text !!}</a>
@@ -243,29 +243,29 @@
                                 <span class="small">
                                     <?php
 										$a_button = [
-											'newest' => $user->tickets()->newest()->count() . ' ' . trans('panichd::lang.newest-tickets-adjective'),
-											'active' => $user->tickets()->active()->count() . ' ' . trans('panichd::lang.active-tickets-adjective'),
-											'complete' => $user->tickets()->complete()->count() . ' ' . trans('panichd::lang.complete-tickets-adjective')
+											'newest' => $user->ticketsAsOwner()->newest()->count() . ' ' . trans('panichd::lang.newest-tickets-adjective'),
+											'active' => $user->ticketsAsOwner()->active()->count() . ' ' . trans('panichd::lang.active-tickets-adjective'),
+											'complete' => $user->ticketsAsOwner()->complete()->count() . ' ' . trans('panichd::lang.complete-tickets-adjective')
 										];
 									?>
 
-									@if ($user->tickets()->newest()->count() == 0)
+									@if ($user->ticketsAsOwner()->newest()->count() == 0)
 										{{ $a_button['newest'] }}
 									@else
 										<a href="{{ route($setting->grab('main_route') . '-filteronly', ['filter' => 'owner', 'value' => $user->id, 'list' => 'newest']) }}" class="btn btn-light btn-xs" title="{{ trans('panichd::admin.index-view-user-tickets', ['list' =>trans('panichd::lang.newest-tickets-adjective')]) }}">
 										{{ $a_button['newest'] }}
 										</a>
 									@endif
 									 -
-									@if ($user->tickets()->active()->count() == 0)
+									@if ($user->ticketsAsOwner()->active()->count() == 0)
 										{{ $a_button['active'] }}
 									@else
 										<a href="{{ route($setting->grab('main_route') . '-filteronly', ['filter' => 'owner', 'value' => $user->id, 'list' => 'active']) }}" class="btn btn-light btn-xs" title="{{ trans('panichd::admin.index-view-user-tickets', ['list' =>trans('panichd::lang.active-tickets-adjective')]) }}">
 										{{ $a_button['active'] }}
 										</a>
 									@endif
 									 -
-									@if ($user->tickets()->complete()->count() == 0)
+									@if ($user->ticketsAsOwner()->complete()->count() == 0)
 										{{ $a_button['complete'] }}
 									@else
 										<a href="{{ route($setting->grab('main_route') . '-filteronly', ['filter' => 'owner', 'value' => $user->id, 'list' => 'complete']) }}" class="btn btn-light btn-xs" title="{{ trans('panichd::admin.index-view-user-tickets', ['list' =>trans('panichd::lang.complete-tickets-adjective')]) }}">

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

@@ -50,12 +50,12 @@
 							<button type="button" disabled="disabled" class="btn btn-light btn-default btn-xs">{{ trans('panichd::lang.user') }}</button>
 						@endif
 						</td>
-						<td>{{ $member->user_tickets_as_owner_count }}</td>
-						<td>{{ $member->agent_total_tickets_count }}</td>
+						<td>{{ $member->tickets_as_owner_count }}</td>
+						<td>{{ $member->tickets_as_agent_count }}</td>
 						<td>
                             <button type="button" class="btn btn-light 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>
 							@if ($member->panichd_admin != '1')
-								@if ($member->user_tickets_as_owner_count != 0 || $member->agent_total_tickets_count != 0)
+								@if ($member->tickets_as_owner_count != 0 || $member->tickets_as_agent_count != 0)
 									<button type="button" class="btn btn-light btn-default"  disabled="disabled" title="{{ trans('panichd::admin.member-with-tickets-delete') }}"><strike>{{ trans('panichd::admin.btn-delete') }}</strike></button>
 
 								@elseif($member->panichd_agent == '1')

tests/PanicHDTestCase.php

@@ -72,12 +72,12 @@ public function load_vars()
         if (is_null($this->member)) {
             // TODO: Generate fake user
             if (\PanicHDMember::users()->count() > 0) {
-                $this->member = \PanicHDMember::whereHas('tickets', function ($query) {
+                $this->member = \PanicHDMember::whereHas('ticketsAsOwner', function ($query) {
                     $query->notHidden();
                 })->inRandomOrder()->users()->first();
                 if (!is_null($this->member)) {
                     // TODO: Generate fake tickets
-                    $this->member_tickets_builder = $this->member->tickets()->inRandomOrder();
+                    $this->member_tickets_builder = $this->member->ticketsAsOwner()->inRandomOrder();
                 }
             }
         }