Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

app/Http/Controllers/HomeController.php

@@ -485,7 +485,8 @@ class HomeController extends Controller
 
     public function newPatient(Request $request)
     {
-        return view('app/new-patient');
+        $mbPayers = MBPayer::all();
+        return view('app/new-patient', compact('mbPayers'));
     }
 
     public function newNonMcnPatient(Request $request)

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

@@ -71,10 +71,42 @@
                             <label class='control-label'>Email Address </label>
                             <input class='form-control' type='email' name='emailAddress'>
                         </div>
-                        <div class='form-group mb-3'>
-                            <label class='control-label'>Medicare Number *</label>
-                            <input class='form-control' type='text' name='medicareNumber' required>
+                        <hr class="m-neg-4">
+                        <div class='form-group mb-3 d-flex align-items-center'>
+                            <label class='my-0 mr-3 control-label'>Insurance </label>
+                            <div class="d-inline-flex align-items-center">
+                                <label class="my-0 mr-3 d-inline-flex align-items-center">
+                                    <input class='insurance' type='radio' name='insurance' value="medicare">
+                                    <span class="ml-1">Medicare</span>
+                                </label>
+                                <label class="my-0 mr-3 d-inline-flex align-items-center">
+                                    <input class='insurance' type='radio' name='insurance' value="non-medicare">
+                                    <span class="ml-1">Non-Medicare</span>
+                                </label>
+                            </div>
+                        </div>
+                        <div data-insurance="medicare" class="d-none">
+                            <div class='form-group mb-3'>
+                                <label class='control-label'>Medicare Number</label>
+                                <input class='form-control' type='text' name='medicareNumber'>
+                            </div>
+                        </div>
+                        <div data-insurance="non-medicare" class="d-none">
+                            <div class='form-group mb-3'>
+                                <label class='control-label d-block'>Payer</label>
+                                <select name="mbPayerUid" class="form-control select2">
+                                    <option value="">--select--</option>
+                                    @foreach($mbPayers as $mbPayer)
+                                        <option value="{{$mbPayer->uid}}">{{$mbPayer->name()}}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                            <div class='form-group mb-3'>
+                                <label class='control-label'>Member ID</label>
+                                <input class='form-control' type='text' name='mbPayerMemberId' required>
+                            </div>
                         </div>
+                        <hr class="m-neg-4">
                         <div class='form-group mb-3'>
                             <label class='control-label'>Initiative</label>
                             <select name="initiative" class="form-control">
@@ -93,6 +125,8 @@
         </div>
     </div>
 
+    <link href="/select2/select2.min.css" rel="stylesheet" />
+    <script src="/select2/select2.min.js"></script>
     <script src="/inputmask-5.x/dist/inputmask.js"></script>
     <script>
         (function() {
@@ -120,6 +154,17 @@
                         $('[name="cellNumber"]').val(hpn);
                         return false;
                     });
+                $(document)
+                    .off('change.insurance', '.insurance')
+                    .on('change.insurance', '.insurance', function() {
+                        $('[data-insurance]').addClass('d-none');
+                        $('[data-insurance="' + $(this).val() + '"]').removeClass('d-none');
+                        $(this).closest('form').attr('url', '/api/client/' + ($(this).val() === 'medicare' ? 'create' : 'createNonMcn'))
+                        return false;
+                    });
+                $('.select2').select2({
+                    width: '100%'
+                });
             }
             addMCInitializer('new-patient', init, '#newPatientContainer');
         }).call(window);

resources/views/layouts/template.blade.php

@@ -94,7 +94,7 @@
                 <li class="nav-item"><a class="nav-link" href="{{ route('patients') }}"><i class="mr-1 fas fa-user-injured"></i> Patients</a> </li>
                 @if($pro && ($pro->can_add_patients || $pro->pro_type== 'ADMIN'))
                 <li class="nav-item"><a class="nav-link" href="{{ route('new-patient') }}"><i class="mr-1 fas fa-user-plus"></i> New Patient</a> </li>
-                <li class="nav-item"><a class="nav-link" href="{{ route('new-non-mcn-patient') }}"><i class="mr-1 fas fa-user-plus"></i> New Non Medicare Patient</a> </li>
+<!--                <li class="nav-item"><a class="nav-link" href="{{ route('new-non-mcn-patient') }}"><i class="mr-1 fas fa-user-plus"></i> New Non Medicare Patient</a> </li>-->
                 @endif
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="practice-management" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="mr-1 fas fa-tasks"></i> Practice</a>