Răsfoiți Sursa

Bill UI updates (wip)

Vijayakrishnan 4 ani în urmă
părinte
comite
30163be570
1 a modificat fișierele cu 19 adăugiri și 21 ștergeri
  1. 19 21
      resources/views/app/patient/note/dashboard.blade.php

+ 19 - 21
resources/views/app/patient/note/dashboard.blade.php

@@ -473,8 +473,8 @@
                                 <?php /* <th class="border-bottom-0"></th> */ ?>
                                 <th class="border-bottom-0">Date</th>
                                 <th class="border-bottom-0">Service</th>
-                                <th class="border-bottom-0">HCP</th>
                                 <th class="border-bottom-0">Billable</th>
+                                <th class="border-bottom-0">HCP</th>
                                 <th class="border-bottom-0">Total</th>
                                 <th class="border-bottom-0">Sign</th>
                                 <th class="border-bottom-0">Bal Post Date</th>
@@ -507,26 +507,6 @@
                                     </td> */ ?>
                                     <td class="text-nowrap">{{friendlier_date_time($bill->effective_date, false)}}</td>
                                     <td>{{$bill->code}}</td>
-
-                                    <td class="">
-                                        <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }}</div>
-                                        <div class="text-nowrap mt-1">
-                                            <span class="text-secondary">Paid: </span>
-                                            <span>{{ $bill->has_hcp_been_paid ? 'Yes' : 'No' }}</span>
-                                        </div>
-                                        @if(!$bill->has_hcp_been_paid)
-                                            <div class="text-nowrap mt-1">
-                                                <span class="text-secondary">Expected: </span>
-                                                <span class="font-weight-bold">${{ $bill->hcp_expected_payment_amount }}</span>
-                                            </div>
-                                        @else
-                                            <div class="text-nowrap mt-1">
-                                                <span class="text-secondary">Amount: </span>
-                                                <span class="font-weight-bold">${{ $bill->hcp_payment_amount }}</span>
-                                            </div>
-                                        @endif
-                                    </td>
-
                                     <td class="">
                                         @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
                                             <?php
@@ -550,6 +530,24 @@
                                             @endif
                                         @endif
                                     </td>
+                                    <td class="">
+                                        <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }}</div>
+                                        <div class="text-nowrap mt-1">
+                                            <span class="text-secondary">Paid: </span>
+                                            <span>{{ $bill->has_hcp_been_paid ? 'Yes' : 'No' }}</span>
+                                        </div>
+                                        @if(!$bill->has_hcp_been_paid)
+                                            <div class="text-nowrap mt-1">
+                                                <span class="text-secondary">Expected: </span>
+                                                <span class="font-weight-bold">${{ $bill->hcp_expected_payment_amount }}</span>
+                                            </div>
+                                        @else
+                                            <div class="text-nowrap mt-1">
+                                                <span class="text-secondary">Amount: </span>
+                                                <span class="font-weight-bold">${{ $bill->hcp_payment_amount }}</span>
+                                            </div>
+                                        @endif
+                                    </td>
                                     <td class="pr-3">
                                         @if($bill->has_hcp_been_paid)
                                             <span class="text-secondary">Paid. </span>