Generic bills - allow cancel for non-admins

resources/views/app/generic-bills/inline.blade.php

@@ -34,9 +34,9 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                     <th class="border-bottom-0">Pro</th>
                     <th class="border-bottom-0 screen-only">Total</th>
                     <th class="border-bottom-0">Sign</th>
+                    <th class="border-bottom-0">Cancellation</th>
                     @if($pro->pro_type === 'ADMIN')
                     <th class="border-bottom-0">Verification</th>
-                    <th class="border-bottom-0">Cancellation</th>
                     <th class="border-bottom-0 screen-only">Payment</th>
                     @endif
                 </tr>
@@ -112,38 +112,6 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                                 @endif
                             @endif
                         </td>
-                        @if($pro->pro_type === 'ADMIN')
-                        <td> <!-- verification -->
-                            @if(!$bill->is_cancelled)
-                                @if(!$bill->is_verified)
-                                    <div class="text-warning-mellow font-weight-bold">Not Verified</div>
-                                    <div 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 Verified?</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>
-                                @else
-                                    <div class="text-success font-weight-bold"><i class="fa fa-check"></i> Verified</div>
-                                    <div 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 Verified?</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
-                            @endif
-                        </td>
                         <td>  <!-- cancellation -->
                             @if($bill->is_cancelled)
                                 <div class="text-warning-mellow font-weight-bold">Cancelled</div>
@@ -223,6 +191,38 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                             @endif
 
                         </td>
+                        @if($pro->pro_type === 'ADMIN')
+                        <td> <!-- verification -->
+                            @if(!$bill->is_cancelled)
+                                @if(!$bill->is_verified)
+                                    <div class="text-warning-mellow font-weight-bold">Not Verified</div>
+                                    <div 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 Verified?</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>
+                                @else
+                                    <div class="text-success font-weight-bold"><i class="fa fa-check"></i> Verified</div>
+                                    <div 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 Verified?</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
+                            @endif
+                        </td>
                         <td class="screen-only"> <!-- submit payment -->
                             <div class="my-1">
                                 @if(!$bill->is_cancelled && !$bill->has_generic_pro_been_paid )