shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip scope if type is empty

Browse Source
This commit is contained in:
Denis Duliçi
2020-12-28 14:50:32 +03:00
parent 1abb446f93
commit f8d0075f79
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Traits/Scopes.php
View File

@@ -27,8 +27,14 @@ trait Scopes
return;
}
$type = $this->getTypeFromRequest();
if (empty($type)) {
return;
}
// Apply type scope
$builder->where($model->getTable() . '.type', '=', $this->getTypeFromRequest());
$builder->where($model->getTable() . '.type', '=', $type);
}
/**
@@ -65,7 +71,7 @@ trait Scopes
public function getTypeFromRequest()
{
$type = request()->get('type') ?: Str::singular(request()->segment(2, ''));
$type = request()->get('type') ?: Str::singular((string) request()->segment(2));
if ($type == 'revenue') {
$type = 'income';