fix(modifier): consider null activities

KennethTrecy · May 26, 2024 · 691b863 · 691b863
1 parent 38496f4
commit 691b863
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/app/Models/ModifierModel.php b/app/Models/ModifierModel.php
@@ -62,7 +62,13 @@ public function limitSearchToUser(BaseResourceModel $query_builder, User $user)
         return $query_builder
             ->whereIn("debit_account_id", $account_subquery)
             ->whereIn("credit_account_id", $account_subquery)
-            ->whereIn("debit_cash_flow_activity_id", $cash_flow_activity_subquery)
-            ->whereIn("credit_cash_flow_activity_id", $cash_flow_activity_subquery);
+            ->groupStart()
+                ->whereIn("debit_cash_flow_activity_id", $cash_flow_activity_subquery)
+                ->orWhere("debit_cash_flow_activity_id IS NULL")
+            ->groupEnd()
+            ->groupStart()
+                ->whereIn("credit_cash_flow_activity_id", $cash_flow_activity_subquery)
+                ->orWhere("credit_cash_flow_activity_id IS NULL")
+            ->groupEnd();
     }
 }