Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

resources/views/app/admin/patients-table.blade.php

@@ -130,6 +130,7 @@
 											<th class="border-0 text-secondary">NA</th>
 											<th class="border-0 text-secondary">HCP Signed</th>
 											<th class="border-0 text-secondary">ICDs</th>
+											<th class="border-0 text-secondary">Bills</th>
 										</tr>
 										</thead>
 										<tbody>
@@ -175,6 +176,14 @@
 														-
 													@endif
 												</td>
+												<td>
+													@if(!count($note->bills))
+														<div class="alert alert-warning">No bills.</div>	
+													@endif
+													@foreach($note->bills as $bill)
+													<div>{{ $bill->code}} | {{ $bill->number_of_units }} | {{ $bill->hcp_expected_payment_amount }}</div>
+													@endforeach
+												</td>
 											</tr>
 										@endforeach
 										</tbody>

resources/views/app/practice-management/billing-manager.blade.php

@@ -125,7 +125,7 @@
                             <td class="">
                                 {{ friendly_date_time($note->created_at, true) }}
                             </td>
-                            <td>{{$note->hcpPro->displayName()}}</td>
+                            <td>{{$note->hcpPro?$note->hcpPro->displayName():''}}</td>
                             <td>{{$note->is_signed_by_hcp?'Yes':'No'}}</td>
                             @if($performer->pro->pro_type == 'ADMIN')
                                 <td>