Browse Source

Care month single - showing RM score out of 16

Vijayakrishnan 4 năm trước cách đây
mục cha
commit
90e5ae3804
1 tập tin đã thay đổi với 912 bổ sung907 xóa
  1. 912 907
      resources/views/app/patient/care-month/dashboard.blade.php

+ 912 - 907
resources/views/app/patient/care-month/dashboard.blade.php

@@ -860,1052 +860,1057 @@
             */ ?>
         </div>
 
-        <hr class="m-negator mt-4 mb-3">
+        @if($careMonth->number_of_days_with_remote_measurements >= 16)
 
-        {{--<div class="row">
+            <hr class="m-negator mt-4 mb-3">
 
-            <!-- rm bills -->
-            <div class="col-12">
-                @if($careMonth->is_client_enrolled_in_rm)
-                    <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">
-                                            <option value="">-- Select RM Code --</option>
-                                            @if($rmCodes && count($rmCodes))
-                                                @foreach($rmCodes as $rmRate)
-                                                    <option value="{{ $rmRate }}">{{ $rmRate }}</option>
-                                                @endforeach
-                                            @endif
-                                        </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
-                            <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
-                    </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>
-                                            @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>
-                                            @endif
-                                        </span>
+            {{--<div class="row">
+
+                <!-- rm bills -->
+                <div class="col-12">
+                    @if($careMonth->is_client_enrolled_in_rm)
+                        <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">
+                                                <option value="">-- Select RM Code --</option>
+                                                @if($rmCodes && count($rmCodes))
+                                                    @foreach($rmCodes as $rmRate)
+                                                        <option value="{{ $rmRate }}">{{ $rmRate }}</option>
+                                                    @endforeach
+                                                @endif
+                                            </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>
-                            @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>
-                                            @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>
-                                            @endif
-                                        </span>
-                                    @endif
+                            @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($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>
-                                            @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>
-                                            @endif
-                                        </span>
-                                    @endif
+                                @endif
+                                <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
                         </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>
+                        @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($cancelledBill->hcp_pro_id === $pro->id)
+                                @if($activeRMBill->hcp_pro_id === $pro->id)
                                     <div class="d-flex align-items-center">
-                                        @if($cancelledBill->has_hcp_been_paid)
+                                        @if($activeRMBill->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>
+                                            <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">{{ $cancelledBill->hcp_expected_payment_amount ? '$' . $cancelledBill->hcp_expected_payment_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>
+                                                @endif
+                                            </span>
                                         @endif
                                     </div>
                                 @endif
-                                @if($cancelledBill->rmm_pro_id === $pro->id)
+                                @if($activeRMBill->rmm_pro_id === $pro->id)
                                     <div class="d-flex align-items-center">
-                                        @if($cancelledBill->has_rmm_been_paid)
+                                        @if($activeRMBill->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>
+                                            <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">{{ $cancelledBill->rmm_expected_payment_amount ? '$' . $cancelledBill->rmm_expected_payment_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>
+                                                @endif
+                                            </span>
                                         @endif
                                     </div>
                                 @endif
-                                @if($cancelledBill->rme_pro_id === $pro->id)
+                                @if($activeRMBill->rme_pro_id === $pro->id)
                                     <div class="d-flex align-items-center">
-                                        @if($cancelledBill->has_rme_been_paid)
+                                        @if($activeRMBill->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>
+                                            <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">{{ $cancelledBill->rme_expected_payment_amount ? '$' . $cancelledBill->rme_expected_payment_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>
+                                                @endif
+                                            </span>
                                         @endif
                                     </div>
                                 @endif
                             </div>
-                        @endforeach
+                        @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
+                                    @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
+                                    @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
+                                </div>
+                            @endforeach
+                        @endif
                     @endif
-                @endif
-            </div>
+                </div>
 
-        </div>
+            </div>
 
-        <hr class="m-negator mt-4 mb-3">--}}
+            <hr class="m-negator mt-4 mb-3">--}}
 
 
 
 
-        {{-- bills --}}
-        @if($pro->pro_type === 'ADMIN' || ($careMonth->mcp && $pro->id === $careMonth->mcp->id))
-            @if($careMonth->bills->count())
-                <div class="">
-                    <div class="d-flex align-items-center mb-2">
-                        <p class="font-weight-bold font-size-13 m-0">RM Bills</p>
-                        @include('app/patient/care-month/_create-bill')
-                    </div>
+            {{-- bills --}}
+            @if($pro->pro_type === 'ADMIN' || ($careMonth->mcp && $pro->id === $careMonth->mcp->id))
+                @if($careMonth->bills->count())
+                    <div class="">
+                        <div class="d-flex align-items-center mb-2">
+                            <p class="font-weight-bold font-size-13 m-0">RM Bills</p>
+                            @include('app/patient/care-month/_create-bill')
+                        </div>
 
-                    @if($pro->pro_type === 'ADMIN')
-                        <table class="table table-sm tabe-striped mb-0 table-bordered">
-                            <thead class="bg-light">
-                            <tr class="text-secondary">
-                                <?php /* <th class="border-bottom-0"></th> */ ?>
-                                <th class="border-bottom-0">Date</th>
-                                <th class="border-bottom-0">Service</th>
-                                <th class="border-bottom-0">Billable</th>
-                                <th class="border-bottom-0">HCP</th>
-                                <th class="border-bottom-0">Total</th>
-                                <th class="border-bottom-0">Sign</th>
-                                <th class="border-bottom-0">Bal Post Date</th>
-                                <th class="border-bottom-0">Verification</th>
-                                <th class="border-bottom-0">Cancellation</th>
-                                <th class="border-bottom-0">Payment</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            @foreach ($careMonth->bills as $bill)
-                                <tr class="{{$bill->is_cancelled ? 'bg-light text-secondary' : ''}}">
-                                    <?php /* <td class="p-0">
-                                        <table class="table-striped table-sm table-condensed border border-left-0 border-top-0 border-bottom-0">
-                                            <tbody>
-                                                <tr><td>collected_amount</td><td>{{$bill->collected_amount}}</td></tr>
-                                                <tr><td>effective_date</td><td>{{$bill->effective_date}}</td></tr>
-                                                <tr><td>has_hcp_been_paid</td><td>{{$bill->has_hcp_been_paid}}</td></tr>
-                                                <tr><td>hcp_expected_payment_amount</td><td>{{$bill->hcp_expected_payment_amount}}</td></tr>
-                                                <tr><td>hcp_payment_amount</td><td>{{$bill->hcp_payment_amount}}</td></tr>
-                                                <tr><td>is_cancelled</td><td>{{$bill->is_cancelled}}</td></tr>
-                                                <tr><td>hcp_payment_pro_transaction_id</td><td>{{$bill->hcp_payment_pro_transaction_id}}</td></tr>
-                                                <tr><td>balance_post_date</td><td>{{$bill->balance_post_date}}</td></tr>
-                                                <tr><td>is_verified</td><td>{{$bill->is_verified}}</td></tr>
-                                                <tr><td>is_cancellation_acknowledged</td><td>{{$bill->is_cancellation_acknowledged}}</td></tr>
-                                                <tr><td>is_cancelled_by_administrator</td><td>{{$bill->is_cancelled_by_administrator}}</td></tr>
-                                                <tr><td>total_expected</td><td>{{$bill->total_expected}}</td></tr>
-                                                <tr><td>total_paid</td><td>{{$bill->total_paid}}</td></tr>
-                                            </tbody>
-                                        </table>
-                                    </td> */ ?>
-                                    <td class="text-nowrap">{{friendlier_date_time($bill->effective_date, false)}}</td>
-                                    <td>{{$bill->code}}</td>
-                                    <td class="">
-                                        @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
-                                            <?php
-                                            $totalSeconds = $bill->number_of_units * 3600;
-                                            $remainder = $totalSeconds % 60;
-                                            if ($remainder !== 0) {
-                                                if ($remainder < 30) {
-                                                    $totalSeconds = $totalSeconds - $remainder;
-                                                }
-                                                else {
-                                                    $totalSeconds = $totalSeconds + (60 - $remainder);
+                        @if($pro->pro_type === 'ADMIN')
+                            <table class="table table-sm tabe-striped mb-0 table-bordered">
+                                <thead class="bg-light">
+                                <tr class="text-secondary">
+                                    <?php /* <th class="border-bottom-0"></th> */ ?>
+                                    <th class="border-bottom-0">Date</th>
+                                    <th class="border-bottom-0">Service</th>
+                                    <th class="border-bottom-0">Billable</th>
+                                    <th class="border-bottom-0">HCP</th>
+                                    <th class="border-bottom-0">Total</th>
+                                    <th class="border-bottom-0">Sign</th>
+                                    <th class="border-bottom-0">Bal Post Date</th>
+                                    <th class="border-bottom-0">Verification</th>
+                                    <th class="border-bottom-0">Cancellation</th>
+                                    <th class="border-bottom-0">Payment</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                @foreach ($careMonth->bills as $bill)
+                                    <tr class="{{$bill->is_cancelled ? 'bg-light text-secondary' : ''}}">
+                                        <?php /* <td class="p-0">
+                                            <table class="table-striped table-sm table-condensed border border-left-0 border-top-0 border-bottom-0">
+                                                <tbody>
+                                                    <tr><td>collected_amount</td><td>{{$bill->collected_amount}}</td></tr>
+                                                    <tr><td>effective_date</td><td>{{$bill->effective_date}}</td></tr>
+                                                    <tr><td>has_hcp_been_paid</td><td>{{$bill->has_hcp_been_paid}}</td></tr>
+                                                    <tr><td>hcp_expected_payment_amount</td><td>{{$bill->hcp_expected_payment_amount}}</td></tr>
+                                                    <tr><td>hcp_payment_amount</td><td>{{$bill->hcp_payment_amount}}</td></tr>
+                                                    <tr><td>is_cancelled</td><td>{{$bill->is_cancelled}}</td></tr>
+                                                    <tr><td>hcp_payment_pro_transaction_id</td><td>{{$bill->hcp_payment_pro_transaction_id}}</td></tr>
+                                                    <tr><td>balance_post_date</td><td>{{$bill->balance_post_date}}</td></tr>
+                                                    <tr><td>is_verified</td><td>{{$bill->is_verified}}</td></tr>
+                                                    <tr><td>is_cancellation_acknowledged</td><td>{{$bill->is_cancellation_acknowledged}}</td></tr>
+                                                    <tr><td>is_cancelled_by_administrator</td><td>{{$bill->is_cancelled_by_administrator}}</td></tr>
+                                                    <tr><td>total_expected</td><td>{{$bill->total_expected}}</td></tr>
+                                                    <tr><td>total_paid</td><td>{{$bill->total_paid}}</td></tr>
+                                                </tbody>
+                                            </table>
+                                        </td> */ ?>
+                                        <td class="text-nowrap">{{friendlier_date_time($bill->effective_date, false)}}</td>
+                                        <td>{{$bill->code}}</td>
+                                        <td class="">
+                                            @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
+                                                <?php
+                                                $totalSeconds = $bill->number_of_units * 3600;
+                                                $remainder = $totalSeconds % 60;
+                                                if ($remainder !== 0) {
+                                                    if ($remainder < 30) {
+                                                        $totalSeconds = $totalSeconds - $remainder;
+                                                    }
+                                                    else {
+                                                        $totalSeconds = $totalSeconds + (60 - $remainder);
+                                                    }
                                                 }
-                                            }
-                                            ?>
-                                            {{ time_in_hrminsec($totalSeconds) }}
-                                        @else
-                                            @if(!!$bill->number_of_units)
-                                                {{ $bill->number_of_units }} unit(s)
+                                                ?>
+                                                {{ time_in_hrminsec($totalSeconds) }}
                                             @else
-                                                -
+                                                @if(!!$bill->number_of_units)
+                                                    {{ $bill->number_of_units }} unit(s)
+                                                @else
+                                                    -
+                                                @endif
                                             @endif
-                                        @endif
-                                    </td>
-                                    <td class="">
-                                        <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }} (HCP)</div>
-                                        <div class="text-nowrap mt-1">
-                                            <span class="text-secondary">Paid: </span>
-                                            <span>{{ $bill->has_hcp_been_paid ? 'Yes' : 'No' }}</span>
-                                        </div>
-                                        @if(!$bill->has_hcp_been_paid)
-                                            <div class="text-nowrap mt-1">
-                                                <span class="text-secondary">Expected: </span>
-                                                <span class="font-weight-bold">${{ $bill->hcp_expected_payment_amount }}</span>
-                                            </div>
-                                        @else
-                                            <div class="text-nowrap mt-1">
-                                                <span class="text-secondary">Amount: </span>
-                                                <span class="font-weight-bold">${{ $bill->hcp_payment_amount }}</span>
-                                            </div>
-                                        @endif
-                                        @if($bill->ally)
-                                            <hr>
-                                            <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->ally->displayName() }} (NA)</div>
+                                        </td>
+                                        <td class="">
+                                            <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }} (HCP)</div>
                                             <div class="text-nowrap mt-1">
                                                 <span class="text-secondary">Paid: </span>
-                                                <span>{{ $bill->has_na_been_paid ? 'Yes' : 'No' }}</span>
+                                                <span>{{ $bill->has_hcp_been_paid ? 'Yes' : 'No' }}</span>
                                             </div>
-                                            @if(!$bill->has_na_been_paid)
+                                            @if(!$bill->has_hcp_been_paid)
                                                 <div class="text-nowrap mt-1">
                                                     <span class="text-secondary">Expected: </span>
-                                                    <span class="font-weight-bold">${{ $bill->na_expected_payment_amount }}</span>
+                                                    <span class="font-weight-bold">${{ $bill->hcp_expected_payment_amount }}</span>
                                                 </div>
                                             @else
                                                 <div class="text-nowrap mt-1">
                                                     <span class="text-secondary">Amount: </span>
-                                                    <span class="font-weight-bold">${{ $bill->na_payment_amount }}</span>
+                                                    <span class="font-weight-bold">${{ $bill->hcp_payment_amount }}</span>
                                                 </div>
                                             @endif
-                                        @endif
+                                            @if($bill->ally)
+                                                <hr>
+                                                <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->ally->displayName() }} (NA)</div>
+                                                <div class="text-nowrap mt-1">
+                                                    <span class="text-secondary">Paid: </span>
+                                                    <span>{{ $bill->has_na_been_paid ? 'Yes' : 'No' }}</span>
+                                                </div>
+                                                @if(!$bill->has_na_been_paid)
+                                                    <div class="text-nowrap mt-1">
+                                                        <span class="text-secondary">Expected: </span>
+                                                        <span class="font-weight-bold">${{ $bill->na_expected_payment_amount }}</span>
+                                                    </div>
+                                                @else
+                                                    <div class="text-nowrap mt-1">
+                                                        <span class="text-secondary">Amount: </span>
+                                                        <span class="font-weight-bold">${{ $bill->na_payment_amount }}</span>
+                                                    </div>
+                                                @endif
+                                            @endif
 
-                                    </td>
-                                    <td class="pr-3">
-                                        @if($bill->has_hcp_been_paid)
-                                            <span class="text-secondary">Paid. </span>
-                                            <span class="font-weight-bold">${{ friendly_money($bill->total_paid) }}</span>
-                                        @else
-                                            <span class="text-secondary">Exp. </span>
-                                            <span class="font-weight-bold">{{ $bill->total_expected ? '$' . friendly_money($bill->total_expected) : '-' }}</span>
-                                        @endif
-                                    </td>
-                                    <td>
-                                        @if(!$bill->is_cancelled)
-                                            @if($bill->is_signed_by_hcp)
-                                                <span class="d-block text-secondary text-nowrap">
-                                                        <i class="fa fa-check"></i>
-                                                        HCP Signed
-                                                    </span>
+                                        </td>
+                                        <td class="pr-3">
+                                            @if($bill->has_hcp_been_paid)
+                                                <span class="text-secondary">Paid. </span>
+                                                <span class="font-weight-bold">${{ friendly_money($bill->total_paid) }}</span>
                                             @else
-                                                <span moe
-                                                      class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
-                                                      title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
-                                                    <a class="" href="" show start>Sign As HCP</a>
-                                                    <form url="/api/bill/signAsHcp">
+                                                <span class="text-secondary">Exp. </span>
+                                                <span class="font-weight-bold">{{ $bill->total_expected ? '$' . friendly_money($bill->total_expected) : '-' }}</span>
+                                            @endif
+                                        </td>
+                                        <td>
+                                            @if(!$bill->is_cancelled)
+                                                @if($bill->is_signed_by_hcp)
+                                                    <span class="d-block text-secondary text-nowrap">
+                                                            <i class="fa fa-check"></i>
+                                                            HCP Signed
+                                                        </span>
+                                                @else
+                                                    <span moe
+                                                          class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                          title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
+                                                        <a class="" href="" show start>Sign As HCP</a>
+                                                        <form url="/api/bill/signAsHcp">
+                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                            <p>Sign this bill as HCP?</p>
+                                                            <div class="mb-0">
+                                                                <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </span>
+                                                @endif
+                                            @endif
+                                        </td>
+                                        <td>
+                                            @if(!$bill->is_cancelled)
+                                                <span class="d-block" moe>
+                                                    <a class="" href="" show start>
+                                                        {{$bill->balance_post_date ? friendlier_date_time($bill->balance_post_date, false) : '(not set)' }}
+                                                    </a>
+                                                    <form url="/api/bill/updateBalancePostDate">
                                                         <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                        <p>Sign this bill as HCP?</p>
+                                                        <p>Update Balance Post Date</p>
                                                         <div class="mb-0">
-                                                            <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                            <input type="date" class="text form-control form-control-sm" name="balancePostDate" value="{{$bill->balance_post_date}}" placeholder="balance post date"><br>
+                                                            <button class="btn btn-success btn-sm" submit>Submit</button>
                                                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                                                         </div>
                                                     </form>
                                                 </span>
                                             @endif
-                                        @endif
-                                    </td>
-                                    <td>
-                                        @if(!$bill->is_cancelled)
-                                            <span class="d-block" moe>
-                                                <a class="" href="" show start>
-                                                    {{$bill->balance_post_date ? friendlier_date_time($bill->balance_post_date, false) : '(not set)' }}
-                                                </a>
-                                                <form url="/api/bill/updateBalancePostDate">
-                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                    <p>Update Balance Post Date</p>
-                                                    <div class="mb-0">
-                                                        <input type="date" class="text form-control form-control-sm" name="balancePostDate" value="{{$bill->balance_post_date}}" placeholder="balance post date"><br>
-                                                        <button class="btn btn-success btn-sm" submit>Submit</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
-                                        @endif
-                                    </td>
-                                    <td> <!-- verification -->
-                                        @if($pro->pro_type === 'ADMIN' && !$bill->is_cancelled)
-                                            @if(!$bill->is_verified)
-                                                <div class="text-warning-mellow font-weight-bold">Not Verified</div>
-                                                <span class="d-block mt-1" moe>
-                                                    <a href="" show start>Mark Verified</a>
-                                                    <form url="/api/bill/markAsVerified">
+                                        </td>
+                                        <td> <!-- verification -->
+                                            @if($pro->pro_type === 'ADMIN' && !$bill->is_cancelled)
+                                                @if(!$bill->is_verified)
+                                                    <div class="text-warning-mellow font-weight-bold">Not Verified</div>
+                                                    <span class="d-block mt-1" moe>
+                                                        <a href="" show start>Mark Verified</a>
+                                                        <form url="/api/bill/markAsVerified">
+                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                            <p>Mark As Verfified?</p>
+                                                            <div class="mb-0">
+                                                                <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </span>
+                                                @else
+                                                    <div class="text-success font-weight-bold"><i class="fa fa-check"></i> Verified</div>
+                                                    <span class="d-block mt-1" moe>
+                                                        <a class="" href="" show start>Undo</a>
+                                                        <form url="/api/bill/undoMarkAsVerified">
+                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                            <p>Undo Mark As Verfified?</p>
+                                                            <div class="mb-0">
+                                                                <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </span>
+                                                @endif
+                                            @endif
+                                        </td>
+                                        <td>  <!-- cancellation -->
+                                            @if($bill->is_cancelled)
+                                                <div class="text-warning-mellow font-weight-bold">Cancelled</div>
+                                                @if($bill->cancellation_memo)
+                                                    <div class="text-dark text-sm font-italic my-1">{{$bill->cancellation_memo}}</div>
+                                                @endif
+                                                @if($bill->is_cancelled_by_administrator)
+                                                    <div class="text-secondary text-sm">(by Administrator)</div>
+                                                @endif
+                                                <div moe class="mt-1">
+                                                    <a class="" href="" show start>Update Memo</a>
+                                                    <form url="/api/bill/updateCancellationMemo">
                                                         <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                        <p>Mark As Verfified?</p>
-                                                        <div class="mb-0">
+                                                        <p>Update Cancellation Memo</p>
+                                                        <div class="mb-2">
+                                                            <textarea class="text form-control form-control-sm" name="cancellationMemo" placeholder="">{{$bill->cancellation_memo ? $bill->cancellation_memo : 'Insufficient documentation for billable service.'}}</textarea>
+                                                        </div>
+                                                        <div>
                                                             <button class="btn btn-success btn-sm" submit>Submit</button>
                                                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                                                         </div>
                                                     </form>
-                                                </span>
+                                                </div>
                                             @else
-                                                <div class="text-success font-weight-bold"><i class="fa fa-check"></i> Verified</div>
-                                                <span class="d-block mt-1" moe>
-                                                    <a class="" href="" show start>Undo</a>
-                                                    <form url="/api/bill/undoMarkAsVerified">
+                                                <span class="d-block" moe relative="">
+                                                    <a class="text-danger" href="" show start>Cancel</a>
+                                                    <form url="/api/bill/markCancelled" right="">
                                                         <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                        <p>Undo Mark As Verfified?</p>
+                                                        <p class="mb-2">Cancel this bill?</p>
+                                                        <div class="mb-2">
+                                                            <label class="mb-1 text-secondary">Cancellation Memo</label>
+                                                            <textarea type="text" name="memo" placeholder="Memo" class="form-control form-control-sm">Insufficient documentation for billable service.</textarea>
+                                                        </div>
                                                         <div class="mb-0">
-                                                            <button class="btn btn-success btn-sm" submit>Submit</button>
-                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                            <button class="btn btn-danger btn-sm" submit>Yes</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>No</button>
                                                         </div>
                                                     </form>
                                                 </span>
                                             @endif
-                                        @endif
-                                    </td>
-                                    <td>  <!-- cancellation -->
-                                        @if($bill->is_cancelled)
-                                            <div class="text-warning-mellow font-weight-bold">Cancelled</div>
-                                            @if($bill->cancellation_memo)
-                                                <div class="text-dark text-sm font-italic my-1">{{$bill->cancellation_memo}}</div>
-                                            @endif
-                                            @if($bill->is_cancelled_by_administrator)
-                                                <div class="text-secondary text-sm">(by Administrator)</div>
-                                            @endif
-                                            <div moe class="mt-1">
-                                                <a class="" href="" show start>Update Memo</a>
-                                                <form url="/api/bill/updateCancellationMemo">
-                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                    <p>Update Cancellation Memo</p>
-                                                    <div class="mb-2">
-                                                        <textarea class="text form-control form-control-sm" name="cancellationMemo" placeholder="">{{$bill->cancellation_memo ? $bill->cancellation_memo : 'Insufficient documentation for billable service.'}}</textarea>
-                                                    </div>
-                                                    <div>
-                                                        <button class="btn btn-success btn-sm" submit>Submit</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        @else
-                                            <span class="d-block" moe relative="">
-                                                <a class="text-danger" href="" show start>Cancel</a>
-                                                <form url="/api/bill/markCancelled" right="">
-                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                    <p class="mb-2">Cancel this bill?</p>
-                                                    <div class="mb-2">
-                                                        <label class="mb-1 text-secondary">Cancellation Memo</label>
-                                                        <textarea type="text" name="memo" placeholder="Memo" class="form-control form-control-sm">Insufficient documentation for billable service.</textarea>
-                                                    </div>
-                                                    <div class="mb-0">
-                                                        <button class="btn btn-danger btn-sm" submit>Yes</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>No</button>
-                                                    </div>
-                                                </form>
-                                            </span>
-                                        @endif
 
-                                        @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
-                                            <div class="mt-2 text-secondary">
-                                                <i class="fa fa-exclamation-triangle"></i>
-                                                Not Acknowledged
-                                            </div>
-                                            <div class="d-block mt-1" moe>
-                                                <a class="" href="" show start>Ack. Cancellation</a>
-                                                <form url="/api/bill/acknowledgeCancellation">
-                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                    <p>Acknowledge Cancellation?</p>
-                                                    <div class="mb-0">
-                                                        {{--<input type="text" class="text form-control form-control-sm" name="cancellationMemo" value="{{$bill->cancellation_memo}}" placeholder=""><br>--}}
-                                                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        @endif
-
-                                        @if($bill->is_cancellation_acknowledged && !$careMonth->is_billing_marked_done)
-                                            <div class="mt-2 text-secondary">
-                                                <i class="fa fa-check"></i>
-                                                Acknowledged
-                                            </div>
-                                            <div class="d-block mt-1" moe>
-                                                <a class="" href="" show start>Undo Cancellation Ack.</a>
-                                                <form url="/api/bill/undoAcknowledgeCancellation">
-                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                    <p>Undo Acknowledge Cancellation?</p>
-                                                    <div class="mb-0">
-                                                        <button class="btn btn-success btn-sm" submit>Submit</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        @endif
-
-                                    </td>
-                                    <td> <!-- submit payment -->
-                                        <div class="my-1">
-                                            @if(!$bill->is_cancelled && !$bill->has_hcp_been_paid)
-                                                <span class="d-block" moe relative="">
-                                                    <a class="font-weight-bold" href="" show start>Submit Payment For HCP</a>
-                                                    <form url="/api/bill/payHcpAmount" right>
+                                            @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
+                                                <div class="mt-2 text-secondary">
+                                                    <i class="fa fa-exclamation-triangle"></i>
+                                                    Not Acknowledged
+                                                </div>
+                                                <div class="d-block mt-1" moe>
+                                                    <a class="" href="" show start>Ack. Cancellation</a>
+                                                    <form url="/api/bill/acknowledgeCancellation">
                                                         <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                        <p>Submit Payment</p>
+                                                        <p>Acknowledge Cancellation?</p>
                                                         <div class="mb-0">
-                                                            <input type="text" class="text form-control form-control-sm" name="hcpPaymentAmount" value="{{$bill->hcp_expected_payment_amount}}" placeholder="amount"><br>
-                                                            <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                            {{--<input type="text" class="text form-control form-control-sm" name="cancellationMemo" value="{{$bill->cancellation_memo}}" placeholder=""><br>--}}
+                                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
                                                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                                                         </div>
                                                     </form>
-                                                </span>
+                                                </div>
                                             @endif
-                                        </div>
-                                        <div class="my-1">
-                                            @if(!$bill->is_cancelled && !$bill->has_na_been_paid && $bill->ally)
-                                                <span class="d-block" moe relative="">
-                                                    <a class="font-weight-bold" href="" show start>Submit Payment For NA</a>
-                                                    <form url="/api/bill/payNaAmount" right>
+
+                                            @if($bill->is_cancellation_acknowledged && !$careMonth->is_billing_marked_done)
+                                                <div class="mt-2 text-secondary">
+                                                    <i class="fa fa-check"></i>
+                                                    Acknowledged
+                                                </div>
+                                                <div class="d-block mt-1" moe>
+                                                    <a class="" href="" show start>Undo Cancellation Ack.</a>
+                                                    <form url="/api/bill/undoAcknowledgeCancellation">
                                                         <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                        <p>Submit Payment For NA</p>
+                                                        <p>Undo Acknowledge Cancellation?</p>
                                                         <div class="mb-0">
-                                                            <input type="text" class="text form-control form-control-sm" name="naPaymentAmount" value="{{$bill->na_expected_payment_amount}}" placeholder="amount"><br>
                                                             <button class="btn btn-success btn-sm" submit>Submit</button>
                                                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                                                         </div>
                                                     </form>
-                                                </span>
+                                                </div>
                                             @endif
-                                        </div>
-                                    </td>
-                                </tr>
-                            @endforeach
-                            </tbody>
-                        </table>
-                    @else
-                        <table class="table table-sm tabe-striped mb-3 border-left border-right border-bottom">
-                            <thead class="bg-light">
-                            <tr>
-                                <th class="border-bottom-0 pl-3">HCP</th>
-                                <th class="border-bottom-0 w-25 pl-3">Service</th>
-                                {{--<th class="border-bottom-0 w-25 pl-2">Reason</th>--}}
-                                <th class="border-bottom-0 pl-3">Billable</th>
-                                <th class="border-bottom-0 pl-2">Amount</th>
-                                <th class="border-bottom-0"></th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            @foreach ($careMonth->bills as $bill)
+
+                                        </td>
+                                        <td> <!-- submit payment -->
+                                            <div class="my-1">
+                                                @if(!$bill->is_cancelled && !$bill->has_hcp_been_paid)
+                                                    <span class="d-block" moe relative="">
+                                                        <a class="font-weight-bold" href="" show start>Submit Payment For HCP</a>
+                                                        <form url="/api/bill/payHcpAmount" right>
+                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                            <p>Submit Payment</p>
+                                                            <div class="mb-0">
+                                                                <input type="text" class="text form-control form-control-sm" name="hcpPaymentAmount" value="{{$bill->hcp_expected_payment_amount}}" placeholder="amount"><br>
+                                                                <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </span>
+                                                @endif
+                                            </div>
+                                            <div class="my-1">
+                                                @if(!$bill->is_cancelled && !$bill->has_na_been_paid && $bill->ally)
+                                                    <span class="d-block" moe relative="">
+                                                        <a class="font-weight-bold" href="" show start>Submit Payment For NA</a>
+                                                        <form url="/api/bill/payNaAmount" right>
+                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                            <p>Submit Payment For NA</p>
+                                                            <div class="mb-0">
+                                                                <input type="text" class="text form-control form-control-sm" name="naPaymentAmount" value="{{$bill->na_expected_payment_amount}}" placeholder="amount"><br>
+                                                                <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </span>
+                                                @endif
+                                            </div>
+                                        </td>
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                        @else
+                            <table class="table table-sm tabe-striped mb-3 border-left border-right border-bottom">
+                                <thead class="bg-light">
                                 <tr>
-                                    <td class="pl-3">{{ $bill->hcp->displayName() }}</td>
-                                    <td class="pl-3 {{ $bill->is_cancelled ? 'text-secondary' : '' }}">{{$bill->code}}</td>
-                                    {{--<td class="pl-2">
-                                        {{ $bill->reason1 }}
-                                        <div class="text-secondary small">{{ $bill->reason2 }}</div>
-                                    </td>--}}
-                                    <td class="pl-3">
-                                        @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
-                                            <?php
-                                            $totalSeconds = $bill->number_of_units * 3600;
-                                            $remainder = $totalSeconds % 60;
-                                            if ($remainder !== 0) {
-                                                if ($remainder < 30) {
-                                                    $totalSeconds = $totalSeconds - $remainder;
-                                                }
-                                                else {
-                                                    $totalSeconds = $totalSeconds + (60 - $remainder);
+                                    <th class="border-bottom-0 pl-3">HCP</th>
+                                    <th class="border-bottom-0 w-25 pl-3">Service</th>
+                                    {{--<th class="border-bottom-0 w-25 pl-2">Reason</th>--}}
+                                    <th class="border-bottom-0 pl-3">Billable</th>
+                                    <th class="border-bottom-0 pl-2">Amount</th>
+                                    <th class="border-bottom-0"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                @foreach ($careMonth->bills as $bill)
+                                    <tr>
+                                        <td class="pl-3">{{ $bill->hcp->displayName() }}</td>
+                                        <td class="pl-3 {{ $bill->is_cancelled ? 'text-secondary' : '' }}">{{$bill->code}}</td>
+                                        {{--<td class="pl-2">
+                                            {{ $bill->reason1 }}
+                                            <div class="text-secondary small">{{ $bill->reason2 }}</div>
+                                        </td>--}}
+                                        <td class="pl-3">
+                                            @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
+                                                <?php
+                                                $totalSeconds = $bill->number_of_units * 3600;
+                                                $remainder = $totalSeconds % 60;
+                                                if ($remainder !== 0) {
+                                                    if ($remainder < 30) {
+                                                        $totalSeconds = $totalSeconds - $remainder;
+                                                    }
+                                                    else {
+                                                        $totalSeconds = $totalSeconds + (60 - $remainder);
+                                                    }
                                                 }
-                                            }
-                                            ?>
-                                            {{ time_in_hrminsec($totalSeconds) }}
-                                        @else
-                                            @if(!!$bill->number_of_units)
-                                                {{ $bill->number_of_units }} unit(s)
+                                                ?>
+                                                {{ time_in_hrminsec($totalSeconds) }}
                                             @else
-                                                -
+                                                @if(!!$bill->number_of_units)
+                                                    {{ $bill->number_of_units }} unit(s)
+                                                @else
+                                                    -
+                                                @endif
                                             @endif
-                                        @endif
-                                    </td>
-                                    <td class="pl-2">
-                                        @if($bill->has_hcp_been_paid)
-                                            <span class="text-dark">Processed:</span><span class="font-weight-bold text-success ml-2">${{ $bill->hcp_payment_amount }}</span>
-                                        @else
-                                            <span class="text-dark">Expected:</span><span class="font-weight-bold text-dark ml-2">{{ $bill->hcp_expected_payment_amount ? '$' . $bill->hcp_expected_payment_amount : '-' }}</span>
-                                        @endif
-                                    </td>
-                                    <td>
-                                        <div class="d-flex align-items-center">
-                                            @if(!$bill->is_cancelled)
-                                                @if($bill->is_signed_by_hcp)
+                                        </td>
+                                        <td class="pl-2">
+                                            @if($bill->has_hcp_been_paid)
+                                                <span class="text-dark">Processed:</span><span class="font-weight-bold text-success ml-2">${{ $bill->hcp_payment_amount }}</span>
+                                            @else
+                                                <span class="text-dark">Expected:</span><span class="font-weight-bold text-dark ml-2">{{ $bill->hcp_expected_payment_amount ? '$' . $bill->hcp_expected_payment_amount : '-' }}</span>
+                                            @endif
+                                        </td>
+                                        <td>
+                                            <div class="d-flex align-items-center">
+                                                @if(!$bill->is_cancelled)
+                                                    @if($bill->is_signed_by_hcp)
+                                                        <span class="d-block text-secondary">
+                                                            <i class="fa fa-check"></i>
+                                                            HCP Signed
+                                                        </span>
+                                                    @else
+                                                        <span moe
+                                                              class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                              title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
+                                                            <a class="" href="" show start>Sign</a>
+                                                            <form url="/api/bill/signAsHcp">
+                                                                <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                                <p>Sign this bill as HCP?</p>
+                                                                <div class="mb-0">
+                                                                    <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                </div>
+                                                            </form>
+                                                        </span>
+                                                    @endif
+                                                @endif
+                                                @if(!$bill->has_hcp_been_paid && $pro->pro_type === 'ADMIN')
+                                                    <span class="mx-2 text-secondary">|</span>
+                                                    <span class="d-block" moe>
+                                                        <a class="text-danger" href="" show start>Submit Payment</a>
+                                                        <form url="/api/bill/payHcpAmount">
+                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                            <p>Submit payment:</p>
+                                                            <div class="mb-0">
+                                                                <input type="text" class="text form-control form-control-sm" name="hcpPaymentAmount" value="{{$bill->hcp_expected_payment_amount}}" placeholder="amount"><br>
+                                                                <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </span>
+                                                @endif
+                                                @if($bill->is_cancelled)
+                                                    <span class="mx-2 text-secondary">|</span>
                                                     <span class="d-block text-secondary">
-                                                        <i class="fa fa-check"></i>
-                                                        HCP Signed
+                                                        Cancelled
                                                     </span>
                                                 @else
-                                                    <span moe
-                                                          class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
-                                                          title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
-                                                        <a class="" href="" show start>Sign</a>
-                                                        <form url="/api/bill/signAsHcp">
+                                                    <span class="mx-2 text-secondary">|</span>
+                                                    <span class="d-block" moe>
+                                                        <a class="text-danger" href="" show start>Cancel</a>
+                                                        <form url="/api/bill/markCancelled" right>
                                                             <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                            <p>Sign this bill as HCP?</p>
+                                                            <p>Cancel this bill?</p>
                                                             <div class="mb-0">
-                                                                <button class="btn btn-success btn-sm" submit>Sign</button>
-                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                <button class="btn btn-danger btn-sm" submit>Yes</button>
+                                                                <button class="btn btn-default border btn-sm" cancel>No</button>
                                                             </div>
                                                         </form>
                                                     </span>
                                                 @endif
-                                            @endif
-                                            @if(!$bill->has_hcp_been_paid && $pro->pro_type === 'ADMIN')
-                                                <span class="mx-2 text-secondary">|</span>
-                                                <span class="d-block" moe>
-                                                    <a class="text-danger" href="" show start>Submit Payment</a>
-                                                    <form url="/api/bill/payHcpAmount">
-                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                        <p>Submit payment:</p>
-                                                        <div class="mb-0">
-                                                            <input type="text" class="text form-control form-control-sm" name="hcpPaymentAmount" value="{{$bill->hcp_expected_payment_amount}}" placeholder="amount"><br>
-                                                            <button class="btn btn-success btn-sm" submit>Submit</button>
-                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                        </div>
-                                                    </form>
-                                                </span>
-                                            @endif
-                                            @if($bill->is_cancelled)
-                                                <span class="mx-2 text-secondary">|</span>
-                                                <span class="d-block text-secondary">
-                                                    Cancelled
-                                                </span>
-                                            @else
-                                                <span class="mx-2 text-secondary">|</span>
-                                                <span class="d-block" moe>
-                                                    <a class="text-danger" href="" show start>Cancel</a>
-                                                    <form url="/api/bill/markCancelled" right>
-                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                        <p>Cancel this bill?</p>
-                                                        <div class="mb-0">
-                                                            <button class="btn btn-danger btn-sm" submit>Yes</button>
-                                                            <button class="btn btn-default border btn-sm" cancel>No</button>
-                                                        </div>
-                                                    </form>
-                                                </span>
-                                            @endif
-                                        </div>
-                                    </td>
-                                </tr>
-                            @endforeach
-                            </tbody>
-                        </table>
-                    @endif
-                </div>
-            @else
-                <div class="d-flex">
-                    <p class="font-weight-bold mb-0">No bills in this care month</p>
-                    @include('app/patient/care-month/_create-bill')
-                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                        @endif
+                    </div>
+                @else
+                    <div class="d-flex">
+                        <p class="font-weight-bold mb-0">No bills in this care month</p>
+                        @include('app/patient/care-month/_create-bill')
+                    </div>
+                @endif
             @endif
-        @endif
 
 
-        <hr class="m-negator mt-4 mb-3">
+            <hr class="m-negator mt-4 mb-3">
 
-        {{-- claims --}}
-        @if($pro->pro_type === 'ADMIN')
-            @if($careMonth->claims->count())
-                <div class="">
-                    <div class="d-flex align-items-center mb-2">
-                        <p class="font-weight-bold m-0">Claims</p>
-                        @include('app/patient/care-month/_create-claim')
-                        <div class="ml-auto">
-                            <select class="form-control form-control-sm"
-                                    onchange="fastLoad('{{route('patients.view.care-months.view.dashboard', ['patient' => $patient, 'careMonth' => $careMonth])}}?claims-filter=' + this.value)">
-                                <option value="active" {{!request('claims-filter') || request('claims-filter') === 'active' ? 'selected' : ''}}>Active Claims</option>
-                                <option value="all" {{request('claims-filter') === 'all' ? 'selected' : ''}}>All Claims</option>
-                            </select>
+            {{-- claims --}}
+            @if($pro->pro_type === 'ADMIN')
+                @if($careMonth->claims->count())
+                    <div class="">
+                        <div class="d-flex align-items-center mb-2">
+                            <p class="font-weight-bold m-0">Claims</p>
+                            @include('app/patient/care-month/_create-claim')
+                            <div class="ml-auto">
+                                <select class="form-control form-control-sm"
+                                        onchange="fastLoad('{{route('patients.view.care-months.view.dashboard', ['patient' => $patient, 'careMonth' => $careMonth])}}?claims-filter=' + this.value)">
+                                    <option value="active" {{!request('claims-filter') || request('claims-filter') === 'active' ? 'selected' : ''}}>Active Claims</option>
+                                    <option value="all" {{request('claims-filter') === 'all' ? 'selected' : ''}}>All Claims</option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
 
-                    <table class="table table-sm tabe-striped mb-3 border-left border-right border-bottom">
-                        <thead class="bg-light">
-                        <tr>
-                            <th class="border-bottom-0 pl-2">IID</th>
-                            <th class="border-bottom-0">Details</th>
-                            <th class="border-bottom-0">Current Version</th>
-                            <th class="border-bottom-0">Status</th>
-                            <th class="border-bottom-0">Submissions</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        @foreach ($careMonth->claims as $claim)
-                            @if($claim->status !== 'CANCELLED' || request('claims-filter') === 'all')
-                                <tr class="bg-secondary on-hover-opaque">
-                                    <td colspan="5" class="pt-0 pb-1"></td>
-                                </tr>
-                                <tr class="{{ $claim->status === 'CANCELLED' ? 'text-secondary bg-light on-hover-opaque' : '' }}">
-                                    <td class="pl-2">
-                                        <div>{{ $claim->iid }}</div>
-                                        @if($claim->status === 'CANCELLED')
-                                            <div class="text-secondary font-weight-bold text-sm mt-1">[CANCELLED]</div>
-                                        @else
-                                            <div moe class="text-left mt-1" title="Cancel Claim">
-                                                <a class="" href="" show start>Cancel</a>
-                                                <form url="/api/claim/updateStatus">
-                                                    <input type="hidden" name="uid" value="{{$claim->uid}}">
-                                                    <input type="hidden" name="status" value="CANCELLED">
-                                                    <p>Cancel this claim?</p>
-                                                    <div class="mb-2">
-                                                        <label for="" class="control-label">Cancellation Memo</label>
-                                                        <textarea name="memo" class="form-control"></textarea>
-                                                    </div>
-                                                    <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>
-                                        @endif
-                                    </td>
-                                    <td class="p-0 border-left border-right">
-                                        @if($claim->lines->count())
-                                            <table class="table table-sm table-condensed border-0 mb-0">
-                                                <thead>
-                                                <tr class="bg-light">
-                                                    <th class="border-0">CPT</th>
-                                                    <th class="border-0">DOS</th>
-                                                    <th class="border-0">ICDs</th>
-                                                </tr>
-                                                </thead>
-                                                <tbody class="pb-3">
-                                                @foreach($claim->lines as $line)
-                                                    <tr class="claim-line">
-                                                        <td>{{$line->cpt}}</td>
-                                                        <td class="text-nowrap">{{friendlier_date($line->date_of_service)}}</td>
-                                                        <td>
-                                                            @if(count($line->claimLineIcds))
-                                                                @foreach($line->claimLineIcds as $icd)
-                                                                    <div>
-                                                                        <b class="c-pointer border-secondary border-bottom" title="{{$icd->description}}">{{$icd->code}}</b>
-                                                                    </div>
-                                                                @endforeach
-                                                            @else
-                                                                <p>No ICDs set</p>
-                                                            @endif
-                                                        </td>
+                        <table class="table table-sm tabe-striped mb-3 border-left border-right border-bottom">
+                            <thead class="bg-light">
+                            <tr>
+                                <th class="border-bottom-0 pl-2">IID</th>
+                                <th class="border-bottom-0">Details</th>
+                                <th class="border-bottom-0">Current Version</th>
+                                <th class="border-bottom-0">Status</th>
+                                <th class="border-bottom-0">Submissions</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach ($careMonth->claims as $claim)
+                                @if($claim->status !== 'CANCELLED' || request('claims-filter') === 'all')
+                                    <tr class="bg-secondary on-hover-opaque">
+                                        <td colspan="5" class="pt-0 pb-1"></td>
+                                    </tr>
+                                    <tr class="{{ $claim->status === 'CANCELLED' ? 'text-secondary bg-light on-hover-opaque' : '' }}">
+                                        <td class="pl-2">
+                                            <div>{{ $claim->iid }}</div>
+                                            @if($claim->status === 'CANCELLED')
+                                                <div class="text-secondary font-weight-bold text-sm mt-1">[CANCELLED]</div>
+                                            @else
+                                                <div moe class="text-left mt-1" title="Cancel Claim">
+                                                    <a class="" href="" show start>Cancel</a>
+                                                    <form url="/api/claim/updateStatus">
+                                                        <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                        <input type="hidden" name="status" value="CANCELLED">
+                                                        <p>Cancel this claim?</p>
+                                                        <div class="mb-2">
+                                                            <label for="" class="control-label">Cancellation Memo</label>
+                                                            <textarea name="memo" class="form-control"></textarea>
+                                                        </div>
+                                                        <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>
+                                            @endif
+                                        </td>
+                                        <td class="p-0 border-left border-right">
+                                            @if($claim->lines->count())
+                                                <table class="table table-sm table-condensed border-0 mb-0">
+                                                    <thead>
+                                                    <tr class="bg-light">
+                                                        <th class="border-0">CPT</th>
+                                                        <th class="border-0">DOS</th>
+                                                        <th class="border-0">ICDs</th>
                                                     </tr>
-                                                @endforeach
-                                                </tbody>
-                                            </table>
-                                        @else
-                                            <p>No lines for this claim</p>
-                                        @endif
-                                    </td>
-                                    <td class="border-right">
-                                        {{$claim->currentVersion ? friendlier_date_time($claim->currentVersion->created_at) : '-'}}
-                                    </td>
-                                    <td class="border-right p-0">
-
-                                        <!-- status -->
-                                        <div class="p-1 border-bottom">
-                                            <div>
-                                                {{$claim->status ? $claim->status : '(not set)'}}
-                                                @if($claim->status !== 'CANCELLED')
-                                                    <span moe class="d-inline-block text-left ml-1" title="Update Status">
-                                                            <a class="" href="" show start><i class="fa fa-edit"></i></a>
-                                                            <form url="/api/claim/updateStatus">
-                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
-                                                                <div class="mb-2">
-                                                                    <label for="" class="control-label">Status</label>
-                                                                    <select name="status" class="form-control form-control-sm" required>
-                                                                        <option value="">-- select --</option>
-                                                                        <option value="NEW" {{$claim->status === 'NEW' ? 'selected' : ''}}>New</option>
-                                                                        <option value="PROCESSING" {{$claim->status === 'PROCESSING' ? 'selected' : ''}}>Processing</option>
-                                                                        <option value="SUBMITTED" {{$claim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
-                                                                    </select>
-                                                                </div>
-                                                                <div class="mb-2">
-                                                                    <label for="" class="control-label">Status Memo</label>
-                                                                    <textarea name="memo" class="form-control"></textarea>
-                                                                </div>
-                                                                <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>
-                                                        </span>
-                                                @endif
-                                            </div>
-                                            @if($claim->status_memo)
-                                                <div class="text-secondary font-italic text-sm">{{$claim->status_memo}}</div>
+                                                    </thead>
+                                                    <tbody class="pb-3">
+                                                    @foreach($claim->lines as $line)
+                                                        <tr class="claim-line">
+                                                            <td>{{$line->cpt}}</td>
+                                                            <td class="text-nowrap">{{friendlier_date($line->date_of_service)}}</td>
+                                                            <td>
+                                                                @if(count($line->claimLineIcds))
+                                                                    @foreach($line->claimLineIcds as $icd)
+                                                                        <div>
+                                                                            <b class="c-pointer border-secondary border-bottom" title="{{$icd->description}}">{{$icd->code}}</b>
+                                                                        </div>
+                                                                    @endforeach
+                                                                @else
+                                                                    <p>No ICDs set</p>
+                                                                @endif
+                                                            </td>
+                                                        </tr>
+                                                    @endforeach
+                                                    </tbody>
+                                                </table>
+                                            @else
+                                                <p>No lines for this claim</p>
                                             @endif
-                                        </div>
+                                        </td>
+                                        <td class="border-right">
+                                            {{$claim->currentVersion ? friendlier_date_time($claim->currentVersion->created_at) : '-'}}
+                                        </td>
+                                        <td class="border-right p-0">
 
-                                        <!-- payer, company, location -->
-                                        {{--
-                                        <div class="p-1">
-                                            <div class="mt-1">
-                                                <span class="text-secondary text-sm">Payer (1°): </span>
-                                                <b>{{$claim->primaryPayer ? $claim->primaryPayer->name : '-'}}</b>
-                                                @if($claim->status !== 'CANCELLED')
-                                                    <span moe class="ml-1">
-                                                            <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
-                                                            <form url="/api/claim/putPrimaryPayer">
-                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
-                                                                <div class="mb-2">
-                                                                    <select name="primaryPayerUid" class="form-control form-control-sm">
-                                                                        <option value="">-- select --</option>
-                                                                        @foreach($note->hcpPro->companyProPayers as $companyProPayer)
-                                                                            <option value="{{$companyProPayer->payer->uid}}"
-                                                                                    {{$claim->primaryPayer && $claim->primaryPayer->uid === $companyProPayer->payer->uid ? 'selected' : ''}}>{{$companyProPayer->payer->name}}</option>
-                                                                        @endforeach
-                                                                    </select>
-                                                                </div>
-                                                                <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>
-                                                        </span>
-                                                    @if($claim->primaryPayer)
-                                                        <span moe class="ml-1">
-                                                            <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
-                                                            <form url="/api/claim/wipePrimaryPayer">
-                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
-                                                                <p>Wipe payer from this claim?</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>
-                                                        </span>
+                                            <!-- status -->
+                                            <div class="p-1 border-bottom">
+                                                <div>
+                                                    {{$claim->status ? $claim->status : '(not set)'}}
+                                                    @if($claim->status !== 'CANCELLED')
+                                                        <span moe class="d-inline-block text-left ml-1" title="Update Status">
+                                                                <a class="" href="" show start><i class="fa fa-edit"></i></a>
+                                                                <form url="/api/claim/updateStatus">
+                                                                    <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                    <div class="mb-2">
+                                                                        <label for="" class="control-label">Status</label>
+                                                                        <select name="status" class="form-control form-control-sm" required>
+                                                                            <option value="">-- select --</option>
+                                                                            <option value="NEW" {{$claim->status === 'NEW' ? 'selected' : ''}}>New</option>
+                                                                            <option value="PROCESSING" {{$claim->status === 'PROCESSING' ? 'selected' : ''}}>Processing</option>
+                                                                            <option value="SUBMITTED" {{$claim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="mb-2">
+                                                                        <label for="" class="control-label">Status Memo</label>
+                                                                        <textarea name="memo" class="form-control"></textarea>
+                                                                    </div>
+                                                                    <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>
+                                                            </span>
                                                     @endif
+                                                </div>
+                                                @if($claim->status_memo)
+                                                    <div class="text-secondary font-italic text-sm">{{$claim->status_memo}}</div>
                                                 @endif
                                             </div>
 
-                                            <div class="mt-1">
-                                                <span class="text-secondary text-sm">Payer (2°): </span>
-                                                <b>-</b>
-                                            </div>
-
-                                            <div class="mt-1">
-                                                <span class="text-secondary text-sm">Company: </span>
-                                                <b>{{$claim->companyPro && $claim->companyPro->company ? $claim->companyPro->company->name : '-'}}</b>
-                                                @if($claim->status !== 'CANCELLED')
-                                                    <span moe class="ml-1">
-                                                            <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
-                                                            <form url="/api/claim/putCompanyPro">
-                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
-                                                                <div class="mb-2">
-                                                                    <select name="companyProUid" class="form-control form-control-sm">
-                                                                        <option value="">-- select --</option>
-                                                                        @foreach($note->hcpPro->companyProPayers as $companyProPayer)
-                                                                            <option value="{{$companyProPayer->companyPro->uid}}"
-                                                                                    {{$claim->companyPro && $claim->companyPro->uid === $companyProPayer->companyPro->uid ? 'selected' : ''}}>{{$companyProPayer->company->name}}</option>
-                                                                        @endforeach
-                                                                    </select>
-                                                                </div>
-                                                                <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>
-                                                        </span>
-                                                    @if($claim->companyPro && $claim->companyPro->company)
+                                            <!-- payer, company, location -->
+                                            {{--
+                                            <div class="p-1">
+                                                <div class="mt-1">
+                                                    <span class="text-secondary text-sm">Payer (1°): </span>
+                                                    <b>{{$claim->primaryPayer ? $claim->primaryPayer->name : '-'}}</b>
+                                                    @if($claim->status !== 'CANCELLED')
                                                         <span moe class="ml-1">
+                                                                <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                                                <form url="/api/claim/putPrimaryPayer">
+                                                                    <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                    <div class="mb-2">
+                                                                        <select name="primaryPayerUid" class="form-control form-control-sm">
+                                                                            <option value="">-- select --</option>
+                                                                            @foreach($note->hcpPro->companyProPayers as $companyProPayer)
+                                                                                <option value="{{$companyProPayer->payer->uid}}"
+                                                                                        {{$claim->primaryPayer && $claim->primaryPayer->uid === $companyProPayer->payer->uid ? 'selected' : ''}}>{{$companyProPayer->payer->name}}</option>
+                                                                            @endforeach
+                                                                        </select>
+                                                                    </div>
+                                                                    <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>
+                                                            </span>
+                                                        @if($claim->primaryPayer)
+                                                            <span moe class="ml-1">
                                                                 <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
-                                                                <form url="/api/claim/wipeCompanyPro">
+                                                                <form url="/api/claim/wipePrimaryPayer">
                                                                     <input type="hidden" name="uid" value="{{$claim->uid}}">
-                                                                    <p>Wipe company from this claim?</p>
+                                                                    <p>Wipe payer from this claim?</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>
                                                             </span>
+                                                        @endif
                                                     @endif
-                                                @endif
-                                            </div>
+                                                </div>
 
-                                            <div class="mt-1">
-                                                <span class="text-secondary text-sm">Location: </span>
-                                                <b>{{$claim->companyLocation ? $claim->companyLocation->line1 . ', ' . $claim->companyLocation->city : '-'}}</b>
-                                                @if($claim->status !== 'CANCELLED')
-                                                    <span moe class="ml-1">
-                                                            <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
-                                                            <form url="/api/claim/putCompanyLocation">
-                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
-                                                                <div class="mb-2">
-                                                                    <select name="companyLocationUid" class="form-control form-control-sm">
-                                                                        <option value="">-- select --</option>
-                                                                        @if($claim->company && $claim->company->locations)
-                                                                            @foreach($claim->company->locations as $location)
-                                                                                <option value="{{$location->uid}}"
-                                                                                        {{$claim->companyLocation && $claim->companyLocation->uid === $location->uid ? 'selected' : ''}}>
-                                                                                    {{$location->line1 . ', ' . $location->city}}
-                                                                                </option>
-                                                                            @endforeach
-                                                                        @endif
-                                                                    </select>
-                                                                </div>
-                                                                <div class="mb-0">
-                                                                    <button class="btn btn-success btn-sm" submit>Submit</button>
-                                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                                </div>
-                                                            </form>
-                                                        </span>
-                                                    @if($claim->companyLocation)
+                                                <div class="mt-1">
+                                                    <span class="text-secondary text-sm">Payer (2°): </span>
+                                                    <b>-</b>
+                                                </div>
+
+                                                <div class="mt-1">
+                                                    <span class="text-secondary text-sm">Company: </span>
+                                                    <b>{{$claim->companyPro && $claim->companyPro->company ? $claim->companyPro->company->name : '-'}}</b>
+                                                    @if($claim->status !== 'CANCELLED')
                                                         <span moe class="ml-1">
-                                                            <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
-                                                            <form url="/api/claim/wipeCompanyLocation">
-                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
-                                                                <p>Wipe location from this claim?</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>
-                                                        </span>
-                                                    @endif
-                                                @endif
-                                            </div>
-                                        </div>
-                                        --}}
-                                    </td>
-                                    <td class="p-0 border-left border-right">
-                                        <table class="table table-sm table-condensed border-0 mb-0">
-                                            @if($claim->status !== 'CANCELLED')
-                                                <thead>
-                                                <tr class="">
-                                                    <th colspan="3" class="border-top-0 border-bottom">
-                                                        <div>
-                                                                <span moe class="d-block" title="Submit Claim">
-                                                                    <a class="" href="" show start>Generate Submission to Payer (1°)</a>
-                                                                    <form url="/api/mbClaim/create">
-                                                                        <input type="hidden" name="claimUid" value="{{$claim->uid}}">
-                                                                        <p>Generate Submission?</p>
+                                                                <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                                                <form url="/api/claim/putCompanyPro">
+                                                                    <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                    <div class="mb-2">
+                                                                        <select name="companyProUid" class="form-control form-control-sm">
+                                                                            <option value="">-- select --</option>
+                                                                            @foreach($note->hcpPro->companyProPayers as $companyProPayer)
+                                                                                <option value="{{$companyProPayer->companyPro->uid}}"
+                                                                                        {{$claim->companyPro && $claim->companyPro->uid === $companyProPayer->companyPro->uid ? 'selected' : ''}}>{{$companyProPayer->company->name}}</option>
+                                                                            @endforeach
+                                                                        </select>
+                                                                    </div>
+                                                                    <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>
+                                                            </span>
+                                                        @if($claim->companyPro && $claim->companyPro->company)
+                                                            <span moe class="ml-1">
+                                                                    <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                                                    <form url="/api/claim/wipeCompanyPro">
+                                                                        <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                        <p>Wipe company from this claim?</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>
                                                                 </span>
-                                                        </div>
-                                                    </th>
-                                                </tr>
-                                                </thead>
-                                            @endif
-                                            @if(count($claim->mbClaims))
-                                                <thead>
-                                                <tr class="bg-light">
-                                                    <th class="border-0">Created</th>
-                                                    <th class="border-0">Status</th>
-                                                    <th class="border-0">&nbsp;</th>
-                                                </tr>
-                                                </thead>
-                                                <tbody class="pb-3">
-                                                @foreach($claim->mbClaims as $mbClaim)
+                                                        @endif
+                                                    @endif
+                                                </div>
+
+                                                <div class="mt-1">
+                                                    <span class="text-secondary text-sm">Location: </span>
+                                                    <b>{{$claim->companyLocation ? $claim->companyLocation->line1 . ', ' . $claim->companyLocation->city : '-'}}</b>
+                                                    @if($claim->status !== 'CANCELLED')
+                                                        <span moe class="ml-1">
+                                                                <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                                                <form url="/api/claim/putCompanyLocation">
+                                                                    <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                    <div class="mb-2">
+                                                                        <select name="companyLocationUid" class="form-control form-control-sm">
+                                                                            <option value="">-- select --</option>
+                                                                            @if($claim->company && $claim->company->locations)
+                                                                                @foreach($claim->company->locations as $location)
+                                                                                    <option value="{{$location->uid}}"
+                                                                                            {{$claim->companyLocation && $claim->companyLocation->uid === $location->uid ? 'selected' : ''}}>
+                                                                                        {{$location->line1 . ', ' . $location->city}}
+                                                                                    </option>
+                                                                                @endforeach
+                                                                            @endif
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="mb-0">
+                                                                        <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                    </div>
+                                                                </form>
+                                                            </span>
+                                                        @if($claim->companyLocation)
+                                                            <span moe class="ml-1">
+                                                                <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                                                <form url="/api/claim/wipeCompanyLocation">
+                                                                    <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                    <p>Wipe location from this claim?</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>
+                                                            </span>
+                                                        @endif
+                                                    @endif
+                                                </div>
+                                            </div>
+                                            --}}
+                                        </td>
+                                        <td class="p-0 border-left border-right">
+                                            <table class="table table-sm table-condensed border-0 mb-0">
+                                                @if($claim->status !== 'CANCELLED')
+                                                    <thead>
+                                                    <tr class="">
+                                                        <th colspan="3" class="border-top-0 border-bottom">
+                                                            <div>
+                                                                    <span moe class="d-block" title="Submit Claim">
+                                                                        <a class="" href="" show start>Generate Submission to Payer (1°)</a>
+                                                                        <form url="/api/mbClaim/create">
+                                                                            <input type="hidden" name="claimUid" value="{{$claim->uid}}">
+                                                                            <p>Generate Submission?</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>
+                                                                    </span>
+                                                            </div>
+                                                        </th>
+                                                    </tr>
+                                                    </thead>
+                                                @endif
+                                                @if(count($claim->mbClaims))
+                                                    <thead>
+                                                    <tr class="bg-light">
+                                                        <th class="border-0">Created</th>
+                                                        <th class="border-0">Status</th>
+                                                        <th class="border-0">&nbsp;</th>
+                                                    </tr>
+                                                    </thead>
+                                                    <tbody class="pb-3">
+                                                    @foreach($claim->mbClaims as $mbClaim)
+                                                        <tr>
+                                                            <td>
+                                                                @if($mbClaim->claim_version_id !== $claim->current_version_id)
+                                                                    <i class="fa fa-exclamation-triangle text-warning-mellow text-sm" title="This submission was generated using an older version of the claim"></i>
+                                                                @else
+                                                                    <i class="fa fa-asterisk text-secondary text-sm" title="This submission is up to date"></i>
+                                                                @endif
+                                                                <a native target="_blank"
+                                                                   open-in-stag-popup
+                                                                   title="Submission Details"
+                                                                   href="{{route('mb-claim', ['patient' => $patient, 'mbClaim' => $mbClaim])}}">
+                                                                    {{ friendlier_date_time($mbClaim->created_at) }}
+                                                                </a>
+                                                            </td>
+                                                            <td>
+                                                                {{$mbClaim->status}}
+                                                                @if($mbClaim->status_memo)
+                                                                    <div class="font-italic text-secondary text-sm">{{$mbClaim->status_memo}}</div>
+                                                                @endif
+                                                            </td>
+                                                            <td class="text-right pr-2">
+                                                                     <span moe relative title="Submit Claim">
+                                                                        <a class="" href="" show start><i class="fa fa-edit"></i></a>
+                                                                        <form url="/api/mbClaim/updateStatus" right>
+                                                                            <input type="hidden" name="uid" value="{{$mbClaim->uid}}">
+                                                                            <div class="form-group">
+                                                                                <label for="" class="control-label">Status</label>
+                                                                                <select name="status" class="form-control form-control-sm" required>
+                                                                                    <option value="">-- select --</option>
+                                                                                    <option value="NEW" {{$mbClaim->status === 'NEW' ? 'selected' : ''}}>New</option>
+                                                                                    <option value="PROCESSING" {{$mbClaim->status === 'PROCESSING' ? 'selected' : ''}}>Processing</option>
+                                                                                    <option value="SUBMITTED" {{$mbClaim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+                                                                                </select>
+                                                                            </div>
+                                                                            <div class="form-group">
+                                                                                <label for="" class="control-label">Status Memo</label>
+                                                                                <textarea name="memo" class="form-control"></textarea>
+                                                                            </div>
+                                                                            <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>
+                                                                    </span>
+                                                                <a class="ml-1" target="_blank" native href="/api/mbClaim/downloadEDI/{{$mbClaim->uid}}" show start><i class="fa fa-file-download"></i></a>
+                                                                <a class="ml-1 text-success" href="" show start><i class="fa fa-arrow-right"></i></a>
+                                                            </td>
+                                                        </tr>
+                                                    @endforeach
+                                                    </tbody>
+                                                @else
+                                                    <tbody>
                                                     <tr>
-                                                        <td>
-                                                            @if($mbClaim->claim_version_id !== $claim->current_version_id)
-                                                                <i class="fa fa-exclamation-triangle text-warning-mellow text-sm" title="This submission was generated using an older version of the claim"></i>
-                                                            @else
-                                                                <i class="fa fa-asterisk text-secondary text-sm" title="This submission is up to date"></i>
-                                                            @endif
-                                                            <a native target="_blank"
-                                                               open-in-stag-popup
-                                                               title="Submission Details"
-                                                               href="{{route('mb-claim', ['patient' => $patient, 'mbClaim' => $mbClaim])}}">
-                                                                {{ friendlier_date_time($mbClaim->created_at) }}
-                                                            </a>
-                                                        </td>
-                                                        <td>
-                                                            {{$mbClaim->status}}
-                                                            @if($mbClaim->status_memo)
-                                                                <div class="font-italic text-secondary text-sm">{{$mbClaim->status_memo}}</div>
-                                                            @endif
-                                                        </td>
-                                                        <td class="text-right pr-2">
-                                                                 <span moe relative title="Submit Claim">
-                                                                    <a class="" href="" show start><i class="fa fa-edit"></i></a>
-                                                                    <form url="/api/mbClaim/updateStatus" right>
-                                                                        <input type="hidden" name="uid" value="{{$mbClaim->uid}}">
-                                                                        <div class="form-group">
-                                                                            <label for="" class="control-label">Status</label>
-                                                                            <select name="status" class="form-control form-control-sm" required>
-                                                                                <option value="">-- select --</option>
-                                                                                <option value="NEW" {{$mbClaim->status === 'NEW' ? 'selected' : ''}}>New</option>
-                                                                                <option value="PROCESSING" {{$mbClaim->status === 'PROCESSING' ? 'selected' : ''}}>Processing</option>
-                                                                                <option value="SUBMITTED" {{$mbClaim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
-                                                                            </select>
-                                                                        </div>
-                                                                        <div class="form-group">
-                                                                            <label for="" class="control-label">Status Memo</label>
-                                                                            <textarea name="memo" class="form-control"></textarea>
-                                                                        </div>
-                                                                        <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>
-                                                                </span>
-                                                            <a class="ml-1" target="_blank" native href="/api/mbClaim/downloadEDI/{{$mbClaim->uid}}" show start><i class="fa fa-file-download"></i></a>
-                                                            <a class="ml-1 text-success" href="" show start><i class="fa fa-arrow-right"></i></a>
+                                                        <td colspan="3">
+                                                            <p class="p-1 text-secondary m-0">No submissions in this claim</p>
                                                         </td>
                                                     </tr>
-                                                @endforeach
-                                                </tbody>
-                                            @else
-                                                <tbody>
-                                                <tr>
-                                                    <td colspan="3">
-                                                        <p class="p-1 text-secondary m-0">No submissions in this claim</p>
-                                                    </td>
-                                                </tr>
-                                                </tbody>
-                                            @endif
-                                        </table>
-                                    </td>
-                                </tr>
-                            @endif
-                        @endforeach
-                        </tbody>
-                    </table>
-                </div>
-            @else
-                <div class="d-flex">
-                    <p class="font-weight-bold mb-0">No claims in this note</p>
-                    @include('app/patient/care-month/_create-claim')
-                </div>
+                                                    </tbody>
+                                                @endif
+                                            </table>
+                                        </td>
+                                    </tr>
+                                @endif
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                @else
+                    <div class="d-flex">
+                        <p class="font-weight-bold mb-0">No claims in this note</p>
+                        @include('app/patient/care-month/_create-claim')
+                    </div>
+                @endif
             @endif
+
         @endif
 
+
     </div>
 
     <link href='/fullcalendar-5.3.2/lib/main.css' rel='stylesheet' />