Browse Source

merged conflict

= 3 years ago
parent
commit
32f77f6333
1 changed files with 0 additions and 19 deletions
  1. 0 19
      resources/views/app/patient/coverage_column_renderer.blade.php

+ 0 - 19
resources/views/app/patient/coverage_column_renderer.blade.php

@@ -39,24 +39,6 @@
         @else
             <small class="ml-2 text-muted">(No insurance)</small>
         @endif
-<<<<<<< HEAD
-    @else
-        <small class="ml-2 text-muted">(No insurance)</small>
-    @endif
-    @if($coverage && $coverage->plan_type === 'MEDICARE')
-        @if(@$patient->mpb_remaining !== null && $patient->mpb_remaining == 0)
-        	<i class="ml-2 fa fa-circle"></i>
-	@endif
-    @endif
-</div>
-@if($coverage)
-    @if($coverage->plan_type === 'COMMERCIAL')
-        @if(@$coverage->deductible_amount !== null)
-            <small class="d-none pending_availity text-muted d-bloc d-none ml-3">Deductible: {{format_number(@$coverage->deductible_amount)}} </small>
-        @endif
-    @endif
-@endif
-=======
         <div class="">
             @if($coverage)
                 @if($coverage && $coverage->plan_type === 'MEDICARE')
@@ -73,4 +55,3 @@
         </div>
     </div>
 </div>
->>>>>>> a9a2330bfd002853a7adea9d2e38abd44071358b