= 2 gadi atpakaļ
vecāks
revīzija
8923bdc452

+ 8 - 6
app/Http/Controllers/PracticeManagementController.php

@@ -1033,12 +1033,7 @@ OFFSET {$offset} LIMIT {$perPage}
             $bills = $bills->where('code', '=', $filter);
         }
 
-        $filter = $request->input('clientName');
-        if ($filter) {
-            $bills = $bills->whereHas('client', function($q) use ($filter){
-                return $q->where('name_first', 'ilike', $filter)->orWhere('name_last', 'ilike', $filter);
-            });
-        }
+       
 
         $bills = $bills->orderBy('effective_date', 'desc')->paginate();
 
@@ -1156,6 +1151,13 @@ WHERE claim_line.cpt = '99458' AND
             }
         }
 
+        $filter = $request->input('clientName');
+        if ($filter) {
+            $bills = $bills->whereHas('client', function($q) use ($filter){
+                return $q->where('name_first', 'ilike', $filter)->orWhere('name_last', 'ilike', $filter);
+            });
+        }
+
         $bills = $bills->orderBy('id', 'desc')->paginate();
 
         $companies = Company::where('is_active', true)->orderBy('name')->get();

+ 1 - 1
resources/views/app/practice-management/processing-bill-matrix2.blade.php

@@ -18,7 +18,7 @@
                         <option value="" {{!@$targetPro ? 'selected' : ''}}>All Pros</option>
                     </select>
                 </div>
-                <div class="max-width-110px">
+                <div class="ml-2">
                     <label class="text-sm text-secondary mb-1">Client</label>
                     <input  type="text" class="form-control form-control-sm" name="clientName"value="{{request()->input('clientName')}}" onchange="return billsFilter('clientName', this.value)">
                 </div>