RPM manager - reimb state 'Paid'

app/Http/Controllers/PracticeManagementController.php

@@ -2581,14 +2581,19 @@ SELECT
        care_month.measurements_json,
        care_month.measurements_bp_json,
        care_month.measurements_weight_json,
-       care_month.start_date as care_month_start_date
-
+       care_month.start_date as care_month_start_date,
+       mcpBill.has_generic_pro_been_paid as mcp_paid,
+       rmmBill.has_generic_pro_been_paid as rmm_paid,
+       rmeBill.has_generic_pro_been_paid as rme_paid
 FROM care_month join client on care_month.client_id = client.id 
     left join pro mcpPro on care_month.mcp_pro_id = mcpPro.id
     left join pro rmmPro on care_month.rmm_pro_id = rmmPro.id
     left join pro rmePro on care_month.rme_pro_id = rmePro.id
     left join note mrnote on client.most_recent_completed_mcp_note_id = mrnote.id
     left join appointment nv on nv.id = mrnote.follow_up_appointment_id
+    left join bill mcpBill on care_month.mcp_rm_generic_bill_id = mcpBill.id AND mcpBill.is_cancelled IS NOT TRUE
+    left join bill rmmBill on care_month.rmm_rm_generic_bill_id = rmmBill.id AND rmmBill.is_cancelled IS NOT TRUE
+    left join bill rmeBill on care_month.rme_rm_generic_bill_id = rmeBill.id AND rmeBill.is_cancelled IS NOT TRUE
 WHERE
       " . (count($conditions) > 0 ? implode(" AND ", $conditions) : '') . "
       ORDER BY {$orderBy} OFFSET {$offset} LIMIT {$perPage}
@@ -2674,14 +2679,19 @@ SELECT
        care_month.measurements_json,
        care_month.measurements_bp_json,
        care_month.measurements_weight_json,
-       care_month.start_date as care_month_start_date
-
+       care_month.start_date as care_month_start_date,
+       mcpBill.has_generic_pro_been_paid as mcp_paid,
+       rmmBill.has_generic_pro_been_paid as rmm_paid,
+       rmeBill.has_generic_pro_been_paid as rme_paid
 FROM care_month join client on care_month.client_id = client.id 
     left join pro mcpPro on care_month.mcp_pro_id = mcpPro.id
     left join pro rmmPro on care_month.rmm_pro_id = rmmPro.id
     left join pro rmePro on care_month.rme_pro_id = rmePro.id
     left join note mrnote on client.most_recent_completed_mcp_note_id = mrnote.id
     left join appointment nv on nv.id = mrnote.follow_up_appointment_id
+    left join bill mcpBill on care_month.mcp_rm_generic_bill_id = mcpBill.id AND mcpBill.is_cancelled IS NOT TRUE
+    left join bill rmmBill on care_month.rmm_rm_generic_bill_id = rmmBill.id AND rmmBill.is_cancelled IS NOT TRUE
+    left join bill rmeBill on care_month.rme_rm_generic_bill_id = rmeBill.id AND rmeBill.is_cancelled IS NOT TRUE
 WHERE
       care_month.uid = '{$uid}'
 ";

resources/views/app/practice-management/rpm-manager/row.blade.php

@@ -300,41 +300,53 @@
 
     <!--Reimb.-->
     @if($viewingAs === 'ADMIN' || $viewingAs === 'MCP')
-        <td>
-            @if($iPatient->is_billable_by_mcp)
-                @if($iPatient->is_billed_by_mcp)
-                    <i class="mr-1 fa fa-check text-success opacity-60" title="Billed"></i>
+        <td class="text-nowrap">
+            @if($iPatient->mcp_paid)
+                <i class="mr-1 fas fa-dollar-sign text-success opacity-60" title="Paid"></i>
+            @else
+                @if($iPatient->is_billable_by_mcp)
+                    @if($iPatient->is_billed_by_mcp)
+                        <i class="mr-1 fa fa-check text-info opacity-60" title="Billed"></i>
+                    @else
+                        <i class="mr-1 fa fa-bolt text-primary" title="Billable"></i>
+                    @endif
                 @else
-                    <i class="mr-1 fa fa-bolt text-primary" title="Billable"></i>
+                    <i class="mr-1 fas fa-ban text-secondary" title="Not Billable"></i>
                 @endif
-            @else
-                <i class="mr-1 fas fa-ban text-secondary" title="Not Billable"></i>
             @endif
         </td>
     @endif
     @if($viewingAs === 'ADMIN' || $viewingAs === 'RMM')
-        <td>
-            @if($iPatient->is_billable_by_rmm)
-                @if($iPatient->is_billed_by_rmm)
-                    <i class="mr-1 fa fa-check text-success opacity-60" title="Billed"></i>
+        <td class="text-nowrap">
+            @if($iPatient->rmm_paid)
+                <i class="mr-1 fas fa-dollar-sign text-success opacity-60" title="Paid"></i>
+            @else
+                @if($iPatient->is_billable_by_rmm)
+                    @if($iPatient->is_billed_by_rmm)
+                        <i class="mr-1 fa fa-check text-info opacity-60" title="Billed"></i>
+                    @else
+                        <i class="mr-1 fa fa-bolt text-primary" title="Billable"></i>
+                    @endif
                 @else
-                    <i class="mr-1 fa fa-bolt text-primary" title="Billable"></i>
+                    <i class="mr-1 fas fa-ban text-secondary" title="Not Billable"></i>
                 @endif
-            @else
-                <i class="mr-1 fas fa-ban text-secondary" title="Not Billable"></i>
             @endif
         </td>
     @endif
     @if($viewingAs === 'ADMIN' || $viewingAs === 'RME')
-        <td>
-            @if($iPatient->is_billable_by_rme)
-                @if($iPatient->is_billed_by_rme)
-                    <i class="mr-1 fa fa-check text-success opacity-60" title="Billed"></i>
+        <td class="text-nowrap">
+            @if($iPatient->rme_paid)
+                <i class="mr-1 fas fa-dollar-sign text-success opacity-60" title="Paid"></i>
+            @else
+                @if($iPatient->is_billable_by_rme)
+                    @if($iPatient->is_billed_by_rme)
+                        <i class="mr-1 fa fa-check text-info opacity-60" title="Billed"></i>
+                    @else
+                        <i class="mr-1 fa fa-bolt text-primary" title="Billable"></i>
+                    @endif
                 @else
-                    <i class="mr-1 fa fa-bolt text-primary" title="Billable"></i>
+                    <i class="mr-1 fas fa-ban text-secondary" title="Not Billable"></i>
                 @endif
-            @else
-                <i class="mr-1 fas fa-ban text-secondary" title="Not Billable"></i>
             @endif
         </td>
     @endif