diff --git a/app/Models/IkeaProducts.php b/app/Models/IkeaProducts.php index 7a657d3..2f0bac0 100644 --- a/app/Models/IkeaProducts.php +++ b/app/Models/IkeaProducts.php @@ -41,10 +41,14 @@ class IkeaProducts extends Model if (strlen($text) < 2) return []; $result = $this; - if (strlen($text) >= 2) $result = $result->where("name", 'LIKE', '%'. $text . '%'); - if (strlen($text) > 3) $result->orWhere("typeName", 'LIKE', '%'. $text . '%'); + $result = $this->where(function ($query) use ($text) { + if (strlen($text) >= 2) $query->where("name", 'LIKE', '%'. $text . '%'); + if (strlen($text) > 3) $query->orWhere("typeName", 'LIKE', '%'. $text . '%'); + }); - $result->where('country', $country); + if ($country != '') { + $result->where('country', $country); + } } return $result->get(); }