diff --git a/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php index 8b264ff5..c0eb9e74 100644 --- a/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php +++ b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php @@ -16,9 +16,7 @@ class IsMappedFalseOrMappedButStatusIn implements Filter { return $builder->where(function($q) use ($value) { $q->whereDoesntHave('owners'); - $q->orwhereHas('owners', function($query) use ($value) { - $query->whereIn('status', $value); - }); + $q->orwhereDoesntHave('owner_status'); }); } diff --git a/app/Models/StatementTransaction.php b/app/Models/StatementTransaction.php index eb4bcdc8..4bba7903 100644 --- a/app/Models/StatementTransaction.php +++ b/app/Models/StatementTransaction.php @@ -49,6 +49,11 @@ class StatementTransaction extends Model return $this->hasMany(StatementTransactionOwner::class); } + public function owner_status() + { + return $this->owners()->whereIn('status',[ApprovalStatus::APPROVED,ApprovalStatus::COMPLETED,ApprovalStatus::PENDING_VERIFICATION]); + } + public function scopeDoesntMapStatement($query) { $query->whereDoesntHave('owners', function($query){