app/Helpers/helpers.php

@@ -141,7 +141,7 @@ if(!function_exists('inchesAfterFeetFromInches')) {
 }
 
 if(!function_exists('genericBills')) {
-    function genericBills(Pro $performerPro, $patient,$careMonth, $entityType, $entityUid) {
+    function genericBills(Pro $performerPro, $patient,$careMonth, $entityType, $entityUid, $paginate = false) {
         $genericBills = Bill::where('bill_service_type', 'GENERIC');
         if($performerPro->pro_type !== 'ADMIN') {
             $genericBills = $genericBills->where('generic_pro_id', $performerPro->id);
@@ -163,6 +163,10 @@ if(!function_exists('genericBills')) {
 
 
         }
+        if($paginate) {
+            return $genericBills->orderBy('created_at', 'DESC')->paginate(25);
+        }
+
         return $genericBills->orderBy('created_at', 'DESC')->get();
     }
 }

resources/views/app/generic-bills/add-bill-form/_default-fields.blade.php

@@ -21,7 +21,7 @@
     <input type="hidden" name="optionalClientUid" value="{{$patient->uid}}">
 @endif
 @if(@$entityType)
-    <input type="hidden" name="genericTargetEntityType" value="{{$entityType}}">
+    <input type="hidden" name="genericTargetEntityType" value="{{@$entityType}}">
 @endif
 @if(@$entityUid)
     <input type="hidden" name="genericTargetEntityUid" value="{{$entityUid}}">
@@ -37,7 +37,7 @@
     <div class="mb-2">
         <label for="" class="text-secondary text-sm mb-1">Service</label>
         <select autofocus class="form-control" name="code"
-                data-entity-type="{{$entityType}}"
+                data-entity-type="{{@$entityType}}"
                 onchange="switchGenericRate(this)">
             <option value="">-- Select Code --</option>
             @foreach($genericPro->genericRates() as $genericRate)
@@ -69,7 +69,7 @@
     <input type="hidden" name="numberOfUnits" value="1">
     <div class="mb-2" calculated-generic-amount></div>
 </div>
-@if($entityType !== 'Note')
+@if(@$entityType !== 'Note')
     <div class="mb-2">
         <label for="" class="text-secondary text-sm mb-1">Description</label>
         <input type="text" name="genericDescription" class="form-control form-control-sm" value="">

resources/views/app/generic-bills/add-bill-form/_default-script.blade.php

@@ -7,7 +7,7 @@
                 if ($(_trigger).find('option:selected').first().length) {
                     selectedGenericRate = +($(_trigger).find('option:selected').first().attr('data-amount'));
                 }
-                $(_trigger).closest('form').find('[name="numberOfUnits"]').val('');
+                //$(_trigger).closest('form').find('[name="numberOfUnits"]').val('');
 
                 @if($genericRates && count($genericRates) && count($genericRates) === 1)
                     selectedGenericRate = {{ $genericRates[0]->amount }};

resources/views/app/generic-bills/inline.blade.php

@@ -10,8 +10,9 @@ use App\Models\Client;
 /** @var Client $patient */
 /** @var $entityType */
 /** @var $entityUid */
+/** @var $paginate */
 
-$genericBills = genericBills($pro, @$patient, @$careMonth, @$entityType, @$entityUid);
+$genericBills = genericBills($pro, @$patient, @$careMonth, @$entityType, @$entityUid, @$paginate);
 ?>
 
 @if(!count($genericBills))
@@ -23,11 +24,20 @@ $genericBills = genericBills($pro, @$patient, @$careMonth, @$entityType, @$entit
 @else
     <div class="{{@$class ? $class : ''}}">
         <div class="d-flex align-items-center mb-2">
-            <p class="font-weight-bold m-0">{{@$label ? $label : 'Admin.'}} Bills</p>
+            <p class="font-weight-bold m-0 font-size-16">{{@$label ? $label : 'Admin.'}} Bills</p>
             @if(!@$noCreate)
                 <span class="mx-2 text-secondary">|</span>
                 @include('app.generic-bills.create_generic-bill')
             @endif
+            @if(@$paginate)
+                <div class="ml-auto">
+                    <div class="px-3 mt-3 d-flex align-items-center">
+                        {{ $genericBills->links() }}
+                        <div class="ml-4 mb-3">Showing <b>{{ $genericBills->firstItem() }}</b> to <b>{{ $genericBills->lastItem() }}</b> (page
+                            {{ $genericBills->currentPage() }}) of <b>{{ $genericBills->total() }}</b></div>
+                    </div>
+                </div>
+            @endif
         </div>
             <table class="table table-sm table-striped mb-0 table-bordered">
                 <thead class="bg-light">

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

@@ -1197,8 +1197,18 @@ $leanView = request()->input('popupmode') && request()->input('fromNoteUid');
                                 </div>
 
                                 <div class="d-flex align-items-baseline">
-                                    <div class="text-secondary font-weight-normal">Primary Coverage:&nbsp;</div>
-                                    <b class="d-inline-flex">@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>
+                                    <?php $cards = $patient->insuranceCardsCustom(); ?>
+                                    @if($cards && count($cards) > 0)
+                                        <div class="d-inline-flex">
+                                            <div class="text-secondary font-weight-normal">Insurance:&nbsp;</div>
+                                            <div>
+                                                @include('app.patient.insurance_card_renderer', ['insurance_cards' => $cards])
+                                            </div>
+                                        </div>
+                                    @else
+                                        <div class="text-secondary font-weight-normal">Primary Coverage:&nbsp;</div>
+                                        <b class="d-inline-flex">@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>
+                                    @endif
                                 </div>
                             @endif
                         </div>

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

@@ -47,7 +47,7 @@
                         <span class="ml-1 pr-2">{{$card->carrier_name}}</span>
                     @endif
 
-                    <span class="ml-auto text-muted text-sm">{{substr($card->coverage_order, 0, 3)}}</span>
+                    <span class="ml-1 text-muted text-sm">{{substr($card->coverage_order, 0, 3)}}</span>
                 </div>
             @endforeach
         </div>

resources/views/app/patient/note/partials/cpp-bills-claims-container.blade.php

@@ -137,8 +137,18 @@
             @endif
 
             <div class="d-flex align-items-baseline">
-                <div class="text-secondary font-weight-normal">Primary Coverage:&nbsp;</div>
-                <b class="d-inline-flex">@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>
+                <?php $cards = $patient->insuranceCardsCustom(); ?>
+                @if($cards && count($cards) > 0)
+                    <div class="d-inline-flex">
+                        <div class="text-secondary font-weight-normal">Insurance:&nbsp;</div>
+                        <div>
+                            @include('app.patient.insurance_card_renderer', ['insurance_cards' => $cards])
+                        </div>
+                    </div>
+                @else
+                    <div class="text-secondary font-weight-normal">Primary Coverage:&nbsp;</div>
+                    <b class="d-inline-flex">@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>
+                @endif
             </div>
         </div>
     </div>

resources/views/app/practice-management/generic-bills.blade.php

@@ -4,7 +4,7 @@
 
     <div class="p-3 mcp-theme-1">
 
-    @include('app.generic-bills.inline', ['adminView' => true, 'noCreate' => true])
+    @include('app.generic-bills.inline', ['adminView' => true, 'noCreate' => true, 'paginate' => true])
 
     </div>
 

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

@@ -159,7 +159,12 @@
                             </td>
                             <td>
                             @if($row->client)
-                                @include('app.patient.coverage_column_renderer', ['patient'=>$row->client])
+                                <?php $cards = $row->client->insuranceCardsCustom(); ?>
+                                @if($cards && count($cards) > 0)
+                                    @include('app.patient.insurance_card_renderer', ['insurance_cards' => $cards])
+                                @else
+                                    @include('app.patient.coverage_column_renderer', ['patient'=>$row->client])
+                                @endif
                             @endif
                             </td>
                             <td>