Merge pull request 'Changed filter logic in item resource page' (#1330) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Reviewed-on: #1330
This commit was merged in pull request #1330.
This commit is contained in:
@@ -391,23 +391,11 @@ class ItemResource extends Resource
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($data['uom'])) {
|
if (! empty($data['uom'])) {
|
||||||
if ($data['uom'] == 'empty') {
|
$query->where('uom', 'like', '%'.$data['uom'].'%');
|
||||||
$query->where(function ($q) {
|
|
||||||
$q->where('uom', '')->orWhereNull('uom');
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
$query->where('uom', 'like', '%'.$data['uom'].'%');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($data['category'])) {
|
if (! empty($data['category'])) {
|
||||||
if ($data['category'] == 'empty') {
|
$query->where('category', '%'.$data['category'].'%');
|
||||||
$query->where(function ($q) {
|
|
||||||
$q->where('category', '')->orWhereNull('category');
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
$query->where('category', '%'.$data['category'].'%');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($data['created_from'])) {
|
if (! empty($data['created_from'])) {
|
||||||
|
|||||||
Reference in New Issue
Block a user