Merge branch 'master' into dev-vj

app/Models/Bill.php

@@ -37,6 +37,10 @@ class Bill extends Model
         return $this->hasOne(Pro::class, 'id', 'generic_pro_id');
     }
 
+    public function hcpCompany() {
+        return $this->hasOne(Company::class, 'id', 'hcp_company_id');
+    }
+
     public function hcpCompanyPro() {
         return $this->hasOne(CompanyPro::class, 'id', 'hcp_company_pro_id');
     }

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

@@ -980,11 +980,10 @@
                             <table class="table table-sm tabe-striped mb-0 table-bordered">
                                 <thead class="bg-light">
                                 <tr class="text-secondary">
-                                    <?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">Billable</th>
-                                    <th class="border-bottom-0">HCP</th>
+                                    <th class="border-bottom-0">Pro</th>
                                     <th class="border-bottom-0">Total</th>
                                     <th class="border-bottom-0">Sign</th>
                                     <th class="border-bottom-0">Bal Post Date</th>
@@ -996,26 +995,7 @@
                                 <tbody>
                                 @foreach ($careMonth->bills as $bill)
                                     <tr class="{{$bill->is_cancelled ? 'bg-light text-secondary' : ''}}">
-                                        <?php /* <td class="p-0">
-                                            <table class="table-striped table-sm table-condensed border border-left-0 border-top-0 border-bottom-0">
-                                                <tbody>
-                                                    <tr><td>collected_amount</td><td>{{$bill->collected_amount}}</td></tr>
-                                                    <tr><td>effective_date</td><td>{{$bill->effective_date}}</td></tr>
-                                                    <tr><td>has_hcp_been_paid</td><td>{{$bill->has_hcp_been_paid}}</td></tr>
-                                                    <tr><td>hcp_expected_payment_amount</td><td>{{$bill->hcp_expected_payment_amount}}</td></tr>
-                                                    <tr><td>hcp_payment_amount</td><td>{{$bill->hcp_payment_amount}}</td></tr>
-                                                    <tr><td>is_cancelled</td><td>{{$bill->is_cancelled}}</td></tr>
-                                                    <tr><td>hcp_payment_pro_transaction_id</td><td>{{$bill->hcp_payment_pro_transaction_id}}</td></tr>
-                                                    <tr><td>balance_post_date</td><td>{{$bill->balance_post_date}}</td></tr>
-                                                    <tr><td>is_verified</td><td>{{$bill->is_verified}}</td></tr>
-                                                    <tr><td>is_cancellation_acknowledged</td><td>{{$bill->is_cancellation_acknowledged}}</td></tr>
-                                                    <tr><td>is_cancelled_by_administrator</td><td>{{$bill->is_cancelled_by_administrator}}</td></tr>
-                                                    <tr><td>total_expected</td><td>{{$bill->total_expected}}</td></tr>
-                                                    <tr><td>total_paid</td><td>{{$bill->total_paid}}</td></tr>
-                                                </tbody>
-                                            </table>
-                                        </td> */ ?>
-                                        <td class="text-nowrap">{{friendlier_date_time($bill->effective_date, false)}}</td>
+                                        <td class="text-nowrap">{{friendlier_date_time($bill->careMonth->end_date, false)}}</td>
                                         <td>{{$bill->code}} {{$bill->cm_or_rm}} {{$bill->is_cancelled}}</td>
                                         <td class="">
                                             @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
@@ -1041,42 +1021,22 @@
                                             @endif
                                         </td>
                                         <td class="">
-                                            <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }} (HCP)</div>
+                                            <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->genericPro ? $bill->genericPro->displayName() : '' }} (HCP)</div>
                                             <div class="text-nowrap mt-1">
                                                 <span class="text-secondary">Paid: </span>
-                                                <span>{{ $bill->has_hcp_been_paid ? 'Yes' : 'No' }}</span>
+                                                <span>{{ $bill->has_generic_pro_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>
+                                                    <span class="font-weight-bold">${{ $bill->generic_pro_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>
+                                                    <span class="font-weight-bold">${{ $bill->generic_pro_payment_amount }}</span>
                                                 </div>
                                             @endif
-                                            @if($bill->ally)
-                                                <hr>
-                                                <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->ally->displayName() }} (NA)</div>
-                                                <div class="text-nowrap mt-1">
-                                                    <span class="text-secondary">Paid: </span>
-                                                    <span>{{ $bill->has_na_been_paid ? 'Yes' : 'No' }}</span>
-                                                </div>
-                                                @if(!$bill->has_na_been_paid)
-                                                    <div class="text-nowrap mt-1">
-                                                        <span class="text-secondary">Expected: </span>
-                                                        <span class="font-weight-bold">${{ $bill->na_expected_payment_amount }}</span>
-                                                    </div>
-                                                @else
-                                                    <div class="text-nowrap mt-1">
-                                                        <span class="text-secondary">Amount: </span>
-                                                        <span class="font-weight-bold">${{ $bill->na_payment_amount }}</span>
-                                                    </div>
-                                                @endif
-                                            @endif
-
                                         </td>
                                         <td class="pr-3">
                                             @if($bill->has_hcp_been_paid)
@@ -1089,19 +1049,19 @@
                                         </td>
                                         <td>
                                             @if(!$bill->is_cancelled)
-                                                @if($bill->is_signed_by_hcp)
+                                                @if($bill->is_signed_by_generic_pro)
                                                     <span class="d-block text-secondary text-nowrap">
                                                             <i class="fa fa-check"></i>
-                                                            HCP Signed
+                                                            Pro Signed
                                                         </span>
                                                 @else
                                                     <span moe
                                                           class="d-block {{ $bill->hcp_pro_id !== $pro->id && $pro->pro_type !== 'ADMIN' ? 'moe-disabled' : '' }}"
-                                                          title="{{ $bill->hcp_pro_id !== $pro->id  && $pro->pro_type !== 'ADMIN' ? 'Only the bill\'s HCP can sign' : '' }}">
+                                                          title="{{ $bill->hcp_pro_id !== $pro->id  && $pro->pro_type !== 'ADMIN' ? 'Only the bill\'s Pro can sign' : '' }}">
                                                         <a class="" href="" show start>Sign As HCP</a>
-                                                        <form url="/api/bill/signAsHcp">
+                                                        <form url="/api/bill/signAsGenericPro">
                                                             <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                            <p>Sign this bill as HCP?</p>
+                                                            <p>Sign this bill?</p>
                                                             <div class="mb-0">
                                                                 <button class="btn btn-success btn-sm" submit>Sign</button>
                                                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>

resources/views/app/patient/note/dashboard.blade.php

@@ -738,7 +738,7 @@ use App\Models\Handout;
                                                     {{ $iSupplyOrder->product->title }}
                                                 </td>
                                                 <td class="px-2">{{ $iSupplyOrder->reason }}</td>
-                                                <td class="px-2">{{ friendlier_date($iSupplyOrder->created_at) }} <i class="fas fa-info-circle text-primary" data-toggle="tooltip" data-placement="top" data-html="true" title="Created at: {{ friendlier_date_time($iSupplyOrder->created_at) }} By: {{ $iSupplyOrder->createdByPro->displayName() }}"></i> </td>
+                                                <td class="px-2">{{ friendlier_date($iSupplyOrder->created_at) }} <i class="fas fa-info-circle text-primary" data-toggle="tooltip" data-placement="top" data-html="true" title="Created at: {{ friendlier_date_time($iSupplyOrder->created_at) }} By: {{ $iSupplyOrder->createdByPro ? $iSupplyOrder->createdByPro->displayName() : ''}}"></i> </td>
                                                 <td class="px-2">
                                                     {{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}
                                                     <i class="fas fa-info-circle text-primary" data-toggle="tooltip" data-placement="top" data-html="true" title="Signed at: {{ friendlier_date_time($iSupplyOrder->pro_signed_at) }}"></i>

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

@@ -140,13 +140,15 @@
                                 {{$row->hcp->name_last}}, {{$row->hcp->name_first}}
                                 <div class="mt-1 text-sm text-secondary">
                                     <i class="fa fa-hospital mr-1"></i>
-                                    {{$row->hcpCompany? $row->hcpCompanyPro->company->name:''}}
+                                    {{$row->hcpCompanyPro ? $row->hcpCompanyPro->company->name:''}}
                                 </div>
                                 @elseif(request()->input('t') === 'na')
                                 {{$row->genericPro->name_last}}, {{$row->genericPro->name_first}}
                                 <div class="mt-1 text-sm text-secondary">
                                     <i class="fa fa-hospital mr-1"></i>
-                                    {{$row->genericCompanyPro->company->name}}
+                                    @if($row->genericCompanyPro && $row->genericCompanyPro->company)
+                                        {{$row->genericCompanyPro->company->name}}
+                                    @endif
                                 </div>
                                 @endif
 
@@ -293,4 +295,4 @@
         addMCInitializer('processing-bill-matrix', init, '#processing-bill-matrix');
     }).call(window);
 </script>
-@endsection
+@endsection