Browse Source

TM months should allow RM actions

Vijayakrishnan Krishnan 4 years ago
parent
commit
d5560f30f3
2 changed files with 537 additions and 527 deletions
  1. 4 0
      public/css/style.css
  2. 533 527
      resources/views/app/patient/care-month/dashboard.blade.php

+ 4 - 0
public/css/style.css

@@ -89,6 +89,10 @@ body.stag_rhs_collapsed .app-right-panel {
 .pl-3-5 {
 .pl-3-5 {
     padding-left: 1.25rem !important;
     padding-left: 1.25rem !important;
 }
 }
+.lh-24px {
+    height: 24px;
+    line-height: 24px;
+}
 .mcp-theme-1 *:not(i) {
 .mcp-theme-1 *:not(i) {
     font-family: Verdana, sans-serif;
     font-family: Verdana, sans-serif;
     font-size: 13px;
     font-size: 13px;

+ 533 - 527
resources/views/app/patient/care-month/dashboard.blade.php

@@ -29,7 +29,6 @@
                     @endif
                     @endif
                 </div>
                 </div>
             </h6>
             </h6>
-            @if(!$careMonth->is_tm_this_month)
             <div class="d-flex align-items-start ml-auto text-secondary">
             <div class="d-flex align-items-start ml-auto text-secondary">
                 <div class="d-inline-flex align-items-start">
                 <div class="d-inline-flex align-items-start">
                     <div>
                     <div>
@@ -78,10 +77,8 @@
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
-            @endif
         </div>
         </div>
 
 
-        @if(!$careMonth->is_tm_this_month)
         <hr class="m-negator mb-0">
         <hr class="m-negator mb-0">
 
 
         <div class="row m-negator bg-light py-1 text-sm-incl-children">
         <div class="row m-negator bg-light py-1 text-sm-incl-children">
@@ -104,27 +101,6 @@
         </div>
         </div>
 
 
         <hr class="m-negator mt-0">
         <hr class="m-negator mt-0">
-        @endif
-
-        @if($careMonth->is_tm_this_month)
-
-            <hr class="m-negator">
-            <div class="alert alert-secondary mb-0">
-                This care month has been marked as <b>Transitional Month</b>.
-                <span moe class="">
-                    <a start show class="font-weight-bold">Undo</a>
-                    <form url="/api/careMonth/setIsTmThisMonthToFalse">
-                        <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                        <p>Undo mark as <b>Transitional Month</b>?</p>
-                        <div class="d-flex align-items-center">
-                            <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
-                            <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                        </div>
-                    </form>
-                </span>
-            </div>
-
-        @else
 
 
         <?php
         <?php
         $entries = $careMonth->entries;
         $entries = $careMonth->entries;
@@ -155,127 +131,148 @@
         ?>
         ?>
 
 
         <div class="row">
         <div class="row">
-            @if($patient->is_enrolled_in_cm === 'YES')
-            <div class="col-6">
-                <div class="d-flex align-items-center">
-                    <h6 class="my-0 text-secondary font-weight-bold text-dark">CM Time Entries</h6>
-                    <span class="mx-2 text-secondary">|</span>
-                    @if(!$activeCMBill)
-                        <div moe>
-                            <a start show class="py-0 mb-3">Add</a>
-                            <form url="/api/careMonthEntry/createForCm">
-                                <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
-                                <div class="mb-2">
-                                    <select class="form-control form-control-sm" name="proUid">
-                                        <option value="">-- Select Pro --</option>
-                                        @foreach($pros as $pro)
-                                        <option value="{{ $pro->uid }}">{{ $pro->displayName() }}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                                <div class="mb-2">
-                                    <?php
-                                    $sD = strtotime($careMonth->start_date);
-                                    $y = date('Y', $sD);
-                                    $m = date('m', $sD);
-                                    $d = date('t', $sD);
-                                    $yCurrent = date('Y');
-                                    $mCurrent = date('m');
-                                    if($y === $yCurrent && $m === $mCurrent) {
-                                        $d = date('d');
-                                    }
-                                    ?>
-                                    <input type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}" class="form-control form-control-sm" name="effectiveDate"
-                                           value="" placeholder="Effective Date">
-                                </div>
-                                <div class="mb-2">
-                                    <input type="number" min="0" max="5400" class="form-control form-control-sm cm-time-value" name="timeInSeconds"
-                                           value="" placeholder="Time in Seconds">
-                                </div>
-                                <div class="mb-2 d-flex align-items-center">
-                                    <span>Time Specific:</span>
-                                    <input type="checkbox" name="isTimeSpecific" class="ml-1"
-                                           onchange="enableTimeSpecificFields(this.checked, 'cm-time-value', 'cm-time-range')">
-                                </div>
-                                <div class="mb-2">
-                                    <input type="time" class="form-control form-control-sm cm-time-range" name="startingTime"
-                                           value="" placeholder="Starting Time" disabled>
-                                </div>
-                                <div class="mb-2">
-                                    <input type="time" class="form-control form-control-sm cm-time-range" name="endingTime"
-                                           value="" placeholder="Ending Time" disabled>
-                                </div>
-                                <div class="mb-2">
-                                    <input type="text" class="form-control form-control-sm" name="contentText"
-                                           value="" placeholder="Content Text">
-                                </div>
-                                <div class="mb-2">
-                                    <input type="text" class="form-control form-control-sm" name="contentDetail"
-                                           value="" placeholder="Content Detail">
-                                </div>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @else
-                        <span class="text-secondary">Can't modify since a bill exists</span>
-                    @endif
+            @if($careMonth->is_tm_this_month)
+                <div class="col-6">
+                    <div class="d-flex align-items-center">
+                        <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">CM Time Entries</h6>
+                    </div>
+                    <div class="alert alert-secondary mb-0 mt-2">
+                        This care month has been marked as <b>Transitional Month</b>.
+                        <span moe class="">
+                        <a start show class="font-weight-bold">Undo</a>
+                        <form url="/api/careMonth/setIsTmThisMonthToFalse">
+                            <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
+                            <p>Undo mark as <b>Transitional Month</b>?</p>
+                            <div class="d-flex align-items-center">
+                                <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
+                                <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
+                            </div>
+                        </form>
+                    </span>
+                    </div>
                 </div>
                 </div>
-                <table class="table table-striped table-sm table-bordered mt-2 mb-0">
-                    <thead>
-                    <tr>
-                        <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
-                        <th class="px-2 text-secondary border-bottom-0">Time</th>
-                        <th class="px-2 text-secondary border-bottom-0 w-50">Details</th>
-                        <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach($entries as $entry)
-                        @if(!$entry->is_removed && $entry->cm_or_rm === "CM")
-                        <tr>
-                            <td class="px-2">
-                                <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
-                                <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
-                            </td>
-                            <td class="px-2">
-                                {{time_in_hrminsec($entry->time_in_seconds)}}
-                            </td>
-                            <td class="px-2">
-                                <div>{{$entry->content_text}}</div>
-                                <div class="text-secondary text-sm">{{$entry->content_detail}}</div>
-                            </td>
-                            <td class="px-2 text-center delete-column">
-                                @if(!$activeCMBill)
-                                <div moe relative>
-                                    <a start show><i class="on-hover-opaque fa fa-trash-alt text-danger"></i></a>
-                                    <form url="/api/careMonthEntry/remove" right>
-                                        <input type="hidden" name="uid" value="{{ $entry->uid }}">
-                                        <p class="small">Are you sure you want to delete this CM entry?</p>
+            @else
+                @if($patient->is_enrolled_in_cm === 'YES')
+                    <div class="col-6">
+                        <div class="d-flex align-items-center">
+                            <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">CM Time Entries</h6>
+                            <span class="mx-2 text-secondary">|</span>
+                            @if(!$activeCMBill)
+                                <div moe>
+                                    <a start show class="py-0 mb-3">Add</a>
+                                    <form url="/api/careMonthEntry/createForCm">
+                                        <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
+                                        <div class="mb-2">
+                                            <select class="form-control form-control-sm" name="proUid">
+                                                <option value="">-- Select Pro --</option>
+                                                @foreach($pros as $pro)
+                                                    <option value="{{ $pro->uid }}">{{ $pro->displayName() }}</option>
+                                                @endforeach
+                                            </select>
+                                        </div>
+                                        <div class="mb-2">
+                                            <?php
+                                            $sD = strtotime($careMonth->start_date);
+                                            $y = date('Y', $sD);
+                                            $m = date('m', $sD);
+                                            $d = date('t', $sD);
+                                            $yCurrent = date('Y');
+                                            $mCurrent = date('m');
+                                            if($y === $yCurrent && $m === $mCurrent) {
+                                                $d = date('d');
+                                            }
+                                            ?>
+                                            <input type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}" class="form-control form-control-sm" name="effectiveDate"
+                                                   value="" placeholder="Effective Date">
+                                        </div>
+                                        <div class="mb-2">
+                                            <input type="number" min="0" max="5400" class="form-control form-control-sm cm-time-value" name="timeInSeconds"
+                                                   value="" placeholder="Time in Seconds">
+                                        </div>
+                                        <div class="mb-2 d-flex align-items-center">
+                                            <span>Time Specific:</span>
+                                            <input type="checkbox" name="isTimeSpecific" class="ml-1"
+                                                   onchange="enableTimeSpecificFields(this.checked, 'cm-time-value', 'cm-time-range')">
+                                        </div>
+                                        <div class="mb-2">
+                                            <input type="time" class="form-control form-control-sm cm-time-range" name="startingTime"
+                                                   value="" placeholder="Starting Time" disabled>
+                                        </div>
+                                        <div class="mb-2">
+                                            <input type="time" class="form-control form-control-sm cm-time-range" name="endingTime"
+                                                   value="" placeholder="Ending Time" disabled>
+                                        </div>
+                                        <div class="mb-2">
+                                            <input type="text" class="form-control form-control-sm" name="contentText"
+                                                   value="" placeholder="Content Text">
+                                        </div>
+                                        <div class="mb-2">
+                                            <input type="text" class="form-control form-control-sm" name="contentDetail"
+                                                   value="" placeholder="Content Detail">
+                                        </div>
                                         <div class="d-flex align-items-center">
                                         <div class="d-flex align-items-center">
-                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                            <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                         </div>
                                         </div>
                                     </form>
                                     </form>
                                 </div>
                                 </div>
-                                @else
-                                    <a href="#" class="text-secondary" title="Can't modify since a bill exists"><i class="on-hover-opaque fa fa-trash-alt"></i></a>
+                            @else
+                                <span class="text-secondary">Can't modify since a bill exists</span>
+                            @endif
+                        </div>
+                        <table class="table table-striped table-sm table-bordered mt-2 mb-0">
+                            <thead>
+                            <tr>
+                                <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
+                                <th class="px-2 text-secondary border-bottom-0">Time</th>
+                                <th class="px-2 text-secondary border-bottom-0 w-50">Details</th>
+                                <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach($entries as $entry)
+                                @if(!$entry->is_removed && $entry->cm_or_rm === "CM")
+                                    <tr>
+                                        <td class="px-2">
+                                            <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
+                                            <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
+                                        </td>
+                                        <td class="px-2">
+                                            {{time_in_hrminsec($entry->time_in_seconds)}}
+                                        </td>
+                                        <td class="px-2">
+                                            <div>{{$entry->content_text}}</div>
+                                            <div class="text-secondary text-sm">{{$entry->content_detail}}</div>
+                                        </td>
+                                        <td class="px-2 text-center delete-column">
+                                            @if(!$activeCMBill)
+                                                <div moe relative>
+                                                    <a start show><i class="on-hover-opaque fa fa-trash-alt text-danger"></i></a>
+                                                    <form url="/api/careMonthEntry/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $entry->uid }}">
+                                                        <p class="small">Are you sure you want to delete this CM entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            @else
+                                                <a href="#" class="text-secondary" title="Can't modify since a bill exists"><i class="on-hover-opaque fa fa-trash-alt"></i></a>
+                                            @endif
+                                        </td>
+                                    </tr>
                                 @endif
                                 @endif
-                            </td>
-                        </tr>
-                        @endif
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-            @else
-                <div class="col-6">
-                    <h6 class="mb-3 text-secondary font-weight-bold text-dark">CM Time Entries</h6>
-                    <div class="alert alert-secondary mb-0">
-                        <b>{{ $patient->displayName() }}</b> is currently not enrolled in <b>CM</b>.
-                        <span moe class="">
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                @else
+                    <div class="col-6">
+                        <h6 class="mb-3 text-secondary font-weight-bold text-dark">CM Time Entries</h6>
+                        <div class="alert alert-secondary mb-0">
+                            <b>{{ $patient->displayName() }}</b> is currently not enrolled in <b>CM</b>.
+                            <span moe class="">
                             <a start show class="font-weight-bold">Enroll Now</a>
                             <a start show class="font-weight-bold">Enroll Now</a>
                             <form url="/api/client/setIsEnrolledInCmToTrue">
                             <form url="/api/client/setIsEnrolledInCmToTrue">
                                 <input type="hidden" name="uid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="uid" value="{{ $patient->uid }}">
@@ -301,14 +298,15 @@
                                 </div>
                                 </div>
                             </form>
                             </form>
                         </span>
                         </span>
+                        </div>
                     </div>
                     </div>
-                </div>
+                @endif
             @endif
             @endif
 
 
             @if($patient->is_enrolled_in_rm === 'YES')
             @if($patient->is_enrolled_in_rm === 'YES')
-            <div class="col-6">
+                <div class="col-6">
                 <div class="d-flex align-items-center">
                 <div class="d-flex align-items-center">
-                    <h6 class="my-0 text-secondary font-weight-bold text-dark">RM Time Entries</h6>
+                    <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">RM Time Entries</h6>
                     <span class="mx-2 text-secondary">|</span>
                     <span class="mx-2 text-secondary">|</span>
                     @if(!$activeRMBill)
                     @if(!$activeRMBill)
                         <div moe>
                         <div moe>
@@ -398,17 +396,21 @@
                                     <div class="text-secondary text-sm">{{$entry->content_detail}}</div>
                                     <div class="text-secondary text-sm">{{$entry->content_detail}}</div>
                                 </td>
                                 </td>
                                 <td class="px-2 text-center delete-column">
                                 <td class="px-2 text-center delete-column">
-                                    <div moe relative>
-                                        <a start show><i class="on-hover-opaque fa fa-trash-alt text-danger"></i></a>
-                                        <form url="/api/careMonthEntry/remove" right>
-                                            <input type="hidden" name="uid" value="{{ $entry->uid }}">
-                                            <p class="small">Are you sure you want to delete this RM entry?</p>
-                                            <div class="d-flex align-items-center">
-                                                <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
+                                    @if(!$activeRMBill)
+                                        <div moe relative>
+                                            <a start show><i class="on-hover-opaque fa fa-trash-alt text-danger"></i></a>
+                                            <form url="/api/careMonthEntry/remove" right>
+                                                <input type="hidden" name="uid" value="{{ $entry->uid }}">
+                                                <p class="small">Are you sure you want to delete this RM entry?</p>
+                                                <div class="d-flex align-items-center">
+                                                    <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @else
+                                        <a href="#" class="text-secondary" title="Can't modify since a bill exists"><i class="on-hover-opaque fa fa-trash-alt"></i></a>
+                                    @endif
                                 </td>
                                 </td>
                             </tr>
                             </tr>
                         @endif
                         @endif
@@ -444,430 +446,434 @@
             @endif
             @endif
         </div>
         </div>
 
 
-        @if($patient->is_enrolled_in_cm === 'YES' || $patient->is_enrolled_in_rm === 'YES')
+        @if((!$careMonth->is_tm_this_month && $patient->is_enrolled_in_cm === 'YES') || $patient->is_enrolled_in_rm === 'YES')
         <hr class="m-negator mt-4 mb-3">
         <hr class="m-negator mt-4 mb-3">
         @endif
         @endif
 
 
         <div class="row">
         <div class="row">
 
 
             {{-- cm bills --}}
             {{-- cm bills --}}
-            <div class="col-6">
-                @if($patient->is_enrolled_in_cm === 'YES')
-                <div class="d-flex align-items-center">
-                    <h6 class="my-0 text-secondary font-weight-bold text-dark">CM Bill
-                        @if($activeCMBill && !$activeCMBill->is_signed_by_hcp)
-                            <span class="small ml-1 text-secondary">(HCP Sign Pending)</span>
-                        @else
-                            @if($activeCMBill)
-                                <span class="small ml-1 text-secondary">(Signed by HCP)</span>
-                            @endif
-                        @endif
-                    </h6>
-                    @if($activeCMBill === false)
-                        <span class="mx-2 text-secondary">|</span>
-                        <div moe>
-                        <a start show class="py-0 mb-3">Generate</a>
-                        <form url="/api/careMonth/generateBillForCm">
-                            <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                            <div class="mb-2">
-                                <select class="form-control" name="cmCode" value="">
-                                    <option value="">-- Select CM Code --</option>
-                                    <option value="CM20">CM20</option>
-                                    <option value="CM30_HCP">CM30_HCP</option>
-                                    <option value="CM60">CM60</option>
-                                    <option value="CM90">CM90</option>
-                                </select>
-                            </div>
-                            <div class="mb-2">
-                                <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="form-control form-control-sm"></textarea>
-                            </div>
-                            <div class="d-flex align-items-center">
-                                <button class="btn btn-sm btn-primary mr-2" submit>Generate</button>
-                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+            @if($careMonth->is_tm_this_month)
+                <div class="col-6">
+                    {{-- no cm bills in tm month --}}
+                </div>
+            @else
+                <div class="col-6">
+                    @if($patient->is_enrolled_in_cm === 'YES')
+                        <div class="d-flex align-items-center">
+                            <h6 class="my-0 text-secondary font-weight-bold text-dark">CM Bill
+                                @if($activeCMBill && !$activeCMBill->is_signed_by_hcp)
+                                    <span class="small ml-1 text-secondary">(HCP Sign Pending)</span>
+                                @else
+                                    @if($activeCMBill)
+                                        <span class="small ml-1 text-secondary">(Signed by HCP)</span>
+                                    @endif
+                                @endif
+                            </h6>
+                            @if($activeCMBill === false)
+                                <span class="mx-2 text-secondary">|</span>
+                                <div moe>
+                                <a start show class="py-0 mb-3">Generate</a>
+                                <form url="/api/careMonth/generateBillForCm">
+                                    <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
+                                    <div class="mb-2">
+                                        <select class="form-control" name="cmCode" value="">
+                                            <option value="">-- Select CM Code --</option>
+                                            <option value="CM20">CM20</option>
+                                            <option value="CM30_HCP">CM30_HCP</option>
+                                            <option value="CM60">CM60</option>
+                                            <option value="CM90">CM90</option>
+                                        </select>
+                                    </div>
+                                    <div class="mb-2">
+                                        <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="form-control form-control-sm"></textarea>
+                                    </div>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-primary mr-2" submit>Generate</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
                             </div>
                             </div>
-                        </form>
-                    </div>
-                    @else
-                        @if(!$activeCMBill->is_signed_by_hcp && $activeCMBill->hcp_pro_id === $pro->id)
-                        <span class="mx-2 text-secondary">|</span>
-                        <div moe>
-                            <a start show class="py-0 mb-3 text-success">Sign as HCP</a>
-                            <form url="/api/bill/signAsHcp">
-                                <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                <p class="small">Sign this CM bill as HCP?</p>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                            @else
+                                @if(!$activeCMBill->is_signed_by_hcp && $activeCMBill->hcp_pro_id === $pro->id)
+                                <span class="mx-2 text-secondary">|</span>
+                                <div moe>
+                                    <a start show class="py-0 mb-3 text-success">Sign as HCP</a>
+                                    <form url="/api/bill/signAsHcp">
+                                        <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                        <p class="small">Sign this CM bill as HCP?</p>
+                                        <div class="d-flex align-items-center">
+                                            <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        </div>
+                                    </form>
                                 </div>
                                 </div>
-                            </form>
+                                @endif
+                                @if($pro->pro_type === 'ADMIN')
+                                <span class="mx-2 text-secondary">|</span>
+                                <div moe>
+                                    <a start show class="py-0 mb-3 text-danger">Cancel</a>
+                                    <form url="/api/bill/markCancelled">
+                                        <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                        <p class="small mb-2">Are you sure you want to cancel this CM bill?</p>
+                                        <div class="mb-2">
+                                            <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
+                                        </div>
+                                        <div class="d-flex align-items-center">
+                                            <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
+                                            <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
+                                        </div>
+                                    </form>
+                                </div>
+                                @endif
+                            @endif
                         </div>
                         </div>
-                        @endif
-                        @if($pro->pro_type === 'ADMIN')
-                        <span class="mx-2 text-secondary">|</span>
-                        <div moe>
-                            <a start show class="py-0 mb-3 text-danger">Cancel</a>
-                            <form url="/api/bill/markCancelled">
-                                <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                <p class="small mb-2">Are you sure you want to cancel this CM bill?</p>
-                                <div class="mb-2">
-                                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
+                        @if($activeCMBill !== false)
+                            <div class="border bg-white p-2 mt-2">
+                                <div class="">
+                                    Code: <span class="font-weight-bold text-dark">{{ $activeCMBill->code }}</span>
+                                    <div class="small text-secondary">Memo: {{$activeCMBill->memo}}</div>
+                                    <div class="small text-secondary">Created: {{friendly_date_time($activeCMBill->created_at)}}</div>
                                 </div>
                                 </div>
+                                <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                                @if($activeCMBill->hcp_pro_id === $pro->id)
                                 <div class="d-flex align-items-center">
                                 <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                                </div>
-                            </form>
-                        </div>
-                        @endif
-                    @endif
-                </div>
-                @if($activeCMBill !== false)
-                    <div class="border bg-white p-2 mt-2">
-                        <div class="">
-                            Code: <span class="font-weight-bold text-dark">{{ $activeCMBill->code }}</span>
-                            <div class="small text-secondary">Memo: {{$activeCMBill->memo}}</div>
-                            <div class="small text-secondary">Created: {{friendly_date_time($activeCMBill->created_at)}}</div>
-                        </div>
-                        <div class="font-weight-bold text-dark mt-2 mb-1"></div>
-                        @if($activeCMBill->hcp_pro_id === $pro->id)
-                        <div class="d-flex align-items-center">
-                            @if($activeCMBill->has_hcp_been_paid)
-                                <span class="text-dark">Received HCP Amount: </span>
-                                <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->hcp_payment_amount }}</span>
-                            @else
-                                <span class="text-dark">Expected HCP Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->hcp_expected_payment_amount ? '$' . $activeCMBill->hcp_expected_payment_amount : '-' }}</span>
-                                <span class="ml-auto">
-                                    @if($activeCMBill->is_signed_by_hcp)
-                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                    @if($activeCMBill->has_hcp_been_paid)
+                                        <span class="text-dark">Received HCP Amount: </span>
+                                        <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->hcp_payment_amount }}</span>
                                     @else
                                     @else
-                                        <div class="text-primary ml-3">
-                                            <div moe class="text-dark">
-                                                <a start show class="py-0 mb-3 text-primary text-sm">
-                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
-                                                </a>
-                                                <form url="/api/bill/signAsHcp">
-                                                    <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                                    <p class="small">Sign this RM bill as HCP?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        <span class="text-dark">Expected HCP Amount: </span>
+                                        <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->hcp_expected_payment_amount ? '$' . $activeCMBill->hcp_expected_payment_amount : '-' }}</span>
+                                        <span class="ml-auto">
+                                            @if($activeCMBill->is_signed_by_hcp)
+                                                <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                            @else
+                                                <div class="text-primary ml-3">
+                                                    <div moe class="text-dark">
+                                                        <a start show class="py-0 mb-3 text-primary text-sm">
+                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                        </a>
+                                                        <form url="/api/bill/signAsHcp">
+                                                            <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                                            <p class="small">Sign this RM bill as HCP?</p>
+                                                            <div class="d-flex align-items-center">
+                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
                                                     </div>
                                                     </div>
-                                                </form>
-                                            </div>
-                                        </div>
+                                                </div>
+                                            @endif
+                                        </span>
                                     @endif
                                     @endif
-                                </span>
-                            @endif
-                        </div>
-                        @endif
-                        @if($activeCMBill->cm_pro_id === $pro->id)
-                        <div class="d-flex align-items-center">
-                            @if($activeCMBill->has_cm_been_paid)
-                                <span class="text-dark">Received CM Pro Amount: </span>
-                                <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->cm_payment_amount }}</span>
-                            @else
-                                <span class="text-dark">Expected CM Pro Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->cm_expected_payment_amount ? '$' . $activeCMBill->cm_expected_payment_amount : '-' }}</span>
-                                <span class="ml-auto">
-                                    @if($activeCMBill->is_signed_by_cm)
-                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                </div>
+                                @endif
+                                @if($activeCMBill->cm_pro_id === $pro->id)
+                                <div class="d-flex align-items-center">
+                                    @if($activeCMBill->has_cm_been_paid)
+                                        <span class="text-dark">Received CM Pro Amount: </span>
+                                        <span class="font-weight-bold text-success ml-2">${{ $activeCMBill->cm_payment_amount }}</span>
                                     @else
                                     @else
-                                        <div class="text-primary ml-3">
-                                            <div moe class="text-dark">
-                                                <a start show class="py-0 mb-3 text-primary text-sm">
-                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
-                                                </a>
-                                                <form url="/api/bill/signAsCm">
-                                                    <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
-                                                    <p class="small">Sign this RM bill as CM Pro?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        <span class="text-dark">Expected CM Pro Amount: </span>
+                                        <span class="font-weight-bold text-dark ml-2">{{ $activeCMBill->cm_expected_payment_amount ? '$' . $activeCMBill->cm_expected_payment_amount : '-' }}</span>
+                                        <span class="ml-auto">
+                                            @if($activeCMBill->is_signed_by_cm)
+                                                <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                            @else
+                                                <div class="text-primary ml-3">
+                                                    <div moe class="text-dark">
+                                                        <a start show class="py-0 mb-3 text-primary text-sm">
+                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                        </a>
+                                                        <form url="/api/bill/signAsCm">
+                                                            <input type="hidden" name="uid" value="{{ $activeCMBill->uid }}">
+                                                            <p class="small">Sign this RM bill as CM Pro?</p>
+                                                            <div class="d-flex align-items-center">
+                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
                                                     </div>
                                                     </div>
-                                                </form>
-                                            </div>
-                                        </div>
+                                                </div>
+                                            @endif
+                                        </span>
                                     @endif
                                     @endif
-                                </span>
-                            @endif
-                        </div>
-                        @endif
-                    </div>
-                @endif
-                {{-- cancelled cm bills --}}
-                @if(count($cancelledCMBills))
-                    @foreach($cancelledCMBills as $cancelledBill)
-                        <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
-                            <div class="d-flex">
-                                <div class="">
-                                    Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
-                                    <div class="small text-secondary">Memo: {{$cancelledBill->memo}}</div>
-                                    <div class="small text-secondary">Created: {{friendly_date_time($cancelledBill->created_at)}}</div>
                                 </div>
                                 </div>
-                                <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
-                            </div>
-                            <div class="font-weight-bold text-dark mt-2 mb-1"></div>
-                            @if($cancelledBill->hcp_pro_id === $pro->id)
-                            <div class="d-flex align-items-center">
-                                @if($cancelledBill->has_hcp_been_paid)
-                                    <span class="text-dark">Received HCP Amount: </span>
-                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
-                                @else
-                                    <span class="text-dark">Expected HCP Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_amount : '-' }}</span>
-                                @endif
-                            </div>
-                            @endif
-                            @if($cancelledBill->cm_pro_id === $pro->id)
-                            <div class="d-flex align-items-center">
-                                @if($cancelledBill->has_cm_been_paid)
-                                    <span class="text-dark">Received CM Pro Amount: </span>
-                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->cm_payment_amount }}</span>
-                                @else
-                                    <span class="text-dark">Expected CM Pro Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->cm_expected_payment_amount ? '$' . $cancelledBill->cm_expected_payment_amount : '-' }}</span>
                                 @endif
                                 @endif
                             </div>
                             </div>
-                            @endif
-                        </div>
-                    @endforeach
-                @endif
-                @endif
-            </div>
+                        @endif
+                        {{-- cancelled cm bills --}}
+                        @if(count($cancelledCMBills))
+                            @foreach($cancelledCMBills as $cancelledBill)
+                                <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
+                                    <div class="d-flex">
+                                        <div class="">
+                                            Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
+                                            <div class="small text-secondary">Memo: {{$cancelledBill->memo}}</div>
+                                            <div class="small text-secondary">Created: {{friendly_date_time($cancelledBill->created_at)}}</div>
+                                        </div>
+                                        <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
+                                    </div>
+                                    <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                                    @if($cancelledBill->hcp_pro_id === $pro->id)
+                                        <div class="d-flex align-items-center">
+                                            @if($cancelledBill->has_hcp_been_paid)
+                                                <span class="text-dark">Received HCP Amount: </span>
+                                                <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
+                                            @else
+                                                <span class="text-dark">Expected HCP Amount: </span>
+                                                <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_amount : '-' }}</span>
+                                            @endif
+                                        </div>
+                                    @endif
+                                    @if($cancelledBill->cm_pro_id === $pro->id)
+                                        <div class="d-flex align-items-center">
+                                            @if($cancelledBill->has_cm_been_paid)
+                                                <span class="text-dark">Received CM Pro Amount: </span>
+                                                <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->cm_payment_amount }}</span>
+                                            @else
+                                                <span class="text-dark">Expected CM Pro Amount: </span>
+                                                <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->cm_expected_payment_amount ? '$' . $cancelledBill->cm_expected_payment_amount : '-' }}</span>
+                                            @endif
+                                        </div>
+                                    @endif
+                                </div>
+                            @endforeach
+                        @endif
+                    @endif
+                </div>
+            @endif
 
 
             {{-- rm bills --}}
             {{-- rm bills --}}
             <div class="col-6">
             <div class="col-6">
                 @if($patient->is_enrolled_in_rm === 'YES')
                 @if($patient->is_enrolled_in_rm === 'YES')
-                <div class="d-flex align-items-center">
-                    <h6 class="my-0 text-secondary font-weight-bold text-dark">RM Bill
-                        @if($activeRMBill && !$activeRMBill->is_signed_by_hcp)
-                            <span class="small ml-1 text-secondary">(HCP Sign Pending)</span>
+                    <div class="d-flex align-items-center">
+                        <h6 class="my-0 text-secondary font-weight-bold text-dark">RM Bill
+                            @if($activeRMBill && !$activeRMBill->is_signed_by_hcp)
+                                <span class="small ml-1 text-secondary">(HCP Sign Pending)</span>
+                            @else
+                                @if($activeRMBill)
+                                    <span class="small ml-1 text-secondary">(Signed by HCP)</span>
+                                @endif
+                            @endif
+                        </h6>
+                        @if($activeRMBill === false)
+                            <span class="mx-2 text-secondary">|</span>
+                            <div moe>
+                                <a start show class="py-0 mb-3">Generate</a>
+                                <form url="/api/careMonth/generateBillForRm">
+                                    <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
+                                    <div class="mb-2">
+                                        <select class="form-control" name="rmCode" value="">
+                                            <option value="">-- Select RM Code --</option>
+                                            <option value="RMB">RMB</option>
+                                            <option value="RM20">RM20</option>
+                                            <option value="RM30">RM30</option>
+                                            <option value="RM60">RM60</option>
+                                        </select>
+                                    </div>
+                                    <div class="mb-2">
+                                        <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="form-control form-control-sm"></textarea>
+                                    </div>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-primary mr-2" submit>Generate</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
                         @else
                         @else
-                            @if($activeRMBill)
-                                <span class="small ml-1 text-secondary">(Signed by HCP)</span>
+                            @if(!$activeRMBill->is_signed_by_hcp && $activeRMBill->hcp_pro_id === $pro->id)
+                            <span class="mx-2 text-secondary">|</span>
+                            <div moe>
+                                <a start show class="py-0 mb-3 text-success">Sign as HCP</a>
+                                <form url="/api/bill/signAsHcp">
+                                    <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
+                                    <p class="small">Sign this RM bill as HCP?</p>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                            @endif
+                            @if($pro->pro_type === 'ADMIN')
+                            <span class="mx-2 text-secondary">|</span>
+                            <div moe relative>
+                                <a start show class="py-0 mb-3 text-danger">Cancel</a>
+                                <form url="/api/bill/markCancelled" right>
+                                    <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
+                                    <p class="small mb-2">Are you sure you want to cancel this RM bill?</p>
+                                    <div class="mb-2">
+                                        <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
+                                    </div>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
+                                    </div>
+                                </form>
+                            </div>
                             @endif
                             @endif
                         @endif
                         @endif
-                    </h6>
-                    @if($activeRMBill === false)
-                        <span class="mx-2 text-secondary">|</span>
-                        <div moe>
-                            <a start show class="py-0 mb-3">Generate</a>
-                            <form url="/api/careMonth/generateBillForRm">
-                                <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                                <div class="mb-2">
-                                    <select class="form-control" name="rmCode" value="">
-                                        <option value="">-- Select RM Code --</option>
-                                        <option value="RMB">RMB</option>
-                                        <option value="RM20">RM20</option>
-                                        <option value="RM30">RM30</option>
-                                        <option value="RM60">RM60</option>
-                                    </select>
-                                </div>
-                                <div class="mb-2">
-                                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="form-control form-control-sm"></textarea>
-                                </div>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Generate</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @else
-                        @if(!$activeRMBill->is_signed_by_hcp && $activeRMBill->hcp_pro_id === $pro->id)
-                        <span class="mx-2 text-secondary">|</span>
-                        <div moe>
-                            <a start show class="py-0 mb-3 text-success">Sign as HCP</a>
-                            <form url="/api/bill/signAsHcp">
-                                <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                <p class="small">Sign this RM bill as HCP?</p>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                        @endif
-                        @if($pro->pro_type === 'ADMIN')
-                        <span class="mx-2 text-secondary">|</span>
-                        <div moe relative>
-                            <a start show class="py-0 mb-3 text-danger">Cancel</a>
-                            <form url="/api/bill/markCancelled" right>
-                                <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                <p class="small mb-2">Are you sure you want to cancel this RM bill?</p>
-                                <div class="mb-2">
-                                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
-                                </div>
+                    </div>
+                    @if($activeRMBill !== false)
+                        <div class="border bg-white p-2 mt-2">
+                            <div class="">
+                                Code: <span class="font-weight-bold text-dark">{{ $activeRMBill->code }}</span>
+                                <div class="small text-secondary">Memo: {{$activeRMBill->memo}}</div>
+                                <div class="small text-secondary">Created: {{friendly_date_time($activeRMBill->created_at)}}</div>
+                            </div>
+                            <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                            @if($activeRMBill->hcp_pro_id === $pro->id)
                                 <div class="d-flex align-items-center">
                                 <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
-                                </div>
-                            </form>
-                        </div>
-                        @endif
-                    @endif
-                </div>
-                @if($activeRMBill !== false)
-                    <div class="border bg-white p-2 mt-2">
-                        <div class="">
-                            Code: <span class="font-weight-bold text-dark">{{ $activeRMBill->code }}</span>
-                            <div class="small text-secondary">Memo: {{$activeRMBill->memo}}</div>
-                            <div class="small text-secondary">Created: {{friendly_date_time($activeRMBill->created_at)}}</div>
-                        </div>
-                        <div class="font-weight-bold text-dark mt-2 mb-1"></div>
-                        @if($activeRMBill->hcp_pro_id === $pro->id)
-                        <div class="d-flex align-items-center">
-                            @if($activeRMBill->has_hcp_been_paid)
-                                <span class="text-dark">Received HCP Amount: </span>
-                                <span class="font-weight-bold text-success ml-2">${{ $activeRMBill->hcp_payment_amount }}</span>
-                            @else
-                                <span class="text-dark">Expected HCP Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->hcp_expected_payment_amount ? '$' . $activeRMBill->hcp_expected_payment_amount : '-' }}</span>
-                                <span class="ml-auto">
-                                    @if($activeRMBill->is_signed_by_hcp)
-                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                    @if($activeRMBill->has_hcp_been_paid)
+                                        <span class="text-dark">Received HCP Amount: </span>
+                                        <span class="font-weight-bold text-success ml-2">${{ $activeRMBill->hcp_payment_amount }}</span>
                                     @else
                                     @else
-                                        <div class="text-primary ml-3">
-                                            <div moe class="text-dark">
-                                                <a start show class="py-0 mb-3 text-primary text-sm">
-                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
-                                                </a>
-                                                <form url="/api/bill/signAsHcp">
-                                                    <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                                    <p class="small">Sign this RM bill as HCP?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        <span class="text-dark">Expected HCP Amount: </span>
+                                        <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->hcp_expected_payment_amount ? '$' . $activeRMBill->hcp_expected_payment_amount : '-' }}</span>
+                                        <span class="ml-auto">
+                                            @if($activeRMBill->is_signed_by_hcp)
+                                                <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                            @else
+                                                <div class="text-primary ml-3">
+                                                    <div moe class="text-dark">
+                                                        <a start show class="py-0 mb-3 text-primary text-sm">
+                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                        </a>
+                                                        <form url="/api/bill/signAsHcp">
+                                                            <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
+                                                            <p class="small">Sign this RM bill as HCP?</p>
+                                                            <div class="d-flex align-items-center">
+                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
                                                     </div>
                                                     </div>
-                                                </form>
-                                            </div>
-                                        </div>
+                                                </div>
+                                            @endif
+                                        </span>
                                     @endif
                                     @endif
-                                </span>
+                                </div>
                             @endif
                             @endif
-                        </div>
-                        @endif
-                        @if($activeRMBill->rmm_pro_id === $pro->id)
-                        <div class="d-flex align-items-center">
-                            @if($activeRMBill->has_rmm_been_paid)
-                                <span class="text-dark">Received RMM Pro Amount: </span>
-                                <span class="font-weight-bold text-success ml-2">${{ $activeRMBill->rmm_payment_amount }}</span>
-                            @else
-                                <span class="text-dark">Expected RMM Pro Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->rmm_expected_payment_amount ? '$' . $activeRMBill->rmm_expected_payment_amount : '-' }}</span>
-                                <span class="ml-auto">
-                                    @if($activeRMBill->is_signed_by_rmm)
-                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                            @if($activeRMBill->rmm_pro_id === $pro->id)
+                                <div class="d-flex align-items-center">
+                                    @if($activeRMBill->has_rmm_been_paid)
+                                        <span class="text-dark">Received RMM Pro Amount: </span>
+                                        <span class="font-weight-bold text-success ml-2">${{ $activeRMBill->rmm_payment_amount }}</span>
                                     @else
                                     @else
-                                        <div class="text-primary ml-3">
-                                            <div moe class="text-dark">
-                                                <a start show class="py-0 mb-3 text-primary text-sm">
-                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
-                                                </a>
-                                                <form url="/api/bill/signAsRmm">
-                                                    <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                                    <p class="small">Sign this RM bill as RMM Pro?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        <span class="text-dark">Expected RMM Pro Amount: </span>
+                                        <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->rmm_expected_payment_amount ? '$' . $activeRMBill->rmm_expected_payment_amount : '-' }}</span>
+                                        <span class="ml-auto">
+                                            @if($activeRMBill->is_signed_by_rmm)
+                                                <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                            @else
+                                                <div class="text-primary ml-3">
+                                                    <div moe class="text-dark">
+                                                        <a start show class="py-0 mb-3 text-primary text-sm">
+                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                        </a>
+                                                        <form url="/api/bill/signAsRmm">
+                                                            <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
+                                                            <p class="small">Sign this RM bill as RMM Pro?</p>
+                                                            <div class="d-flex align-items-center">
+                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
                                                     </div>
                                                     </div>
-                                                </form>
-                                            </div>
-                                        </div>
+                                                </div>
+                                            @endif
+                                        </span>
                                     @endif
                                     @endif
-                                </span>
+                                </div>
                             @endif
                             @endif
-                        </div>
-                        @endif
-                        @if($activeRMBill->rme_pro_id === $pro->id)
-                        <div class="d-flex align-items-center">
-                            @if($activeRMBill->has_rme_been_paid)
-                                <span class="text-success">Received RME Pro Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">${{ $activeRMBill->rme_payment_amount }}</span>
-                            @else
-                                <span class="text-dark">Expected RME Pro Amount: </span>
-                                <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->rme_expected_payment_amount ? '$' . $activeRMBill->rme_expected_payment_amount : '-' }}</span>
-                                <span class="ml-auto">
-                                    @if($activeRMBill->is_signed_by_rme)
-                                        <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                            @if($activeRMBill->rme_pro_id === $pro->id)
+                                <div class="d-flex align-items-center">
+                                    @if($activeRMBill->has_rme_been_paid)
+                                        <span class="text-success">Received RME Pro Amount: </span>
+                                        <span class="font-weight-bold text-dark ml-2">${{ $activeRMBill->rme_payment_amount }}</span>
                                     @else
                                     @else
-                                        <div class="text-primary ml-3">
-                                            <div moe class="text-dark">
-                                                <a start show class="py-0 mb-3 text-primary text-sm">
-                                                    <i class="fa fa-exclamation-triangle"></i> Sign Pending
-                                                </a>
-                                                <form url="/api/bill/signAsRme">
-                                                    <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
-                                                    <p class="small">Sign this RM bill as RME Pro?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                        <span class="text-dark">Expected RME Pro Amount: </span>
+                                        <span class="font-weight-bold text-dark ml-2">{{ $activeRMBill->rme_expected_payment_amount ? '$' . $activeRMBill->rme_expected_payment_amount : '-' }}</span>
+                                        <span class="ml-auto">
+                                            @if($activeRMBill->is_signed_by_rme)
+                                                <div class="text-secondary ml-3 text-sm"><i class="fa fa-check"></i> Signed</div>
+                                            @else
+                                                <div class="text-primary ml-3">
+                                                    <div moe class="text-dark">
+                                                        <a start show class="py-0 mb-3 text-primary text-sm">
+                                                            <i class="fa fa-exclamation-triangle"></i> Sign Pending
+                                                        </a>
+                                                        <form url="/api/bill/signAsRme">
+                                                            <input type="hidden" name="uid" value="{{ $activeRMBill->uid }}">
+                                                            <p class="small">Sign this RM bill as RME Pro?</p>
+                                                            <div class="d-flex align-items-center">
+                                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
                                                     </div>
                                                     </div>
-                                                </form>
-                                            </div>
-                                        </div>
+                                                </div>
+                                            @endif
+                                        </span>
                                     @endif
                                     @endif
-                                </span>
+                                </div>
                             @endif
                             @endif
                         </div>
                         </div>
-                        @endif
-                    </div>
-                @endif
-                {{-- cancelled rm bills --}}
-                @if(count($cancelledRMBills))
-                    @foreach($cancelledRMBills as $cancelledBill)
-                        <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
-                            <div class="d-flex">
-                                <div class="">
-                                    Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
-                                    <div class="small text-secondary">Memo: {{$cancelledBill->memo}}</div>
-                                    <div class="small text-secondary">Created: {{friendly_date_time($cancelledBill->created_at)}}</div>
-                                </div>
-                                <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
-                            </div>
-                            <div class="font-weight-bold text-dark mt-2 mb-1"></div>
-                            @if($cancelledBill->hcp_pro_id === $pro->id)
-                            <div class="d-flex align-items-center">
-                                @if($cancelledBill->has_hcp_been_paid)
-                                    <span class="text-dark">Received HCP Amount: </span>
-                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
-                                @else
-                                    <span class="text-dark">Expected HCP Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_amount : '-' }}</span>
+                    @endif
+                    {{-- cancelled rm bills --}}
+                    @if(count($cancelledRMBills))
+                        @foreach($cancelledRMBills as $cancelledBill)
+                            <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
+                                <div class="d-flex">
+                                    <div class="">
+                                        Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
+                                        <div class="small text-secondary">Memo: {{$cancelledBill->memo}}</div>
+                                        <div class="small text-secondary">Created: {{friendly_date_time($cancelledBill->created_at)}}</div>
+                                    </div>
+                                    <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
+                                </div>
+                                <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                                @if($cancelledBill->hcp_pro_id === $pro->id)
+                                    <div class="d-flex align-items-center">
+                                        @if($cancelledBill->has_hcp_been_paid)
+                                            <span class="text-dark">Received HCP Amount: </span>
+                                            <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
+                                        @else
+                                            <span class="text-dark">Expected HCP Amount: </span>
+                                            <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_amount : '-' }}</span>
+                                        @endif
+                                    </div>
                                 @endif
                                 @endif
-                            </div>
-                            @endif
-                            @if($cancelledBill->rmm_pro_id === $pro->id)
-                            <div class="d-flex align-items-center">
-                                @if($cancelledBill->has_rmm_been_paid)
-                                    <span class="text-dark">Received RMM Pro Amount: </span>
-                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->rmm_payment_amount }}</span>
-                                @else
-                                    <span class="text-dark">Expected RMM Pro Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->rmm_expected_payment_amount ? '$' . $cancelledBill->rmm_expected_payment_amount : '-' }}</span>
+                                @if($cancelledBill->rmm_pro_id === $pro->id)
+                                    <div class="d-flex align-items-center">
+                                        @if($cancelledBill->has_rmm_been_paid)
+                                            <span class="text-dark">Received RMM Pro Amount: </span>
+                                            <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->rmm_payment_amount }}</span>
+                                        @else
+                                            <span class="text-dark">Expected RMM Pro Amount: </span>
+                                            <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->rmm_expected_payment_amount ? '$' . $cancelledBill->rmm_expected_payment_amount : '-' }}</span>
+                                        @endif
+                                    </div>
                                 @endif
                                 @endif
-                            </div>
-                            @endif
-                            @if($cancelledBill->rme_pro_id === $pro->id)
-                            <div class="d-flex align-items-center">
-                                @if($cancelledBill->has_rme_been_paid)
-                                    <span class="text-success">Received RME Pro Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rme_payment_amount }}</span>
-                                @else
-                                    <span class="text-dark">Expected RME Pro Amount: </span>
-                                    <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->rme_expected_payment_amount ? '$' . $cancelledBill->rme_expected_payment_amount : '-' }}</span>
+                                @if($cancelledBill->rme_pro_id === $pro->id)
+                                    <div class="d-flex align-items-center">
+                                        @if($cancelledBill->has_rme_been_paid)
+                                            <span class="text-success">Received RME Pro Amount: </span>
+                                            <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rme_payment_amount }}</span>
+                                        @else
+                                            <span class="text-dark">Expected RME Pro Amount: </span>
+                                            <span class="font-weight-bold text-dark ml-2">{{ $cancelledBill->rme_expected_payment_amount ? '$' . $cancelledBill->rme_expected_payment_amount : '-' }}</span>
+                                        @endif
+                                    </div>
                                 @endif
                                 @endif
                             </div>
                             </div>
-                            @endif
-                        </div>
-                    @endforeach
-                @endif
+                        @endforeach
+                    @endif
                 @endif
                 @endif
             </div>
             </div>
 
 
         </div>
         </div>
 
 
-        @endif
-
     </div>
     </div>
 @endsection
 @endsection