diff --git a/app/Models/IkeaProducts.php b/app/Models/IkeaProducts.php index d7ddc13..0f86c16 100644 --- a/app/Models/IkeaProducts.php +++ b/app/Models/IkeaProducts.php @@ -31,9 +31,9 @@ class IkeaProducts extends Model if ($country != '') $result = $result->where('country',$country); return $result->get(); } else if (strlen($item >= 5)) { - if ($country != '') $result = $this->where('country',$country); - $result = $result->where(function ($query) use ($item) { $query->where('typeName', 'LIKE', '%' . $item . '%')->orWhere('name', 'LIKE', '%' . $item . '%'); } ); - + $result = $this->where(function ($query) use ($item) { $query->where('typeName', 'LIKE', '%' . $item . '%')->orWhere('name', 'LIKE', '%' . $item . '%'); } ); + if ($country != '') $result = $result->where('country',$country); + return $result->get(); } diff --git a/resources/js/Pages/IkeaRoot.vue b/resources/js/Pages/IkeaRoot.vue index b151bf6..842fe2f 100644 --- a/resources/js/Pages/IkeaRoot.vue +++ b/resources/js/Pages/IkeaRoot.vue @@ -178,9 +178,9 @@ const async_search = async (item) => { } -function customLabel({ item, desc }) { +function customLabel({ item, desc, code }) { //console.log(item); - return `${item} - ${desc}`; + return `${item} - ${desc} - ${code}`; } const headers = ref([ { text: "Id", value: "id", sortable: true },