Helper genericBills($performerPro, $patient, $entityType, $entityUid)

app/Helpers/helpers.php

@@ -7,9 +7,30 @@
  */
 
 use App\Models\AppSession;
+use App\Models\Client;
+use App\Models\Pro;
+use App\Models\Bill;
 //require_once './class.Diff.php';
 use Soundasleep\Html2Text as Html2Text;
 
+if(!function_exists('genericBills')) {
+    function genericBills(Pro $performerPro, Client $patient, $entityType, $entityUid) {
+        $genericBills = Bill::where('bill_service_type', 'GENERIC');
+        if($performerPro->pro_type !== 'ADMIN') {
+            $genericBills = $genericBills->where('generic_pro_id', $performerPro->id);
+        }
+        if($patient) {
+            $genericBills = $genericBills->where('client_id', $patient->id);
+        }
+        if($entityType && $entityUid) {
+            $genericBills = $genericBills
+                ->where('generic_target_entity_type', $entityType)
+                ->where('generic_target_entity_uid', $entityUid);
+        }
+        return $genericBills->orderBy('created_at', 'DESC')->get();
+    }
+}
+
 if(!function_exists('queryLineExcept')) {
     function queryLineExcept($except = []) {
         $params = request()->all();

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

@@ -8,19 +8,10 @@ use App\Models\Client;
 /** @var Pro $genericPro */
 /** @var Pro $pro */
 /** @var Client $patient */
+/** @var $entityType */
+/** @var $entityUid */
 
-$genericBills = [];
-$genericBills = \App\Models\Bill::where('bill_service_type', 'GENERIC');
-if(@$note) {
-    $genericBills = $genericBills->where('note_id', $note->id);
-}
-if(@$patient) {
-    $genericBills = $genericBills->where('client_id', $patient->id);
-}
-if($pro->pro_type !== 'ADMIN') {
-    $genericBills = $genericBills->where('generic_pro_id', $pro->id);
-}
-$genericBills = $genericBills->orderBy('created_at', 'DESC')->get();
+$genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
 ?>
 
 @if(!count($genericBills))