Patch: Search by any text field looks in both plain text and existent html field

Author: xaviqv

src/Controllers/TicketsController.php

@@ -34,7 +34,7 @@ class TicketsController extends Controller
     protected $tickets;
 	protected $member;
 	protected $a_search_fields_numeric = ['creator_id', 'user_id', 'status_id', 'priority_id', 'category_id', 'agent_id'];
-	protected $a_search_fields_text = ['subject', 'html', 'intervention_html'];
+	protected $a_search_fields_text = ['subject', 'content', 'intervention'];
 	protected $a_search_fields_date = ['start_date', 'limit_date', 'created_at', 'completed_at', 'updated_at'];
 
     public function __construct(Ticket $tickets, \PanicHDMember $member)
@@ -95,7 +95,21 @@ public function data($ticketList = 'active')
 						}
 
 					}elseif(in_array($field, $this->a_search_fields_text)){
-						$collection->where($field, 'like', '%' . $value . '%');
+						if ($field == 'content'){
+							$collection->where(function($query) use($search_fields, $value){
+								$query->where('content', 'like', '%' . $value . '%')
+									->orWhere('html', 'like', '%' . $value . '%');
+							});
+						
+						}elseif ($field == 'intervention'){
+							$collection->where(function($query) use($search_fields, $value){
+								$query->where('intervention', 'like', '%' . $value . '%')
+									->orWhere('intervention_html', 'like', '%' . $value . '%');
+							});
+						
+						}else{
+							$collection->where($field, 'like', '%' . $value . '%');
+						}
 
 					}elseif(in_array($field, $this->a_search_fields_numeric)){
 						$collection->where($field, $value);
@@ -110,7 +124,8 @@ public function data($ticketList = 'active')
 
 				if (isset($search_fields['comments'])){
 					$collection->whereHas('comments', function($q1) use($search_fields){
-						$q1->where('content', 'like', '%' . $search_fields['comments'] . '%');
+						$q1->where('content', 'like', '%' . $search_fields['comments'] . '%')
+							->orWhere('html', 'like', '%' . $search_fields['comments'] . '%');
 					});
 				}
 
@@ -134,15 +149,18 @@ public function data($ticketList = 'active')
 				if (isset($search_fields['any_text_field'])){
 					$collection->where(function($query) use($search_fields){
 						$query->where('subject', 'like', '%' . $search_fields['any_text_field'] . '%')
+							->orWhere('content', 'like', '%' . $search_fields['any_text_field'] . '%')
 							->orWhere('html', 'like', '%' . $search_fields['any_text_field'] . '%')
+							->orWhere('intervention', 'like', '%' . $search_fields['any_text_field'] . '%')
 							->orWhere('intervention_html', 'like', '%' . $search_fields['any_text_field'] . '%')
 							->orWhereHas('attachments', function($q1) use($search_fields){
 								$q1->where('original_filename', 'like', '%' . $search_fields['any_text_field'] . '%')
 									->orWhere('new_filename', 'like', '%' . $search_fields['any_text_field'] . '%')
 									->orWhere('description', 'like', '%' . $search_fields['any_text_field'] . '%');
 							})
 							->orWhereHas('comments', function($q2) use($search_fields) {
-								$q2->where('html', 'like', '%' . $search_fields['any_text_field'] . '%')
+								$q2->where('content', 'like', '%' . $search_fields['any_text_field'] . '%')
+									->orWhere('html', 'like', '%' . $search_fields['any_text_field'] . '%')
 									->orWhereHas('attachments', function($q3) use($search_fields){
 									$q3->where('original_filename', 'like', '%' . $search_fields['any_text_field'] . '%')
 										->orWhere('new_filename', 'like', '%' . $search_fields['any_text_field'] . '%')

src/Views/tickets/search/form.blade.php

@@ -206,16 +206,16 @@
     </div><div class="col-md-6">
 
     <div class="form-group row"><!-- DESCRIPTION -->
-        <label for="html" class="col-lg-3 col-form-label"> *{{trans('panichd::lang.description')}}{{trans('panichd::lang.colon')}}</label>
+        <label for="content" class="col-lg-3 col-form-label"> *{{trans('panichd::lang.description')}}{{trans('panichd::lang.colon')}}</label>
         <div class="col-lg-9">
-            <textarea class="form-control" rows="2" name="html" cols="50"></textarea>
+            <textarea class="form-control" rows="2" name="content" cols="50"></textarea>
         </div>
     </div>
 
     <div class="form-group row"><!-- INTERVENTION -->
         <label for="intervention" class="col-lg-3 col-form-label">{{ trans('panichd::lang.intervention') . trans('panichd::lang.colon') }}</label>
         <div class="col-lg-9">
-            <textarea class="form-control" rows="2" name="intervention_html" cols="50"></textarea>
+            <textarea class="form-control" rows="2" name="intervention" cols="50"></textarea>
         </div>
     </div>