Merge branch 'dev' into dev-vj

app/Http/Controllers/AdminController.php

@@ -106,6 +106,15 @@ class AdminController extends Controller
             });
         }
 
+        $insurance = $request->get('insurance');
+        if($insurance){
+            if($insurance === 'MEDICARE'){
+                $patients = $patients->where('is_part_b_primary', 'YES');
+            }else{
+                $patients = $patients->where('is_part_b_primary', '!=', 'YES');
+            }
+        }
+
         $patients = $patients->orderBy('created_at', 'DESC')->paginate(25);
         return view('app.admin.patients', compact('patients', 'filters'));
     }

resources/views/app/admin/patients_filters.blade.php

@@ -150,6 +150,16 @@
 			<input type="text" name="initiative" class="form-control input-sm" v-model="filters.initiative">
 		</div>
 	</div>
+	<div class="sm-section">
+		<div class="">
+			<label>Insurance:</label>
+			<select class="form-control"  name="insurance" v-model="filters.insurance">
+				<option value=""></option>
+				<option value="MEDICARE">Medicare (Part B)</option>
+				<option value="OTHER">Other</option>
+			</select>
+		</div>
+	</div>
 	@endif
 
 	@if($performer->pro->pro_type == 'ADMIN')
@@ -245,6 +255,7 @@ $allFilterKeys = [
 	'sex',
 	'status',
 	'initiative',
+	'insurance',
 	'include_test_records',
 ];
 for ($i=0; $i < count($allFilterKeys); $i++) {

resources/views/app/generic-bills/inline.blade.php

@@ -17,14 +17,16 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
 @if(!count($genericBills))
     <div class="{{@$class ? $class : ''}} d-flex align-items-center">
         <p class="font-weight-bold mb-0">No {{@$label ? $label : 'Admin.'}} Bills</p>
-        <span class="mx-2 text-secondary">|</span>
-        @include('app.generic-bills.create_generic-bill')
+        @if($pro->is_arbitrary_generic_bill_enabled)
+            <span class="mx-2 text-secondary">|</span>
+            @include('app.generic-bills.create_generic-bill')
+        @endif
     </div>
 @else
     <div class="{{@$class ? $class : ''}}">
         <div class="d-flex align-items-center mb-2">
             <p class="font-weight-bold m-0">{{@$label ? $label : 'Admin.'}} Bills</p>
-            @if(!@$noCreate)
+            @if(!@$noCreate && $pro->is_arbitrary_generic_bill_enabled)
                 <span class="mx-2 text-secondary">|</span>
                 @include('app.generic-bills.create_generic-bill')
             @endif

resources/views/app/new-patient.blade.php

@@ -9,6 +9,10 @@ $medicaidStates = Config::get('constants.medicaid_states');
 <style media="screen">
 	.form-control {
 		border-radius: 0;
+		color: rgb(0, 54, 175);
+	}
+	.form-control:focus {
+		color: rgb(0, 54, 175);	
 	}
 </style>
 

resources/views/app/patient/settings.blade.php

@@ -1382,44 +1382,49 @@
                         @endif
                     @endif
 
+                
+                @endif
+
                 <hr class="m-negator-3 mt-3">
                 <div>
                     <div class="d-flex mb-2 align-items-center">
                         <b class="d-block">MCN Query Response</b>
-                        <span class="text-secondary mx-2">|</span>
-                        @if(!$patient->is_coverage_manually_verified)
-                            <div moe wide>
-                                <a start show><i class="fa fa-edit"></i> <b>Set Part B to Manually Verified</b></a>
-                                <form url="/api/client/markCoverageAsManuallyVerified" class="mcp-theme-1">
-                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                    <div class="mb-2">
-                                        <label class="mb-1 text-secondary text-sm">Manual Verification Memo</label>
-                                        <textarea rows="4" type="text" class="form-control form-control-sm" name="memo"
-                                              placeholder="Memo">{{ $patient->coverage_manual_verification_memo }}</textarea>
-                                    </div>
-                                    <div>
-                                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                        @else
-                            <span class="text-info font-weight-bold"><i class="fa fa-check"></i>&nbsp;Part B Manually Verified</span>
-                            <div moe wide class="ml-3">
-                                <a start show><i class="fa fa-edit"></i> Undo</a>
-                                <form url="/api/client/undoMarkCoverageAsManuallyVerified" class="mcp-theme-1">
-                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                    <div class="mb-2">
-                                        <label class="mb-1 text-secondary text-sm">Undo Manual Verification Memo</label>
-                                        <textarea rows="4" type="text" class="form-control form-control-sm" name="memo"
-                                                  placeholder="Memo">{{ $patient->coverage_manual_verification_memo }}</textarea>
-                                    </div>
-                                    <div>
-                                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
+                        @if($pro->pro_type == 'ADMIN')
+                            <span class="text-secondary mx-2">|</span>
+                            @if(!$patient->is_coverage_manually_verified)
+                                <div moe wide>
+                                    <a start show><i class="fa fa-edit"></i> <b>Set Part B to Manually Verified</b></a>
+                                    <form url="/api/client/markCoverageAsManuallyVerified" class="mcp-theme-1">
+                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                        <div class="mb-2">
+                                            <label class="mb-1 text-secondary text-sm">Manual Verification Memo</label>
+                                            <textarea rows="4" type="text" class="form-control form-control-sm" name="memo"
+                                                placeholder="Memo">{{ $patient->coverage_manual_verification_memo }}</textarea>
+                                        </div>
+                                        <div>
+                                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @else
+                                <span class="text-info font-weight-bold"><i class="fa fa-check"></i>&nbsp;Part B Manually Verified</span>
+                                <div moe wide class="ml-3">
+                                    <a start show><i class="fa fa-edit"></i> Undo</a>
+                                    <form url="/api/client/undoMarkCoverageAsManuallyVerified" class="mcp-theme-1">
+                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                        <div class="mb-2">
+                                            <label class="mb-1 text-secondary text-sm">Undo Manual Verification Memo</label>
+                                            <textarea rows="4" type="text" class="form-control form-control-sm" name="memo"
+                                                    placeholder="Memo">{{ $patient->coverage_manual_verification_memo }}</textarea>
+                                        </div>
+                                        <div>
+                                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @endif
                         @endif
                     </div>
                     <div class="bg-light border p-2">
@@ -1461,7 +1466,6 @@
                     {!! implode("", $output) !!}
                     </div>
                 </div>
-                @endif
 
             </div>
         </div>

resources/views/layouts/patient.blade.php

@@ -246,6 +246,10 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 						<li class="nav-item">
 							<a class="nav-link" href="/patients/view/{{ $patient->uid }}/intake">Intake</a>
 						</li>
+						<li class="nav-item">
+                            <a class="nav-link {{ strpos($routeName, 'patients.view.primary-coverage') === 0 ? 'active' : '' }}"
+                               href="{{ route('patients.view.primary-coverage', $patient) }}">Primary Coverage</a>
+                        </li>
 						@if($performer->pro->pro_type == 'ADMIN' || $performer->pro->id == $patient->default_na_pro_id)
 						<li class="nav-item">
 							<a class="nav-link {{ strpos($routeName, 'patients.view.mcp-requests') === 0 ? 'active' : '' }}"
@@ -259,10 +263,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 							<a class="nav-link {{ strpos($routeName, 'patients.view.insurance-coverage') === 0 ? 'active' : '' }}"
 							   href="{{ route('patients.view.insurance-coverage', $patient) }}">Insurance Coverage</a>
 						</li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.primary-coverage') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.primary-coverage', $patient) }}">Primary Coverage</a>
-                        </li>
+                       
 						<li class="nav-item">
 							<a class="nav-link {{ strpos($routeName, 'patients.view.claims-resolver') === 0 ? 'active' : '' }}"
 							   href="{{ route('patients.view.claims-resolver', $patient) }}">Claims Resolver</a>