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

app/Models/ClientPrimaryCoverage.php

@@ -40,6 +40,15 @@ class ClientPrimaryCoverage extends Model
         return $status;
     }
 
+    public function insuranceDisplayName(){
+        $coverageName = $this->toString();
+        if(stripos($coverageName, 'medicare') !== false) return 'Medicare';
+        if(stripos($coverageName, 'medicaid') !== false) return 'Medicaid';
+        if(stripos($coverageName, 'commercial') !== false) return 'Commercial';
+        return null;
+
+    }
+
     public function toString() {
         $parts = [];
         $parts[] = $this->plan_type;

resources/views/app/dashboard-admin.blade.php

@@ -63,7 +63,7 @@
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_supply_orders_awaiting_review_count_as_mcp()}}</th>
-                                    <th class="pl-2">Cancelled Supply Orders Pending Review</th>
+                                    <th class="pl-2">Cancelled Supply Orders</th>
                                 </tr>
 
                                 <tr>

resources/views/app/dashboard-dna.blade.php

@@ -63,7 +63,7 @@
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_supply_orders_awaiting_review_count_as_mcp()}}</th>
-                                    <th class="pl-2">Cancelled Supply Orders Pending Review</th>
+                                    <th class="pl-2">Cancelled Supply Orders</th>
                                 </tr>
 
                                 <tr>

resources/views/app/dashboard-mcp.blade.php

@@ -143,8 +143,8 @@
                                            native target="_blank"
                                            open-in-stag-popup
                                            popup-style="tall"
-                                           title="Cancelled Supply Orders Pending Review">
-                                            Cancelled Supply Orders Pending Review
+                                           title="Cancelled Supply Orders">
+                                            Cancelled Supply Orders
                                         </a>
                                     </th>
                                 </tr>

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

@@ -43,7 +43,7 @@
 				@endif
 				<?php $coverage = $patient->getPrimaryCoverage(); ?>
 				@if($coverage)
-				{{$coverage->toString()}}
+				{{$coverage->insuranceDisplayName()}}
 				@endif
 			</td>
 			<td>{{$patient->lastMcpAppointment() ? $patient->lastMcpAppointment()->start_date : '-'}}</td>

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

@@ -171,7 +171,7 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                             @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                 <div class="mt-2 text-secondary">
                                     <i class="fa fa-exclamation-triangle"></i>
-                                    Not Acknowledged
+                                    Not Ack.
                                 </div>
                                 <div class="d-block mt-1" moe>
                                     <a class="" href="" show start>Ack. Cancellation</a>
@@ -190,7 +190,7 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                             @if($bill->is_cancellation_acknowledged)
                                 <div class="mt-2 text-secondary">
                                     <i class="fa fa-check"></i>
-                                    Acknowledged
+                                    Ack.
                                 </div>
                                 <div class="d-block mt-1" moe>
                                     <a class="" href="" show start>Undo Cancellation Ack.</a>

resources/views/app/mcp/cancelled_supply_orders_pending_review.blade.php

@@ -4,7 +4,7 @@
         <div class="card-header px-3 py-2 hide-inside-popup border-bottom-0">
             <strong class="mr-4">
                 <i class="fas fa-box"></i>
-                Cancelled Supply Orders Pending Review
+                Cancelled Supply Orders
             </strong>
         </div>
 

resources/views/app/mcp/new_patients_awaiting_visit.blade.php

@@ -55,7 +55,7 @@
                                 @endif
                                 <?php $coverage = $row->getPrimaryCoverage(); ?>
                                 @if($coverage)
-                                    {{ucwords(strtolower($coverage->toString()))}}
+                                    {{$coverage->insuranceDisplayName()}}
                                 @endif
                               </div>
                             </td>

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

@@ -43,7 +43,7 @@
 					@endif
 					<?php $coverage = $patient->getPrimaryCoverage(); ?>
 					@if($coverage)
-					{{ucwords(strtolower($coverage->toString()))}}
+					{{$coverage->insuranceDisplayName()}}
 					@endif
 				</div>
 			</td>

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

@@ -1657,7 +1657,7 @@
                                             @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                                 <div class="mt-2 text-secondary">
                                                     <i class="fa fa-exclamation-triangle"></i>
-                                                    Not Acknowledged
+                                                    Not Ack.
                                                 </div>
                                                 <div class="d-block mt-1" moe>
                                                     <a class="" href="" show start>Ack. Cancellation</a>
@@ -1676,7 +1676,7 @@
                                             @if($bill->is_cancellation_acknowledged && !$careMonth->is_billing_marked_done)
                                                 <div class="mt-2 text-secondary">
                                                     <i class="fa fa-check"></i>
-                                                    Acknowledged
+                                                    Ack.
                                                 </div>
                                                 <div class="d-block mt-1" moe>
                                                     <a class="" href="" show start>Undo Cancellation Ack.</a>

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

@@ -1359,7 +1359,7 @@
                                                         @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                                             <div class="mt-2 text-secondary">
                                                                 <i class="fa fa-exclamation-triangle"></i>
-                                                                Not Acknowledged
+                                                                Not Ack.
                                                             </div>
                                                             <div class="d-block mt-1" moe>
                                                                 <a class="" href="" show start>Ack. Cancellation</a>
@@ -1378,7 +1378,7 @@
                                                         @if($bill->is_cancellation_acknowledged && !$note->is_billing_marked_done)
                                                             <div class="mt-2 text-secondary">
                                                                 <i class="fa fa-check"></i>
-                                                                Acknowledged
+                                                                Ack.
                                                             </div>
                                                             <div class="d-block mt-1" moe>
                                                                 <a class="" href="" show start>Undo Cancellation Ack.</a>

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

@@ -1465,7 +1465,7 @@
                                     @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                         <div class="mt-2 text-secondary">
                                             <i class="fa fa-exclamation-triangle"></i>
-                                            Not Acknowledged
+                                            Not Ack.
                                         </div>
                                         <div class="d-block mt-1" moe>
                                             <a class="" href="" show start>Ack. Cancellation</a>
@@ -1485,7 +1485,7 @@
                                     @if($bill->is_cancellation_acknowledged && !$note->is_billing_marked_done)
                                         <div class="mt-2 text-secondary">
                                             <i class="fa fa-check"></i>
-                                            Acknowledged
+                                            Ack.
                                         </div>
                                         <div class="d-block mt-1" moe>
                                             <a class="" href="" show start>Undo Cancellation Ack.</a>
@@ -1756,7 +1756,7 @@
                                             @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                                 <div class="ml-2 text-secondary">
                                                     <i class="fa fa-exclamation-triangle"></i>
-                                                    Not Acknowledged
+                                                    Not Ack.
                                                 </div>
                                                 <div class="d-block ml-2" moe>
                                                     <a class="" href="" show start>Ack. Cancellation</a>
@@ -1776,7 +1776,7 @@
                                             @if($bill->is_cancellation_acknowledged && !$note->is_billing_marked_done)
                                                 <div class="ml-2 text-secondary">
                                                     <i class="fa fa-check"></i>
-                                                    Acknowledged
+                                                    Ack.
                                                 </div>
                                                 <div class="d-block ml-2" moe>
                                                     <a class="" href="" show start>Undo</a>

resources/views/app/patient/supply-orders.blade.php

@@ -481,7 +481,7 @@
                         @else
                             <div class="text-secondary font-weight-bold mt-1">
                                 <i class="fa fa-check"></i>
-                                Cancellation Acknowledged
+                                Cancellation Ack.
                             </div>
                             @if($supplyOrder->cancellation_acknowledgement_memo)
                                 <div class="text-sm text-secondary font-italic mt-1">{{$supplyOrder->cancellation_acknowledgement_memo}}</div>

resources/views/app/patients.blade.php

@@ -179,7 +179,7 @@
                             @endif
                             <?php $coverage = $patient->getPrimaryCoverage(); ?>
                             @if($coverage)
-                                {{$coverage->toString()}}
+                                {{$coverage->insuranceDisplayName()}}
                             @endif
                             @include('app.patient.coverage-status')
                         </td>

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

@@ -311,7 +311,7 @@
                             @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
                                 <div class="mt-2 text-secondary">
                                     <i class="fa fa-exclamation-triangle"></i>
-                                    Not Acknowledged
+                                    Not Ack.
                                 </div>
                                 <div class="d-block mt-1" moe>
                                     <a class="" href="" show start>Ack. Cancellation</a>
@@ -330,7 +330,7 @@
                             @if($bill->is_cancellation_acknowledged)
                                 <div class="mt-2 text-secondary">
                                     <i class="fa fa-check"></i>
-                                    Acknowledged
+                                    Ack.
                                 </div>
                                 <div class="d-block mt-1" moe>
                                     <a class="" href="" show start>Undo Cancellation Ack.</a>

resources/views/app/practice-management/cellular-device-manager.blade.php

@@ -74,7 +74,7 @@
                                 @endif
                                 <?php $coverage = $client->getPrimaryCoverage(); ?>
                                 @if($coverage)
-                                    {{$coverage->toString()}}
+                                    {{$coverage->insuranceDisplayName()}}
                                 @endif
                             </td>
 

resources/views/app/practice-management/patient-claim-summary.blade.php

@@ -170,7 +170,7 @@
                                 @endif
                                 <?php $coverage = $patient->getPrimaryCoverage(); ?>
                                 @if($coverage)
-                                    {{$coverage->toString()}}
+                                    {{$coverage->insuranceDisplayName()}}
                                 @endif
                             </td>
                             <td>{{$patient->notes_without_billing_closed}}</td>

resources/views/layouts/patient.blade.php

@@ -366,7 +366,12 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 											<div>{{friendly_date_time($patient->dob, false,null, true)}}({{$patient->age_in_years}}
 												y.o {{$patient->sex}})
 											</div>
-
+											@if($patient->getPrimaryCoverage() &&  $patient->getPrimaryCoverageStatus() === 'YES')
+												<div class="text-nowrap">
+													<i class="fa fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="Covered"></i>
+													{{$patient->getPrimaryCoverage()->insuranceDisplayName()}}
+												</div>
+											@endif
 										</div>
 										<div class="screen-only">
 										<div class=separators>
@@ -742,11 +747,12 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 																									class="on-hover-opaque fa fa-video text-secondary"></i>&nbsp;Join</button>
 																				</div>
                                     </section>
-
+									
+									@if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
 									<section class="hide-inside-popup screen-only vbox align-self-start mt-2 mx-2">
-										@include('app.patient.coverage-status')
+											@include('app.patient.coverage-status')										
 									</section>
-
+									@endif
 									<ul class="vbox mt-2 align-self-start patient-header-address">
 										<li class="d-flex align-items-start">
 											<span class="aligned-icon">