|
@@ -146,8 +146,12 @@ class Record extends Component
|
|
|
/*->where(function ($query) {
|
|
/*->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})*/
|
|
})*/
|
|
|
- ->whereNotIn('member_id', $exclude_from_records);
|
|
|
|
|
- if ($this->filterCausals != null && sizeof($this->filterCausals) > 0)
|
|
|
|
|
|
|
+ ->where(function ($query) use ($exclude_from_records) {
|
|
|
|
|
+ $query->where('type', 'OUT')
|
|
|
|
|
+ ->orWhere(function ($subquery) use ($exclude_from_records) {
|
|
|
|
|
+ $subquery->whereNotIn('member_id', $exclude_from_records);
|
|
|
|
|
+ });
|
|
|
|
|
+ }); if ($this->filterCausals != null && sizeof($this->filterCausals) > 0)
|
|
|
{
|
|
{
|
|
|
$causals = array();
|
|
$causals = array();
|
|
|
foreach($this->filterCausals as $z)
|
|
foreach($this->filterCausals as $z)
|