@@ -555,7 +555,7 @@ public function getUpdatedAbbr()
555555 *
556556 * @return mixed
557557 */
558- public function scopeUserTickets ($ query , $ id )
558+ public function scopeFromOwner ($ query , $ id )
559559 {
560560 return $ query ->where ('user_id ' , $ id );
561561 }
@@ -589,7 +589,7 @@ public function scopeVisible($query)
589589 } elseif (auth ()->user ()->panichd_agent ) {
590590 return $ query ->visibleForAgent (auth ()->user ()->id );
591591 } else {
592- return $ query ->userTickets (auth ()->user ()->id )->notHidden ();
592+ return $ query ->fromOwner (auth ()->user ()->id )->notHidden ();
593593 }
594594 }
595595
@@ -623,7 +623,7 @@ public function scopeVisibleForAgent($query, $id = false)
623623 }
624624 } else {
625625 // Agent with currentLevel() == 1
626- return $ query ->userTickets ($ id )->notHidden ()
626+ return $ query ->fromOwner ($ id )->notHidden ()
627627 ->whereDoesntHave ('category ' , function ($ q1 ) use ($ id ) {
628628 $ q1 ->whereHas ('agents ' , function ($ q2 ) use ($ id ) {
629629 $ q2 ->where ('id ' , $ id );
@@ -646,7 +646,7 @@ public function scopeFiltered($query, $ticketList, $filter = false)
646646
647647 if ($ member ->currentLevel () == 1 ) {
648648 // If session()->has('panichd_filter_currentLevel')
649- return $ query ->userTickets (auth ()->user ()->id )->notHidden ();
649+ return $ query ->fromOwner (auth ()->user ()->id )->notHidden ();
650650 } else {
651651 if (session ()->has ('panichd_filters ' )) {
652652 if ($ ticketList != 'complete ' ) {
@@ -716,9 +716,9 @@ public function scopeFiltered($query, $ticketList, $filter = false)
716716 // Owner filter
717717 if ((!$ filter or $ filter == 'owner ' ) and session ()->has ('panichd_filter_owner ' )) {
718718 if (session ('panichd_filter_owner ' ) == 'me ' ) {
719- $ query = $ query ->userTickets (auth ()->user ()->id );
719+ $ query = $ query ->fromOwner (auth ()->user ()->id );
720720 } else {
721- $ query = $ query ->userTickets (session ('panichd_filter_owner ' ));
721+ $ query = $ query ->fromOwner (session ('panichd_filter_owner ' ));
722722 }
723723 }
724724 }
0 commit comments