Merge branch 'master' into dev-vj

resources/views/app/patient/care-month/_create-bill.blade.php

@@ -1,4 +1,4 @@
-<?php $rmRates = $pro->rmRates(); ?>
+<?php $rmRates = $careMonth->mcp->rmRates();  //TODO: revert ?>
 @if(!$careMonth->is_bill_closed && !$careMonth->is_billing_marked_done)
     <span class="mx-2 text-secondary">|</span>
     <div moe wide class="">

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

@@ -404,7 +404,7 @@
                                     @endif
                                     @if($performer->pro->id == $careMonth->mcp_pro_id)
                                         Reimbursement: {{ $careMonth->rmBill->hcp_payment_amount }}
-                                    @endif 
+                                    @endif
                                 @endif
                             </div>
                         </div>
@@ -1548,8 +1548,8 @@
                                                         </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' : '' }}">
+                                                          class="d-block {{ $bill->hcp_pro_id !== $pro->id && $pro->pro_type !== 'ADMIN' ? 'moe-disabled' : '' }}"
+                                                          title="{{ $bill->hcp_pro_id !== $pro->id  && $pro->pro_type !== 'ADMIN' ? '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}}">
@@ -1791,7 +1791,7 @@
                                                         </span>
                                                     @else
                                                         <span moe
-                                                              class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                              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">
@@ -1855,7 +1855,7 @@
                 @endif
             @endif
 
-                                                     
+
             <hr class="m-negator mt-4 mb-3">
 
             {{-- claims --}}
@@ -2242,7 +2242,7 @@
                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                         </div>
                     </form>
-                    @else 
+                    @else
                         <form url="/api/careMonth/setIsRmInteractionWaivedToTrue">
                             <input type="hidden" name="uid" value="{{$careMonth->uid}}">
                             <p>Set is RM interaction waived to true?</p>
@@ -2250,11 +2250,11 @@
                                 <button class="btn btn-primary btn-sm" submit>Submit</button>
                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                             </div>
-                        </form>                                    
-                    @endif 
+                        </form>
+                    @endif
                 </div>
-            </div>                                   
-                 
+            </div>
+
             <div>
                 Is RM interaction waived: {{$careMonth->is_rm_time_waived? 'Yes': 'No'}}
                 <div moe class="text-left mt-1" title="Cancel Claim">
@@ -2268,7 +2268,7 @@
                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                         </div>
                     </form>
-                    @else 
+                    @else
                         <form url="/api/careMonth/setIsRmTimeWaivedToTrue">
                             <input type="hidden" name="uid" value="{{$careMonth->uid}}">
                             <p>Set is RM time waived to true?</p>
@@ -2276,10 +2276,10 @@
                                 <button class="btn btn-primary btn-sm" submit>Submit</button>
                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                             </div>
-                        </form>                                    
-                    @endif 
+                        </form>
+                    @endif
                 </div>
-            </div>  
+            </div>
 
         <hr class="m-negator my-3">