Merge branch 'master' into dev

app/Http/Controllers/AdminController.php

@@ -82,7 +82,7 @@ class AdminController extends Controller
                 break;
         }
 
-        $patients = $patients->orderBy('created_at', 'DESC')->get();
+        $patients = $patients->orderBy('created_at', 'DESC')->paginate(20);
         return view('app.mcp.patients', compact('patients', 'filters'));
     }
 
@@ -166,5 +166,5 @@ class AdminController extends Controller
         return view('app.mcp.supply_orders', compact('supplyOrders'));
     }
 
-   
+
 }

resources/views/app/patient/coverage-status.blade.php

@@ -10,19 +10,19 @@
         <tr>
           <td class="font-weight-bold">Medicare Part B (Primary)</td>
           <td>
-            @if($coverage->auto_medicare_is_partbprimary)
+            @if($coverage->auto_medicare_is_partbprimary == 'YES')
               <span><i class="fas fa-check-circle text-success"></i> (auto)</span>
             @elseif(!$coverage->auto_medicare_is_match_found)
               <span><i class="fas fa-times text-danger"></i> record not found (auto)</span>
             @else
-              <span><i class="fas fa-times text-danger"></i> not primary!</span> <br>
+              <span><i class="fas fa-times text-danger"></i> {{$coverage->auto_medicare_is_partbprimary}}</span> <br>
               <span><i class="fas fa-check-circle text-success"></i> record found</span> <br>
               <span><b>Part B:</b> {{$coverage->auto_medicare_is_partbactive}}</span> <br>
               <span><b>Part C:</b> {{$coverage->auto_medicare_is_partcactive}}</span>
             @endif
           </td>
         </tr>
-        @if($coverage->auto_medicare_is_partbactive)
+        @if($coverage->auto_medicare_is_partbactive == 'YES')
         <tr>
           <td class="font-weight-bold">Part B Deductible</td>
           <td>{{$coverage->auto_medicare_mpb_deductible ?? '-'}}</td>

resources/views/app/patient/notes.blade.php

@@ -6,7 +6,7 @@
     <div class="pt-2 d-flex align-items-start">
         <h6 class="my-0 text-secondary d-flex align-items-center w-100">
             <span class="font-weight-bold text-secondary">Notes</span>
-            @if($patient->latestClientPrimaryCoverage->is_covered == 'YES')
+            @if(true || $patient->latestClientPrimaryCoverage->is_covered == 'YES')
                 <span class="mx-2 text-secondary">|</span>
 
                 <div moe>

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

@@ -140,7 +140,7 @@
                                     {{$row->hcp->name_last}}, {{$row->hcp->name_first}}
                                     <div class="mt-1 text-sm text-secondary font-weight-bold">
                                         <i class="fa fa-hospital mr-1"></i>
-                                        {{$row->hcpCompanyPro->company->name}}
+                                        {{$row->hcpCompany? $row->hcpCompanyPro->company->name:''}}
                                     </div>
                                 @elseif(request()->input('t') === 'na')
                                     {{$row->genericPro->name_last}}, {{$row->genericPro->name_first}}