Replacement of Member userTickets() relation with ticketsAsOwner()

Author: xaviqv

src/Controllers/MembersController.php

@@ -15,7 +15,7 @@ class MembersController extends Controller
      */
     public function index(Request $request)
     {
-        $a_members = \PanicHDMember::withCount(['userTickets', 'ticketsAsAgent'])->orderBy('name')->get();
+        $a_members = \PanicHDMember::withCount(['ticketsAsOwner', 'ticketsAsAgent'])->orderBy('name')->get();
 
         return view('panichd::admin.member.index', compact('a_members'));
     }
@@ -93,7 +93,7 @@ public function destroy(Request $request, $id)
             return redirect()->back();
         }
 
-        if ($member->userTickets()->count() > 0 or $member->ticketsAsAgent()->count() > 0) {
+        if ($member->ticketsAsOwner()->count() > 0 or $member->ticketsAsAgent()->count() > 0) {
             \Session::flash('warning', trans('panichd::admin.member-with-tickets-delete'));
 
             return redirect()->back();

src/Models/Member.php

@@ -375,20 +375,6 @@ public function getEditTicketCategories()
         }
     }
 
-    /**
-     * Get related user tickets (To be deprecated).
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function userTickets($complete = false)
-    {
-        if ($complete) {
-            return $this->hasMany('PanicHD\PanicHD\Models\Ticket', 'user_id')->whereNotNull('completed_at');
-        } else {
-            return $this->hasMany('PanicHD\PanicHD\Models\Ticket', 'user_id')->whereNull('completed_at');
-        }
-    }
-
     /**
      * Get ALL member tickets.
      *
@@ -423,6 +409,14 @@ public function agentOpenTickets()
         return $this->hasMany('PanicHD\PanicHD\Models\Ticket', 'agent_id')->whereNull('completed_at');
     }
 
+    /**
+     * Get related tickets as owner
+     */
+    public function ticketsAsOwner()
+    {
+        return $this->hasMany('PanicHD\PanicHD\Models\Ticket', 'user_id');
+    }
+
     /**
      * Get related user Completed tickets.
      */

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_count }}</td>
+						<td>{{ $member->user_tickets_as_owner_count }}</td>
 						<td>{{ $member->agent_total_tickets_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_count != 0 || $member->agent_total_tickets_count != 0)
+								@if ($member->user_tickets_as_owner_count != 0 || $member->agent_total_tickets_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')