Add conditions when showing expected/received amounts in cm/rm bills

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

@@ -457,8 +457,8 @@
                             <div class="small text-secondary">Memo: {{$activeCMBill->memo}}</div>
                             <div class="small text-secondary">Created: {{friendly_date_time($activeCMBill->created_at)}}</div>
                         </div>
-                        <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
-                        @if(1) {{-- check if auther user is hcp pro --}}
+                        <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                        @if($activeCMBill->hcp_pro_id === $pro->id)
                         <div class="d-flex align-items-center">
                             @if($activeCMBill->has_hcp_been_paid)
                                 <span class="text-dark">Received HCP Amount: </span>
@@ -490,7 +490,7 @@
                             @endif
                         </div>
                         @endif
-                        @if(1) {{-- check if auther user is cm pro --}}
+                        @if($activeCMBill->cm_pro_id === $pro->id)
                         <div class="d-flex align-items-center">
                             @if($activeCMBill->has_cm_been_paid)
                                 <span class="text-dark">Received CM Pro Amount: </span>
@@ -536,8 +536,8 @@
                                 </div>
                                 <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
                             </div>
-                            <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
-                            @if(1) {{-- check if auther user is hcp pro --}}
+                            <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                            @if($cancelledBill->hcp_pro_id === $pro->id)
                             <div class="d-flex align-items-center">
                                 @if($cancelledBill->has_hcp_been_paid)
                                     <span class="text-dark">Received HCP Amount: </span>
@@ -548,7 +548,7 @@
                                 @endif
                             </div>
                             @endif
-                            @if(1) {{-- check if auther user is cm pro --}}
+                            @if($cancelledBill->cm_pro_id === $pro->id)
                             <div class="d-flex align-items-center">
                                 @if($cancelledBill->has_cm_been_paid)
                                     <span class="text-dark">Received CM Pro Amount: </span>
@@ -638,8 +638,8 @@
                             <div class="small text-secondary">Memo: {{$activeRMBill->memo}}</div>
                             <div class="small text-secondary">Created: {{friendly_date_time($activeRMBill->created_at)}}</div>
                         </div>
-                        <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
-                        @if(1) {{-- check if auther user is hcp pro --}}
+                        <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                        @if($activeRMBill->hcp_pro_id === $pro->id)
                         <div class="d-flex align-items-center">
                             @if($activeRMBill->has_hcp_been_paid)
                                 <span class="text-dark">Received HCP Amount: </span>
@@ -671,7 +671,7 @@
                             @endif
                         </div>
                         @endif
-                        @if(1) {{-- check if auther user is rmm pro --}}
+                        @if($activeRMBill->rmm_pro_id === $pro->id)
                         <div class="d-flex align-items-center">
                             @if($activeRMBill->has_rmm_been_paid)
                                 <span class="text-dark">Received RMM Pro Amount: </span>
@@ -703,7 +703,7 @@
                             @endif
                         </div>
                         @endif
-                        @if(1) {{-- check if auther user is rme pro --}}
+                        @if($activeRMBill->rme_pro_id === $pro->id)
                         <div class="d-flex align-items-center">
                             @if($activeRMBill->has_rme_been_paid)
                                 <span class="text-success">Received RME Pro Amount: </span>
@@ -749,8 +749,8 @@
                                 </div>
                                 <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
                             </div>
-                            <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
-                            @if(1) {{-- check if auther user is hcp pro --}}
+                            <div class="font-weight-bold text-dark mt-2 mb-1"></div>
+                            @if($cancelledBill->hcp_pro_id === $pro->id)
                             <div class="d-flex align-items-center">
                                 @if($cancelledBill->has_hcp_been_paid)
                                     <span class="text-dark">Received HCP Amount: </span>
@@ -761,7 +761,7 @@
                                 @endif
                             </div>
                             @endif
-                            @if(1) {{-- check if auther user is rmm pro --}}
+                            @if($cancelledBill->rmm_pro_id === $pro->id)
                             <div class="d-flex align-items-center">
                                 @if($cancelledBill->has_rmm_been_paid)
                                     <span class="text-dark">Received RMM Pro Amount: </span>
@@ -772,7 +772,7 @@
                                 @endif
                             </div>
                             @endif
-                            @if(1) {{-- check if auther user is rme pro --}}
+                            @if($cancelledBill->rme_pro_id === $pro->id)
                             <div class="d-flex align-items-center">
                                 @if($cancelledBill->has_rme_been_paid)
                                     <span class="text-success">Received RME Pro Amount: </span>