|
|
@@ -191,7 +191,10 @@ class Reports extends Component
|
|
|
})
|
|
|
->whereRaw('records_rows.when REGEXP ?', [$pairs])
|
|
|
->whereNotIn('records_rows.causal_id', $excluded_causals)
|
|
|
- ->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->where(function ($query) use ($excluded_members) {
|
|
|
+ $query->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->orWhere('member_id', null);
|
|
|
+ })
|
|
|
->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|
|
|
@@ -233,7 +236,10 @@ class Reports extends Component
|
|
|
})
|
|
|
->whereRaw('records_rows.when REGEXP ?', [$pairs])
|
|
|
->whereNotIn('records_rows.causal_id', $excluded_causals)
|
|
|
- ->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->where(function ($query) use ($excluded_members) {
|
|
|
+ $query->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->orWhere('member_id', null);
|
|
|
+ })
|
|
|
->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|
|
|
@@ -325,7 +331,10 @@ class Reports extends Component
|
|
|
})
|
|
|
->whereRaw('records_rows.when REGEXP ?', [$pairs])
|
|
|
->whereNotIn('records_rows.causal_id', $excluded_causals)
|
|
|
- ->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->where(function ($query) use ($excluded_members) {
|
|
|
+ $query->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->orWhere('member_id', null);
|
|
|
+ })
|
|
|
->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|
|
|
@@ -362,7 +371,10 @@ class Reports extends Component
|
|
|
})
|
|
|
->whereRaw('records_rows.when REGEXP ?', [$pairs])
|
|
|
->whereNotIn('records_rows.causal_id', $excluded_causals)
|
|
|
- ->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->where(function ($query) use ($excluded_members) {
|
|
|
+ $query->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->orWhere('member_id', null);
|
|
|
+ })
|
|
|
->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|
|
|
@@ -438,7 +450,10 @@ class Reports extends Component
|
|
|
})
|
|
|
->whereRaw('records_rows.when REGEXP ?', [$pairs])
|
|
|
->whereNotIn('records_rows.causal_id', $excluded_causals)
|
|
|
- ->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->where(function ($query) use ($excluded_members) {
|
|
|
+ $query->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->orWhere('member_id', null);
|
|
|
+ })
|
|
|
->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|
|
|
@@ -475,7 +490,10 @@ class Reports extends Component
|
|
|
})
|
|
|
->whereRaw('records_rows.when REGEXP ?', [$pairs])
|
|
|
->whereNotIn('records_rows.causal_id', $excluded_causals)
|
|
|
- ->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->where(function ($query) use ($excluded_members) {
|
|
|
+ $query->whereNotIn('member_id', $excluded_members)
|
|
|
+ ->orWhere('member_id', null);
|
|
|
+ })
|
|
|
->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|