@@ -567,12 +567,12 @@ public function edit($id){
567567
568568 public function create_edit_data ($ ticket = false )
569569 {
570- $ user = $ this ->member ->find (auth ()->user ()->id );
570+ $ member = $ this ->member ->find (auth ()->user ()->id );
571571
572- if ($ user ->currentLevel () > 1 ){
572+ if ($ member ->currentLevel () > 1 ){
573573 $ a_owners = Member::with ('userDepartment ' )->orderBy ('name ' )->get ();
574574 }else {
575- $ a_owners = Member::whereNull ('ticketit_department ' )->orWhere ('id ' ,'= ' ,$ user ->id )->with ('userDepartment ' )->orderBy ('name ' )->get ();
575+ $ a_owners = Member::whereNull ('ticketit_department ' )->orWhere ('id ' ,'= ' ,$ member ->id )->with ('userDepartment ' )->orderBy ('name ' )->get ();
576576 }
577577
578578 $ priorities = $ this ->getCacheList ('priorities ' );
@@ -609,21 +609,24 @@ public function create_edit_data($ticket = false)
609609 $ a_current ['start_date ' ] = $ a_current ['limit_date ' ] = "" ;
610610
611611 // Default category
612- $ a_current ['cat_id ' ] = @$ user ->tickets ()->latest ()->first ()->category_id ;
613-
614- if ($ a_current ['cat_id ' ] == null ){
615- $ a_current ['cat_id ' ] = $ user ->getNewTicketCategories ()->keys ()->first ();
612+ if ($ member ->currentLevel () > 1 ){
613+ $ a_current ['cat_id ' ] = @$ member ->categories ()->get ()->first ()->id ;
614+ if ($ a_current ['cat_id ' ] == null ){
615+ $ a_current ['cat_id ' ] = $ member ->getNewTicketCategories ()->keys ()->first ();
616+ }
617+ }else {
618+ $ a_current ['cat_id ' ] = Category::orderBy ('name ' )->first ()->id ;
616619 }
617-
620+
618621 // Default agent
619- $ a_current ['agent_id ' ] = $ user ->id ;
622+ $ a_current ['agent_id ' ] = $ member ->id ;
620623 }
621624
622625 // Agent list
623626 $ agent_lists = $ this ->agentList ($ a_current ['cat_id ' ]);
624627
625628 // Permission level for category
626- $ permission_level = $ user ->levelInCategory ($ a_current ['cat_id ' ]);
629+ $ permission_level = $ member ->levelInCategory ($ a_current ['cat_id ' ]);
627630
628631 // Current default status
629632 if (!$ ticket ){
0 commit comments