Merge branch 'master' into dev-vj

resources/views/app/practice-management/processing-bill-matrix2.blade.php

@@ -280,7 +280,7 @@
         window.billsFilter = function(_key, _value, _isClient = false) {
 
             <?php
-            $keys = ['f', 'bs', 'be', 't', 'c', 's'];
+            $keys = ['f', 'bs', 'be', 't', 'c', 's', 'claimed'];
             $currentParams = [];
             for ($i = 0; $i < count($keys); $i++) {
                 if (!!request()->input($keys[$i])) {

resources/views/app/practice-management/rm-action-report.blade.php

@@ -261,7 +261,7 @@
                             <!-- Is Payable to RMM? -->
                             {{ $row->rmm_payable ? 'Yes' : 'No' }}
                         </td>
-                        <td>
+                        <td> 
                             <!-- RMM Bill -->
                             {{ $row->rmm_rm_bill_code }}
                         </td>