Merge branch 'cm-tiers' of https://rav.triplestart.com/tigerphp/stagfe2 into cm-tiers

resources/views/app/patient/care-month/forms/put-company-pro-payer.blade.php

@@ -5,9 +5,11 @@
         <div class="mb-2">
             <select name="companyProPayerUid" class="form-control form-control-sm">
                 <option value="">-- select --</option>
-                @foreach ($careMonth->companyPro->companyProPayers as $companyProPayer)
-                    <option value="{{ $companyProPayer->uid }}">{{ $companyProPayer->payer->name }}</option>
-                @endforeach
+                @if($careMonth->companyPro && $careMonth->companyPro->companyProPayers)
+                    @foreach ($careMonth->companyPro->companyProPayers as $companyProPayer)
+                        <option value="{{ $companyProPayer->uid }}">{{ $companyProPayer->payer->name }}</option>
+                    @endforeach
+                @endif
             </select>
         </div>
         <div class="mb-0">

resources/views/app/patient/care-month/forms/put-company-pro.blade.php

@@ -5,10 +5,12 @@
         <div class="mb-2">
             <select name="companyProUid" class="form-control form-control-sm">
                 <option value="">-- select --</option>
-                @foreach ($careMonth->mcp->companyPros as $companyPro)
-                    <option value="{{ $companyPro->uid }}">
-                        {{ $companyPro->pro->displayName() . ' / ' . $companyPro->company->name }}</option>
-                @endforeach
+                @if($careMonth->mcp && $careMonth->mcp->companyPros)
+                    @foreach ($careMonth->mcp->companyPros as $companyPro)
+                        <option value="{{ $companyPro->uid }}">
+                            {{ $companyPro->pro->displayName() . ' / ' . $companyPro->company->name }}</option>
+                    @endforeach
+                @endif
             </select>
         </div>
         <div class="mb-0">

resources/views/app/patient/care-month/partials/admin-settings.blade.php

@@ -55,12 +55,12 @@ $moes = [
             'whyNotEnrolledInCmCategory' => [
                 'label' => 'Why not enrolled in cm category',
                 'type' => 'text',
-                'column' => 'why_not_enrolled_in_cm_category'
+                'column' => 'why_not_enrolled_in_cm_category',
             ],
             'whyNotEnrolledInCmMemo' => [
                 'label' => 'Why not enrolled in cm memo',
                 'type' => 'text',
-                'column' => 'why_not_enrolled_in_cm_memo'
+                'column' => 'why_not_enrolled_in_cm_memo',
             ],
         ],
     ],
@@ -71,12 +71,12 @@ $moes = [
             'whyNotEnrolledInRmCategory' => [
                 'label' => 'Why not enrolled in rm category',
                 'type' => 'text',
-                'column' => 'why_not_enrolled_in_rm_category'
+                'column' => 'why_not_enrolled_in_rm_category',
             ],
             'whyNotEnrolledInRmMemo' => [
                 'label' => 'Why not enrolled in rm memo',
                 'type' => 'text',
-                'column' => 'why_not_enrolled_in_rm_memo'
+                'column' => 'why_not_enrolled_in_rm_memo',
             ],
         ],
     ],
@@ -87,8 +87,8 @@ $moes = [
             'memo' => [
                 'label' => 'Memo',
                 'type' => 'text',
-                'column' => 'why_is_cm_canceled_this_month'
-            ]
+                'column' => 'why_is_cm_canceled_this_month',
+            ],
         ],
     ],
     'updateWhyIsRmCanceledThisMonth' => [
@@ -98,8 +98,8 @@ $moes = [
             'memo' => [
                 'label' => 'Memo',
                 'type' => 'text',
-                'column' => 'why_is_rm_canceled_this_month'
-            ]
+                'column' => 'why_is_rm_canceled_this_month',
+            ],
         ],
     ],
     'updateClaimTotalExpected' => [
@@ -109,8 +109,8 @@ $moes = [
             'claimTotalExpected' => [
                 'label' => 'Claim total expected',
                 'type' => 'text',
-                'column' => 'claim_total_expected'
-            ]
+                'column' => 'claim_total_expected',
+            ],
         ],
     ],
     'closeClaiming' => [
@@ -126,8 +126,8 @@ $moes = [
             'claimSummary' => [
                 'label' => 'Claim summary',
                 'type' => 'text',
-                'column' => 'claim_summary'
-            ]
+                'column' => 'claim_summary',
+            ],
         ],
     ],
     'updateClaimTotalPaid' => [
@@ -137,8 +137,8 @@ $moes = [
             'claimTotalPaid' => [
                 'label' => 'Claim Total Paid',
                 'type' => 'text',
-                'column' => 'claim_total_paid'
-            ]
+                'column' => 'claim_total_paid',
+            ],
         ],
     ],
     'markRmSetupPerformed' => [
@@ -154,120 +154,131 @@ $moes = [
             'is99454ClaimingWaived' => [
                 'label' => 'Is 99454 claiming waived',
                 'type' => 'checkbox',
-                'column' => 'is_99454_claiming_waived'
+                'column' => 'is_99454_claiming_waived',
             ],
             'whyClaiming99454Waived' => [
                 'label' => 'Why claiming 99454 waived',
                 'type' => 'text',
-                'column' => 'why_claiming_99454_waived'
+                'column' => 'why_claiming_99454_waived',
             ],
             'is99457ClaimingWaived' => [
                 'label' => 'Is 99457 claiming waived',
                 'type' => 'checkbox',
-                'column' => 'is_99457_claiming_waived'
+                'column' => 'is_99457_claiming_waived',
             ],
             'whyClaiming99457Waived' => [
                 'label' => 'Why claiming 99457 waived',
                 'type' => 'text',
-                'column' => 'why_claiming_99457_waived'
+                'column' => 'why_claiming_99457_waived',
             ],
             'is99458ClaimingWaived' => [
                 'label' => 'Is 99458 claiming waived',
                 'type' => 'checkbox',
-                'column' => 'is_99458_claiming_waived'
+                'column' => 'is_99458_claiming_waived',
             ],
             'whyClaiming99458Waived' => [
                 'label' => 'Why claiming 99458 waived',
                 'type' => 'text',
-                'column' => 'why_claiming_99458_waived'
+                'column' => 'why_claiming_99458_waived',
             ],
         ],
-    ],    
+    ],
 ];
 ?>
-
+<style>
+    .setting-item {
+        flex-basis: 25%;
+    }
+</style>
 <div class="d-flex flex-wrap align-items-start">
     @foreach ($moes as $apiKey => $moe)
-        @if ($moe['type'] === 'boolean')
-            <div class="mr-3">
-                {{ $moe['label'] }}: <b>{{ $careMonth->{$moe['field']} ? 'Yes' : 'No' }}</b>
-                <div moe class="text-left ml-2 mb-2">
-                    <a class="" href="" show start>Toggle</a>
-                    @if ($careMonth->{$moe['field']})
-                        <form url="/api/careMonth/{{ $moe['undoApi'] }}">
-                            <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                            <p>Set <b>{{ $moe['label'] }}</b> to false?</p>
-                            <div class="mb-0">
-                                <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    @else
+        <div class="setting-item">
+            @if ($moe['type'] === 'boolean')
+                <div class="mr-3">
+                    {{ $moe['label'] }}: <b>{{ $careMonth->{$moe['field']} ? 'Yes' : 'No' }}</b>
+                    <div moe class="text-left ml-2 mb-2">
+                        <a class="" href="" show start>Toggle</a>
+                        @if ($careMonth->{$moe['field']})
+                            <form url="/api/careMonth/{{ $moe['undoApi'] }}">
+                                <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
+                                <p>Set <b>{{ $moe['label'] }}</b> to false?</p>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        @else
+                            <form url="/api/careMonth/{{ $apiKey }}">
+                                <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
+                                <p>Set <b>{{ $moe['label'] }}</b> to true?</p>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        @endif
+                    </div>
+                </div>
+            @endif
+            @if ($moe['type'] === 'form')
+                <div class="mr-3">
+                    {{ $moe['label'] }}:
+                    <div moe class="text-left ml-2 mb-2">
+                        <a class="" href="" show start>Update</a>
                         <form url="/api/careMonth/{{ $apiKey }}">
                             <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                            <p>Set <b>{{ $moe['label'] }}</b> to true?</p>
+                            @foreach ($moe['fields'] as $fieldName => $field)
+                                @if ($field['type'] === 'text')
+                                    <div class="form-group">
+                                        <label>{{ $field['label'] }}</label>
+                                        <input type="text" name="{{ $fieldName }}" class="form-control"
+                                            value="{{ $careMonth->{$field['column']} }}" />
+                                    </div>
+                                @endif
+                                @if ($field['type'] === 'checkbox')
+                                    <div class="form-group">
+                                        <label>{{ $field['label'] }} <input type="checkbox" name="{{ $fieldName }}"
+                                                class="form-control"
+                                                value="{{ $careMonth->{$field['column']} }}" /></label>
+                                    </div>
+                                @endif
+                            @endforeach
                             <div class="mb-0">
                                 <button class="btn btn-primary btn-sm" submit>Submit</button>
                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                             </div>
                         </form>
-                    @endif
+                    </div>
                 </div>
-            </div>
-        @endif
-        @if ($moe['type'] === 'form')
-            <div class="mr-3">
-                {{ $moe['label'] }}:
-                <div moe class="text-left ml-2 mb-2">
-                    <a class="" href="" show start>Update</a>
-                    <form url="/api/careMonth/{{ $apiKey }}">
-                        <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                        @foreach($moe['fields'] as $fieldName => $field)
-                            @if($field['type'] === 'text')
-                                <div class="form-group">
-                                    <label>{{ $field['label'] }}</label>
-                                    <input type="text" name="{{ $fieldName }}" class="form-control" value="{{ $careMonth->{$field['column']} }}" />
-                                </div>
-                            @endif
-                            @if($field['type'] === 'checkbox')
-                                <div class="form-group">
-                                    <label>{{ $field['label'] }} <input type="checkbox" name="{{ $fieldName }}" class="form-control" value="{{ $careMonth->{$field['column']} }}" /></label>
-                                </div>
-                            @endif
-                        @endforeach
-                        <div class="mb-0">
-                            <button class="btn btn-primary btn-sm" submit>Submit</button>
-                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        @endif
+            @endif
+        </div>
     @endforeach
 </div>
 <hr />
-<div class="d-flex align-items-start flwx-wrap">
+<div class="d-flex flex-column align-items-start flwx-wrap">
     <div class="d-flex align-items-start mr-3">
         <span>RM Reasons: </span>
-        @include('app.patient.partials.put-rm-reasons', ['recordType' => 'CARE_MONTH', 'record' => $careMonth])
+        @include('app.patient.partials.put-rm-reasons', [
+            'recordType' => 'CARE_MONTH',
+            'record' => $careMonth,
+        ])
     </div>
     <div class="mr-3">
-        @include("app.patient.care-month.forms.put-company-pro")
-        @if($careMonth->companyPro)
-            @include("app.patient.care-month.forms.wipe-company-pro")
+        @include('app.patient.care-month.forms.put-company-pro')
+        @if ($careMonth->companyPro)
+            @include('app.patient.care-month.forms.wipe-company-pro')
         @endif
     </div>
     <div class="mr-3">
-        @include("app.patient.care-month.forms.put-company-pro-payer")
-        @if($careMonth->companyPro)
-            @include("app.patient.care-month.forms.wipe-company-pro-payer")
+        @include('app.patient.care-month.forms.put-company-pro-payer')
+        @if ($careMonth->companyPro)
+            @include('app.patient.care-month.forms.wipe-company-pro-payer')
         @endif
     </div>
     <div class="mr-3">
-        @include("app.patient.care-month.forms.put-company-location")
-        @if($careMonth->companyPro)
-            @include("app.patient.care-month.forms.wipe-company-location")
+        @include('app.patient.care-month.forms.put-company-location')
+        @if ($careMonth->companyPro)
+            @include('app.patient.care-month.forms.wipe-company-location')
         @endif
     </div>
 </div>
-