Move up close => billing and claiming

resources/views/app/patient/note/_create-bill.blade.php

@@ -81,6 +81,62 @@
         <input type="hidden" name="numberOfUnits" value="1">
     </div>
 </div>
+@if(!$note->is_bill_closed)
+    <span class="mx-2 text-secondary">|</span>
+    @if($pro->pro_type === 'ADMIN')
+        <span class="d-block" moe>
+            <a class="text-danger" href="" show start>Close Billing</a>
+            <form url="/api/note/closeBilling">
+                <input type="hidden" name="uid" value="{{$note->uid}}">
+                <p>Close billing?</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
+@elseif($note->is_bill_closed)
+    <span class="mx-2 text-secondary">|</span>
+    <span class="d-block" moe>
+        <a class="text-danger" href="" show start>Reopen Billing</a>
+        <form url="/api/note/reopenBilling">
+            <input type="hidden" name="uid" value="{{$note->uid}}">
+            <p>Reopen billing?</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
+<span class="mx-2 text-secondary">|</span>
+@if(!$note->is_billing_marked_done)
+    <span class="d-block" moe>
+        <a class="text-danger" href="" show start>Mark Billing Done</a>
+        <form url="/api/note/setIsBillingMarkedDoneToTrue">
+            <input type="hidden" name="uid" value="{{$note->uid}}">
+            <p>Mark billing on this note as done?</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
+    <span class="d-block" moe>
+        <i class="fa fa-check"></i>
+        <a class="text-danger" href="" show start>Undo Mark Billing Done</a>
+        <form url="/api/note/setIsBillingMarkedDoneToFalse">
+            <input type="hidden" name="uid" value="{{$note->uid}}">
+            <p>Mark billing on this note as not done?</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
 <script>
     (function() {
         let selectedCodeHourlyRate = 0;

resources/views/app/patient/note/_create-claim.blade.php

@@ -1,5 +1,48 @@
 <span class="mx-2 text-secondary">|</span>
 <a href="#" onclick="return showStagPopup('create-claim')">Create Claim</a>
+@if($pro->pro_type === 'ADMIN')
+    @if(!$note->is_claim_closed)
+        <span class="mx-2 text-secondary">|</span>
+        <span class="d-block" moe>
+            <a class="text-danger" href="" show start>Close Claiming</a>
+            <form url="/api/note/closeClaiming">
+                <input type="hidden" name="uid" value="{{$note->uid}}">
+                <p>Close claiming?</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>
+    @elseif($note->is_claim_closed)
+        <span class="mx-2 text-secondary">|</span>
+        <span class="d-block" moe>
+            <a class="text-danger" href="" show start>Reopen Claiming</a>
+            <form url="/api/note/reopenClaiming">
+                <input type="hidden" name="uid" value="{{$note->uid}}">
+                <p>Reopen claiming?</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>
+        <span class="mx-2 text-secondary">|</span>
+        <span class="d-block" moe>
+            <a class="text-danger" href="" show start>Update Claim Total Paid</a>
+            <form url="/api/note/updateClaimTotalPaid">
+                <input type="hidden" name="uid" value="{{$note->uid}}">
+                <div class="form-group">
+                    <input type="number" class="form-control" name="claimTotalPaid">
+                </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>
+    @endif
+@endif
 <div class="stag-popup stag-popup-md mcp-theme-1" stag-popup-key="create-claim">
     <form action="/api/claim/createForNote" id="createClaimApp">
         <h3 class="stag-popup-title border-bottom-0 mb-0">

resources/views/app/patient/note/dashboard.blade.php

@@ -765,65 +765,6 @@
                         <div class="d-flex align-items-center mb-2">
                             <p class="font-weight-bold text-secondary m-0">Bills</p>
                             @include('app/patient/note/_create-bill')
-
-                                @if(!$note->is_bill_closed)
-                                    <span class="mx-2 text-secondary">|</span>
-                                    Billing Not Closed&nbsp;
-				    @if($pro->pro_type === 'ADMIN')    
-				    <span class="d-block" moe>
-                                        <a class="text-danger" href="" show start>Close Billing</a>
-                                        <form url="/api/note/closeBilling">
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Close billing?</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
-                                @elseif($note->is_bill_closed)
-                                    <span class="mx-2 text-secondary">|</span>
-                                    <span class="d-block" moe>
-                                        <a class="text-danger" href="" show start>Reopen Billing</a>
-                                        <form url="/api/note/reopenBilling">
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Reopen billing?</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
-                                <span class="mx-2 text-secondary">|</span>
-                                @if(!$note->is_billing_marked_done)
-                                    <span class="d-block" moe>
-                                        <a class="text-danger" href="" show start>Mark Billing Done</a>
-                                        <form url="/api/note/setIsBillingMarkedDoneToTrue">
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark billing on this note as done?</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
-                                    <span class="d-block" moe>
-					<i class="fa fa-check"></i>
-                                        <a class="text-danger" href="" show start>Undo Mark Billing Done</a>
-                                        <form url="/api/note/setIsBillingMarkedDoneToFalse">
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark billing on this note as not done?</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
                         </div>
 
                         @if($pro->pro_type === 'ADMIN')
@@ -1281,49 +1222,6 @@
                         <div class="d-flex align-items-center mb-2">
                             <p class="font-weight-bold text-secondary m-0">Claims</p>
                             @include('app/patient/note/_create-claim')
-                            @if($pro->pro_type === 'ADMIN')
-                                @if(!$note->is_claim_closed)
-                                    <span class="mx-2 text-secondary">|</span>
-                                    <span class="d-block" moe>
-                                        <a class="text-danger" href="" show start>Close Claiming</a>
-                                        <form url="/api/note/closeClaiming">
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Close claiming?</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>
-                                @elseif($note->is_claim_closed)
-                                    <span class="mx-2 text-secondary">|</span>
-                                    <span class="d-block" moe>
-                                        <a class="text-danger" href="" show start>Reopen Claiming</a>
-                                        <form url="/api/note/reopenClaiming">
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Reopen claiming?</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>
-                                    <span class="mx-2 text-secondary">|</span>
-                                    <span class="d-block" moe>
-                                        <a class="text-danger" href="" show start>Update Claim Total Paid</a>
-                                        <form url="/api/note/updateClaimTotalPaid">
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <div class="form-group">
-                                                <input type="number" class="form-control" name="claimTotalPaid">
-                                            </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>
-                                @endif
-                            @endif
                         </div>
 
                         <table class="table table-sm tabe-striped mb-3 border-left border-right border-bottom">