فهرست منبع

fixed querying bills

= 3 سال پیش
والد
کامیت
2926863ef4
2فایلهای تغییر یافته به همراه11 افزوده شده و 5 حذف شده
  1. 9 3
      app/Helpers/helpers.php
  2. 2 2
      resources/views/app/patient/care-month/dashboard.blade.php

+ 9 - 3
app/Helpers/helpers.php

@@ -147,9 +147,15 @@ if(!function_exists('genericBills')) {
             $genericBills = $genericBills->where('client_id', $patient->id);
         }
         if($entityType && $entityUid) {
-            $genericBills = $genericBills
-                ->where('generic_target_entity_type', $entityType)
-                ->where('generic_target_entity_uid', $entityUid);
+            if($entityType == 'CareMonth'){
+                $genericBills = $genericBills
+                    ->where('care_month_id', $entityUid);
+            }else{
+                $genericBills = $genericBills
+                    ->where('generic_target_entity_type', $entityType)
+                    ->where('generic_target_entity_uid', $entityUid);
+            }
+            
         }
         return $genericBills->orderBy('created_at', 'DESC')->get();
     }

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

@@ -919,7 +919,7 @@
             @if($pro->pro_type === 'ADMIN')
 
                 <div class="screen-only m-neg-4 mb-3">
-                    @include('app.generic-bills.inline-for-cm', ['patient' => $patient, 'careMonth' => $careMonth, 'class' => 'p-3 border-bottom', 'label' => 'MCP', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->uid])
+                    @include('app.generic-bills.inline-for-cm', ['patient' => $patient, 'careMonth' => $careMonth, 'class' => 'p-3 border-bottom', 'label' => 'MCP', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->id])
                 </div>
 
             @endif
@@ -1354,7 +1354,7 @@
 
         {{-- generic bills --}}{{--
         <div class="row">
-            @include('app.generic-bills.inline', ['patient' => $patient, 'class' => 'col-12', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->uid])
+            @include('app.generic-bills.inline', ['patient' => $patient, 'class' => 'col-12', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->id])
         </div>--}}
 
     </div>