Updated bills filtrts

app/Http/Controllers/DnaController.php

@@ -126,7 +126,7 @@ class DnaController extends Controller
         $bills = Bill::where(function($q) use ($performerProID){
             return $q->where('na_pro_id', '=', $performerProID )->orWhere('generic_pro_id', '=', $performerProID);
         });
-        $this->filterMultiQuery($request, $bills, 'created_at', 'date_category', 'date_value_1', 'date_value_2');
+        $this->filterMultiQuery($request, $bills, 'effective_date', 'date_category', 'date_value_1', 'date_value_2');
         $this->filterMultiQuery($request, $bills, 'na_expected_payment_amount', 'amount_category', 'amount_value_1', 'amount_value_2');
         
         $status = $request->get('status');
@@ -144,7 +144,7 @@ class DnaController extends Controller
     public function myClinicalTeams(Request $request){
         $filters = $request->all();
         $teams = ProTeam::where('assistant_pro_id', $this->performer->pro->id);        
-        $teams = $teams->orderBy('created_at', 'DESC')->paginate(20);
+        $teams = $teams->orderBy('effective_date', 'DESC')->paginate(20);
         return view('app.dna.my-clinical-teams', compact('teams', 'filters'));
     }
 

resources/views/app/dna/my-bills.blade.php

@@ -7,14 +7,12 @@
         <div class="card-header px-3 py-2 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-calendar-alt"></i>
-                My Bills 
-
-                <div class=" d-flex align-items-center">
-                    <?php $entityType = null; ?>
-                    @include('app.generic-bills.create_generic-bill')
-                </div>
-
+                My Bills
             </strong>
+            <div class=" d-flex align-items-center">
+                <?php $entityType = null; ?>
+                @include('app.generic-bills.create_generic-bill')
+            </div>
         </div>
 
         <div class="card-body p-0">
@@ -24,7 +22,7 @@
             <table class="table table-sm table-striped p-0 m-0">
                 <thead class="bg-light border-top">
                     <tr>
-                        <th class="border-0">Date</th>
+                        <th class="border-0">Effective Date</th>
                         <th class="border-0">Patient</th>
                         <th class="border-0">Service</th>
                         <th class="border-0">Description</th>
@@ -37,7 +35,7 @@
                 <tbody>
                     @foreach($bills as $bill)
                     <tr>
-                        <td>{{ friendly_date($bill->created_at) }}</td>
+                        <td>{{ friendly_date($bill->effective_date) }}</td>
                        
                         <td>
                             @if($bill->client)

resources/views/app/dna/my_bills_filters.blade.php

@@ -54,10 +54,10 @@
 			</select>
 			<div v-show="filters.amount_category" class="mt-2">
 				<div>
-					<input  name="amount_value_1" v-model="filters.amount_value_1" type="date" class="form-control input-sm"/>
+					<input  name="amount_value_1" v-model="filters.amount_value_1" type="number" class="form-control input-sm"/>
 				</div>
 				<div v-show="filters.amount_category === 'BETWEEN' || filters.amount_category === 'NOT_BETWEEN'" class="mt-2">
-					<input name="amount_value_2" v-model="filters.amount_value_2" type="date" class="form-control input-sm"/>
+					<input name="amount_value_2" v-model="filters.amount_value_2" type="number" class="form-control input-sm"/>
 				</div>
 			</div>
 		</div>