Ticket list - agent modal: Checkbox to allow choosing to change ticket status or not

Author: xaviqv

src/Controllers/TicketsController.php

@@ -161,7 +161,7 @@ public function data($ticketList = 'active')
 
 		\Carbon\Carbon::setLocale(config('app.locale'));
 
-        $this->renderTicketTable($collection);
+        $this->renderTicketTable($collection, $ticketList);
 
         // method rawColumns was introduced in laravel-datatables 7, which is only compatible with >L5.4
         // in previous laravel-datatables versions escaping columns wasn't defaut
@@ -178,7 +178,7 @@ public function data($ticketList = 'active')
         return $collection->make(true);
     }
 
-    public function renderTicketTable($collection)
+    public function renderTicketTable($collection, $ticketList)
     {
 
 		// Column edits
@@ -280,14 +280,19 @@ public function renderTicketTable($collection)
 			])
 			->get()->toArray();
 
+    $active_status_name = Setting::grab('default_reopen_status_id') == '0' ? Models\Status::first()->name : Models\Status::find(Setting::grab('default_reopen_status_id'))->name;
+
 		$a_cat = [];
 		foreach ($a_cat_pre as $cat){
 			$a_cat[$cat['id']] = $cat;
 			$html = '<div>';
 			foreach ($cat['agents'] as $agent){
 				$html.='<label><input type="radio" name="%1$s_agent" value="'.$agent['id'].'"> '.$agent['name'].'</label><br />';
 			}
-			$html.='<br /><button type="button" class="btn btn-default btn-sm submit_agent_popover" data-ticket-id="%1$s">'.trans('panichd::lang.btn-change').'</button></div>';
+      if ($ticketList == 'newest' and Setting::grab('use_default_status_id')){
+        $html.= '<br /><label><input type="checkbox" name="%1$s_status_checkbox"> ' . trans('panichd::lang.table-agent-status-check', ['status' => $active_status_name]) . '</label>';
+      }
+      $html.='<br /><button type="button" class="btn btn-default btn-sm submit_agent_popover" data-ticket-id="%1$s">'.trans('panichd::lang.btn-change').'</button></div>';
 			$a_cat[$cat['id']]['html']=$html;
 		}
 
@@ -532,7 +537,7 @@ public function ticketCounts($request, $ticketList)
 			}
 		}
 
-        if ($this->member->isAdmin() or ($this->member->isAgent() and Setting::grab('agent_restrict') == 0)) {
+        if ($this->member->isAdmin() or ($this->member->isAgent() and Models\Setting::grab('agent_restrict') == 0)) {
 
 			// Visible categories
             $filters['category'] = Category::visible()->orderBy('name')->get();
@@ -1570,25 +1575,29 @@ public function agentList ($category_id)
 	/*
 	 * Change agent in ticket list
 	*/
-	public function changeAgent(Request $request){
+	public function changeAgent(Request $request)
+  {
 		$original_ticket = Ticket::findOrFail($request->input('ticket_id'));
 		$ticket = clone $original_ticket;
 		$old_agent = $ticket->agent()->first();
-		$new_agent = \PanicHDMember::find($request->input('agent_id'));
+    if ($request->has('agent_id')){
+      $new_agent = \PanicHDMember::find($request->input('agent_id'));
+    }else
+      $new_agent = clone $old_agent;
 
-		if (is_null($new_agent) || $ticket->agent_id==$request->input('agent_id')){
+		if (!$request->has('status_checkbox') and (is_null($new_agent) || $ticket->agent_id == $request->input('agent_id'))){
 			return redirect()->back()->with('warning', trans('panichd::lang.update-agent-same', [
 				'name' => '#'.$ticket->id.' '.$ticket->subject,
 				'link' => route(Setting::grab('main_route').'.show', $ticket->id),
 				'title' => trans('panichd::lang.ticket-status-link-title')
 			]));
 		}
 
-		$ticket->agent_id = $request->input('agent_id');
+		$ticket->agent_id =  $new_agent->id;
 
 		$old_status_id = $ticket->status_id;
-		if ($ticket->status_id==Setting::grab('default_status_id')){
-			$ticket->status_id=Setting::grab('default_reopen_status_id');
+		if ($request->has('status_checkbox') || !Setting::grab('use_default_status_id')){
+			$ticket->status_id = Setting::grab('default_reopen_status_id');
 		}
 		$ticket->save();
 		event(new TicketUpdated($original_ticket, $ticket));

src/Translations/ca/lang.php

@@ -57,6 +57,7 @@
   // Agent related
   'table-change-agent'               => 'Canviar tècnic',
   'table-one-agent'                  => 'Només hi ha un tècnic en aquesta categoria',
+  'table-agent-status-check'         => 'Canviar estat a ":status"',
 
   // Priority related
   'table-change-priority'            => 'Canviar la prioritat',

src/Translations/en/lang.php

@@ -57,6 +57,7 @@
   // Agent related
   'table-change-agent'               => 'Change agent',
   'table-one-agent'                  => 'There is one agent in this category',
+  'table-agent-status-check'         => 'Change status to ":status"',
 
   // Priority related
   'table-change-priority'            => 'Change priority',

src/Views/tickets/datatable/events.blade.php

@@ -79,25 +79,25 @@
 
 		// Agent change: Modal for > 4 agents
 		$('.jquery_agent_change_modal').click(function(e){
-			e.preventDefault();				
-			
+			e.preventDefault();
+
 			// Row hover
-			$(this).closest('tr').addClass('hover');				
-			
+			$(this).closest('tr').addClass('hover');
+
 			// Form fields
 			$('#modalAgentChange #agent_ticket_id_field').val($(this).attr('data-ticket-id'));
-			
+
 			// Modal itself
 			$('#modalAgentChange').modal('show');
 			$('#modalAgentChange .categories_agent_change').hide();
 			$('#modalAgentChange #category_'+$(this).attr('data-category-id')+'_agents').show()
 				.find(":radio[value="+$(this).attr('data-agent-id')+"]").prop('checked',true);
 		});
-		
+
 		$('#modalAgentChange').on('hidden.bs.modal', function () {
 			$(document).find('tr').removeClass('hover');
 		});
-		
+
 		// Agent / Priority change: Popover menu
 		$(".jquery_popover")
 			.popover({
@@ -106,32 +106,35 @@
 		.click(function(e){
 			e.preventDefault();
 		});
-		
+
 		// Agent change: Popover menu submit
 		$(document).on('click','.submit_agent_popover',function(e){
 			e.preventDefault();
-							
+
 			// Form fields
 			$('#modalAgentChange #agent_ticket_id_field').val($(this).attr('data-ticket-id'));
 			$('#modalAgentChange').find(":radio[value="+$(this).parent('div').find('input[name='+$(this).attr('data-ticket-id')+'_agent]:checked').val()+"]").prop('checked',true);
-		
+
+			if ($(this).parent('div').find('input[name=' + $(this).attr('data-ticket-id') + '_status_checkbox]').is(':checked')){
+				$('#modalAgentChange').find('input[name=status_checkbox]').prop('checked', true);
+			}
+
 			// Form submit
 			$('#modalAgentChange').find('form').submit();
-			
 		});
-		
+
 		// Agent change: Popover menu submit
 		$(document).on('click','.submit_priority_popover',function(e){
 			e.preventDefault();
-							
+
 			// Form fields
 			$('#PriorityPopoverForm #priority_ticket_id_field').val($(this).attr('data-ticket-id'));
 			var priority_val = $(this).parent('div').find('input[name='+$(this).attr('data-ticket-id')+'_priority]:checked').val();
 			$('#PriorityPopoverForm #priority_id_field').val(priority_val);
-		
+
 			// Form submit
 			$('#PriorityPopoverForm').find('form').submit();
-			
+
 		});
 
 		// Agent change: Tooltip for 1 agents
@@ -140,4 +143,4 @@
 
 	@yield('footer_jquery')
 });
-</script>
+</script>

src/Views/tickets/partials/modal_agent.blade.php

@@ -21,8 +21,11 @@
 			</ul>
 			</div>
 		@endforeach
-		 
-		</div>
+
+    @if ($setting->grab('use_default_status_id'))
+     <label><input type="checkbox" name="status_checkbox" value="yes">{{ trans('panichd::lang.table-agent-status-check') }}</label>
+     @endif
+    </div>
 		<div class="modal-footer">
 		<button type="submit" class="btn btn-danger">{{ trans('panichd::lang.btn-change') }}</button>
 		</div>