restored treatment practices

app/Http/Controllers/PracticeManagementController.php

@@ -511,7 +511,7 @@ class PracticeManagementController extends Controller
 
         $filters = [];
         $filters['bills_created'] = $request->input('bills_created');
-        $filters['bills_ready_to_verify'] = $request->input('bills_ready_to_verify');
+        $filters['is_billing_marked_done'] = $request->input('is_billing_marked_done');
         $filters['bills_resolved'] = $request->input('bills_resolved');
         $filters['bills_closed'] = $request->input('bills_closed');
         $filters['claims_created'] = $request->input('claims_created');
@@ -524,20 +524,20 @@ class PracticeManagementController extends Controller
                 0);
         }
 
-        if($filters['bills_ready_to_verify']) {
+        if($filters['is_billing_marked_done']) {
             $notes->where(
-                'is_bill_ready_to_verify',
-                ($filters['bills_ready_to_verify'] === 'yes' ? '=' : '!='),
+                'is_billing_marked_done',
+                ($filters['is_billing_marked_done'] === 'yes' ? '=' : '!='),
                 true);
         }
 
         if($filters['bills_resolved']) {
             $notes->whereRaw('(SELECT count(id) FROM bill WHERE note_id = note.id) > 0'); // have bills
-            if($filters['bills_resolved'] === 'no') {
-                $notes->whereRaw('(SELECT count(id) FROM bill WHERE note_id = note.id AND is_cancelled = false AND is_verified = false) > 0');
+            if($filters['bills_resolved'] === 'yes') {
+                $notes->whereRaw('(SELECT count(id) FROM bill WHERE note_id = note.id AND (is_cancelled = false  AND is_verified = false) OR (is_cancelled = TRUE AND is_cancellation_acknowledged = FALSE)) > 0');
             }
-            elseif($filters['bills_resolved'] === 'yes') {
-                $notes->whereRaw('(SELECT count(id) FROM bill WHERE note_id = note.id AND (is_cancelled = true OR is_verified = false)) = 0');
+            elseif($filters['bills_resolved'] === 'no') {
+                $notes->whereRaw('(SELECT count(id) FROM bill WHERE note_id = note.id AND ((is_cancelled = true AND is_cancellation_acknowledged = true) OR is_verified = true)) = 0');
             }
         }
 
@@ -804,7 +804,7 @@ class PracticeManagementController extends Controller
                 ->count()
         ];
     }
-    
+
     public function shipment(Request $request, Shipment $shipment) {
         return view('app.practice-management.shipment', compact('shipment'));
     }

resources/views/app/practice-management/billing-manager.blade.php

@@ -30,12 +30,12 @@
                     </select>
                 </div>
                 <div class="d-inline-flex align-items-center ml-3">
-                    <span>Bills Ready to Verify</span>
-                    <select class="form-control form-control-sm min-width-unset width-70px ml-2 {{ !!$filters['bills_ready_to_verify'] ? 'border-info font-weight-bold text-info' : 'text-secondary on-hover-opaque' }}"
-                            data-filter="bills_ready_to_verify">
+                    <span>Billing Marked As Done</span>
+                    <select class="form-control form-control-sm min-width-unset width-70px ml-2 {{ !!$filters['is_billing_marked_done'] ? 'border-info font-weight-bold text-info' : 'text-secondary on-hover-opaque' }}"
+                            data-filter="is_billing_marked_done">
                         <option value="">All</option>
-                        <option value="yes" {{$filters['bills_ready_to_verify'] === 'yes' ? 'selected' : ''}}>Yes</option>
-                        <option value="no" {{$filters['bills_ready_to_verify'] === 'no' ? 'selected' : ''}}>No</option>
+                        <option value="yes" {{$filters['is_billing_marked_done'] === 'yes' ? 'selected' : ''}}>Yes</option>
+                        <option value="no" {{$filters['is_billing_marked_done'] === 'no' ? 'selected' : ''}}>No</option>
                     </select>
                 </div>
                 <div class="d-inline-flex align-items-center ml-3">

resources/views/layouts/template.blade.php

@@ -122,6 +122,7 @@
                             <a class="dropdown-item" href="{{ route('practice-management.cellularDeviceManager') }}">Cellular Device Manager</a>
                             <a class="dropdown-item" href="{{ route('practice-management.claims') }}">Claims</a>
                             <a class="dropdown-item" href="{{ route('practice-management.hcpBillMatrix') }}">HCP Bill Matrix</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.treatmentServiceUtil') }}">Treatment Service Util.</a>
                             <a class="dropdown-item" href="{{ route('practice-management.tickets') }}">Tickets</a>
                             <a class="dropdown-item" href="{{ route('practice-management.supply-orders') }}">Supply Orders</a>
                             <a class="dropdown-item" href="{{ route('practice-management.shipments') }}">Shipments</a>