Explorar o código

Caremonth - no more RM bills + fix neg days cond

Vijayakrishnan %!s(int64=3) %!d(string=hai) anos
pai
achega
a3d560a649
Modificáronse 1 ficheiros con 13 adicións e 7 borrados
  1. 13 7
      resources/views/app/patient/care-month/dashboard.blade.php

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

@@ -260,9 +260,15 @@
                                     @endif
                                 </div>
                                 @if($careMonth->showMeasurementDaysWarning())
-                                    <div class="alert alert-warning p-2 mt-1">
-                                        Need <b>{{16 - $careMonth->number_of_days_with_remote_measurements}} more days</b> with measurements before RM becomes billable.
-                                    </div>
+                                    <?php
+                                    $moreDays = 16 - $careMonth->number_of_days_with_remote_measurements;
+                                    if($moreDays < 0) $moreDays = 0;
+                                    ?>
+                                    @if($moreDays > 0)
+                                        <div class="alert alert-warning p-2 mt-1">
+                                            Need <b>{{$moreDays}} more day{{$moreDays !== 1 ? 's' : ''}}</b> with measurements before RM becomes billable.
+                                        </div>
+                                    @endif
                                 @endif
 
                                 <div class="mt-2">
@@ -336,13 +342,13 @@
                                 </div>
                                 @endif
 
-                                @if(($daysDiff !== -1 && $daysDiff <= 90) && 
+                                {{--@if(($daysDiff !== -1 && $daysDiff <= 90) &&
                                     $careMonth->number_of_days_with_remote_measurements >= 16 &&
                                     $careMonth->has_mcp_interacted_with_client_about_rm)
                                     <div class="mt-2 border border-info p-2">
                                         @include('app.rm-bills.inline', ['patient' => $patient, 'entityType' => 'CareMonth', 'entityUid' => $careMonth->uid, 'label' => 'RM'])
                                     </div>
-                                @endif
+                                @endif--}}
 
                                 <div class="mt-2">
                                     {{-- rm reasons --}}
@@ -1824,10 +1830,10 @@
 
         <hr class="m-negator my-3">
 
-        {{-- generic bills --}}
+        {{-- generic bills --}}{{--
         <div class="row">
             @include('app.generic-bills.inline', ['patient' => $patient, 'class' => 'col-12', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->uid])
-        </div>
+        </div>--}}
 
     </div>