feat: Add show_in_search language strings to all languages

- Add 'show_in_search' and 'show_in_search_visibility' to all language files - Translated: de-DE, es-ES, fr, it - Placeholder English for remaining languages (awaiting translation) This ensures the SHOW_IN_SEARCH attribute flag works in all locales.
fix: Make item_sort_columns return format compatible with sanitizeSortColumn
2026-05-25 08:44:42 -04:00 · 2026-05-16 21:02:34 +02:00 · 2026-05-16 21:02:34 +02:00 · 2026-05-16 21:02:34 +02:00 · 2026-05-16 21:02:34 +02:00 · 2026-05-16 21:02:34 +02:00
50 changed files with 352 additions and 38 deletions
--- a/app/Controllers/Attributes.php
+++ b/app/Controllers/Attributes.php
@@ -246,7 +246,7 @@ class Attributes extends Secure_Controller
        $data['definition_group'][''] = lang('Common.none_selected_text');
        $data['definition_info'] = $info;

-        $show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES;
+        $show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES | Attribute::SHOW_IN_SEARCH;
        $data['definition_flags'] = $this->get_attributes($show_all);
        $selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
        $data['selected_definition_flags'] = $this->get_attributes($selected_flags);
--- a/app/Controllers/Items.php
+++ b/app/Controllers/Items.php
@@ -105,13 +105,14 @@ class Items extends Secure_Controller
        $search = $this->request->getGet('search', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
        $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort = $this->sanitizeSortColumn(item_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'item_id');
+
+        $definition_names = $this->attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
+
+        $sort = $this->sanitizeSortColumn(item_sort_columns(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'items.item_id');
        $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        $this->item_lib->set_item_location($this->request->getGet('stock_location'));

-        $definition_names = $this->attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
-
        $filters = [
            'start_date'        => $this->request->getGet('start_date'),
            'end_date'          => $this->request->getGet('end_date'),
@@ -129,6 +130,13 @@ class Items extends Secure_Controller
        // Check if any filter is set in the multiselect dropdown
        $request_filters = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? [], true);
        $filters = array_merge($filters, $request_filters);
+
+        // When search_custom is enabled, include attributes that are searchable but may not be visible in table
+        if (!empty($filters['search_custom'])) {
+            $searchable_definitions = $this->attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_SEARCH);
+            $filters['definition_ids'] = array_keys($searchable_definitions);
+        }
+
        $items = $this->item->search($search, $filters, $limit, $offset, $sort, $order);
        $total_rows = $this->item->get_found_rows($search, $filters);
        $data_rows = [];
--- a/app/Helpers/tabular_helper.php
+++ b/app/Helpers/tabular_helper.php
@@ -402,6 +402,25 @@ function item_headers(): array
    ];
 }

+/**
+ * Get all sortable column keys for items table, including dynamic attribute columns.
+ *
+ * @return array Array of column headers in format expected by sanitizeSortColumn
+ */
+function item_sort_columns(): array
+{
+    $attribute = model(Attribute::class);
+    $definitionIds = array_keys($attribute->get_definitions_by_flags($attribute::SHOW_IN_ITEMS));
+
+    $headers = item_headers();
+
+    foreach ($definitionIds as $definitionId) {
+        $headers[] = [(string) $definitionId => ''];
+    }
+
+    return $headers;
+}
+
 /**
 * Get the header for the items tabular view
 */
@@ -422,7 +441,7 @@ function get_items_manage_table_headers(): string
    $headers[] = ['item_pic' => lang('Items.image'), 'sortable' => false];

    foreach ($definitionsWithTypes as $definition_id => $definitionInfo) {
-        $headers[] = [$definition_id => $definitionInfo['name'], 'sortable' => false];
+        $headers[] = [$definition_id => $definitionInfo['name'], 'sortable' => true];
    }

    $headers[] = ['inventory' => '', 'escape' => false];
--- a/app/Language/ar-EG/Attributes.php
+++ b/app/Language/ar-EG/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "استلام البضائع",
    "show_in_sales"                    => "اظهار خلال البيع",
    "show_in_sales_visibility"         => "البيع",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "تحديث الميزات",
 ];
--- a/app/Language/ar-LB/Attributes.php
+++ b/app/Language/ar-LB/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "استلام البضائع",
    "show_in_sales"                    => "اظهار خلال البيع",
    "show_in_sales_visibility"         => "البيع",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "تحديث الميزات",
 ];
--- a/app/Language/az/Attributes.php
+++ b/app/Language/az/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Alınanlar",
    "show_in_sales"                    => "Satışda göstərin",
    "show_in_sales_visibility"         => "Satışlar",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Atributları yenilə",
 ];
--- a/app/Language/bg/Attributes.php
+++ b/app/Language/bg/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/bs/Attributes.php
+++ b/app/Language/bs/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Ulazi",
    "show_in_sales"                    => "Prikaži u prodaji",
    "show_in_sales_visibility"         => "Prodaja",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Ažuriraj atribut",
 ];
--- a/app/Language/ckb/Attributes.php
+++ b/app/Language/ckb/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "بەدەستگەیشتووکان",
    "show_in_sales"                    => "لە فرۆشتندا نیشانی بدە",
    "show_in_sales_visibility"         => "فرۆشتن",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "تایبەتمەندی نوێ بکەرەوە",
 ];
--- a/app/Language/cs/Attributes.php
+++ b/app/Language/cs/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/da/Attributes.php
+++ b/app/Language/da/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Modtagelser",
    "show_in_sales"                    => "Vis i salg",
    "show_in_sales_visibility"         => "Salg",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Opdater egenskab",
 ];
--- a/app/Language/de-CH/Attributes.php
+++ b/app/Language/de-CH/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/de-DE/Attributes.php
+++ b/app/Language/de-DE/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Eingänge",
    "show_in_sales"                    => "In Verkäufen anzeigen",
    "show_in_sales_visibility"         => "Verkauf",
+    "show_in_search"                   => "In Suche anzeigen",
+    "show_in_search_visibility"        => "Suche",
    "update"                           => "Attribut aktualisieren",
 ];
--- a/app/Language/el/Attributes.php
+++ b/app/Language/el/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/en-GB/Attributes.php
+++ b/app/Language/en-GB/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/en/Attributes.php
+++ b/app/Language/en/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/es-ES/Attributes.php
+++ b/app/Language/es-ES/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Recibos",
    "show_in_sales"                    => "Mostrar en ventas",
    "show_in_sales_visibility"         => "Ventas",
+    "show_in_search"                   => "Mostrar en búsqueda",
+    "show_in_search_visibility"        => "Búsqueda",
    "update"                           => "Actualizar Atributo",
 ];
--- a/app/Language/es-MX/Attributes.php
+++ b/app/Language/es-MX/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Recepciones",
    "show_in_sales"                    => "Mostrar en Ventas",
    "show_in_sales_visibility"         => "Ventas",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Actualizar atributo",
 ];
--- a/app/Language/fa/Attributes.php
+++ b/app/Language/fa/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "دریافت",
    "show_in_sales"                    => "نمایش در فروش",
    "show_in_sales_visibility"         => "حراجی",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "به روز کردن ویژگی",
 ];
--- a/app/Language/fr/Attributes.php
+++ b/app/Language/fr/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Réceptions",
    "show_in_sales"                    => "Afficher dans les ventes",
    "show_in_sales_visibility"         => "Ventes",
+    "show_in_search"                   => "Afficher dans la recherche",
+    "show_in_search_visibility"        => "Recherche",
    "update"                           => "Mettre à jour l'attribut",
 ];
--- a/app/Language/he/Attributes.php
+++ b/app/Language/he/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "קבלת סחורה",
    "show_in_sales"                    => "הצג במכירות",
    "show_in_sales_visibility"         => "מכירות",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "עדכן מאפיין",
 ];
--- a/app/Language/hr-HR/Attributes.php
+++ b/app/Language/hr-HR/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/hu/Attributes.php
+++ b/app/Language/hu/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Áruátvételek",
    "show_in_sales"                    => "Megjelenítés az értékesítésekben",
    "show_in_sales_visibility"         => "Értékesítések",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Tulajdonság frissítése",
 ];
--- a/app/Language/hy/Attributes.php
+++ b/app/Language/hy/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/id/Attributes.php
+++ b/app/Language/id/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Penerimaan",
    "show_in_sales"                    => "Tampilkan dalam penjualan",
    "show_in_sales_visibility"         => "Penjualan",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Perbarui Atribut",
 ];
--- a/app/Language/it/Attributes.php
+++ b/app/Language/it/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Ricezione",
    "show_in_sales"                    => "Visualizza in vendite",
    "show_in_sales_visibility"         => "Vendite",
+    "show_in_search"                   => "Visualizza nella ricerca",
+    "show_in_search_visibility"        => "Ricerca",
    "update"                           => "Aggiorna attributo",
 ];
--- a/app/Language/km/Attributes.php
+++ b/app/Language/km/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/lo/Attributes.php
+++ b/app/Language/lo/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/ml/Attributes.php
+++ b/app/Language/ml/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/nb/Attributes.php
+++ b/app/Language/nb/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/nl-BE/Attributes.php
+++ b/app/Language/nl-BE/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Orders",
    "show_in_sales"                    => "Toon in verkoop",
    "show_in_sales_visibility"         => "Verkoop",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Wijzig Attribuut",
 ];
--- a/app/Language/nl-NL/Attributes.php
+++ b/app/Language/nl-NL/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Leveringen",
    "show_in_sales"                    => "Weergeven in verkopen",
    "show_in_sales_visibility"         => "Verkopen",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Kenmerk bijwerken",
 ];
--- a/app/Language/pl/Attributes.php
+++ b/app/Language/pl/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Dostawy",
    "show_in_sales"                    => "Pokaż w sprzedażach",
    "show_in_sales_visibility"         => "Sprzedaże",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Zaktualizuj atrybut",
 ];
--- a/app/Language/pt-BR/Attributes.php
+++ b/app/Language/pt-BR/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Recebimentos",
    "show_in_sales"                    => "Mostrar em vendas",
    "show_in_sales_visibility"         => "Vendas",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Atualizar atributo",
 ];
--- a/app/Language/ro/Attributes.php
+++ b/app/Language/ro/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receptii",
    "show_in_sales"                    => "Arata in vanzari",
    "show_in_sales_visibility"         => "Vanzari",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Actualizare Atribut",
 ];
--- a/app/Language/ru/Attributes.php
+++ b/app/Language/ru/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Закупки",
    "show_in_sales"                    => "Показать в продажах",
    "show_in_sales_visibility"         => "Продажи",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Обновить атрибут",
 ];
--- a/app/Language/sv/Attributes.php
+++ b/app/Language/sv/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Inleveranser",
    "show_in_sales"                    => "Visa i försäljning",
    "show_in_sales_visibility"         => "Försäljning",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Uppdatera attribut",
 ];
--- a/app/Language/sw-KE/Attributes.php
+++ b/app/Language/sw-KE/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Manunuzi",
    "show_in_sales"                    => "Onyesha kwenye Mauzo",
    "show_in_sales_visibility"         => "Mauzo",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Sasisha Sifa",
 ];
--- a/app/Language/sw-TZ/Attributes.php
+++ b/app/Language/sw-TZ/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Manunuzi",
    "show_in_sales"                    => "Onyesha kwenye Mauzo",
    "show_in_sales_visibility"         => "Mauzo",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Sasisha Sifa",
 ];
--- a/app/Language/ta/Attributes.php
+++ b/app/Language/ta/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/th/Attributes.php
+++ b/app/Language/th/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "สินค้าขาเข้า",
    "show_in_sales"                    => "แสดงใน การขาย",
    "show_in_sales_visibility"         => "การขาย",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "ปรับปรุงแอตทริบิวต์",
 ];
--- a/app/Language/tl/Attributes.php
+++ b/app/Language/tl/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/tr/Attributes.php
+++ b/app/Language/tr/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Alacaklar",
    "show_in_sales"                    => "Satışlarda göster",
    "show_in_sales_visibility"         => "Satışlar",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Nitelik Güncelle",
 ];
--- a/app/Language/uk/Attributes.php
+++ b/app/Language/uk/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Надходження",
    "show_in_sales"                    => "Показати в продажах",
    "show_in_sales_visibility"         => "Продажі",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Оновити атрибут",
 ];
--- a/app/Language/ur/Attributes.php
+++ b/app/Language/ur/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/vi/Attributes.php
+++ b/app/Language/vi/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Nhập hàng",
    "show_in_sales"                    => "Hiển thị trong bán hàng",
    "show_in_sales_visibility"         => "Bán hàng",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Cập nhật thuộc tính",
 ];
--- a/app/Language/zh-Hans/Attributes.php
+++ b/app/Language/zh-Hans/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "收据",
    "show_in_sales"                    => "在销售中显示",
    "show_in_sales_visibility"         => "销售",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "更新属性",
 ];
--- a/app/Language/zh-Hant/Attributes.php
+++ b/app/Language/zh-Hant/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "收貨",
    "show_in_sales"                    => "在銷售中顯示",
    "show_in_sales_visibility"         => "銷售",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "更新屬性",
 ];
--- a/app/Models/Attribute.php
+++ b/app/Models/Attribute.php
@@ -38,9 +38,10 @@ class Attribute extends Model
        'attribute_decimal'
    ];

-    public const SHOW_IN_ITEMS = 1;    // TODO: These need to be moved to constants.php
+    public const SHOW_IN_ITEMS = 1;
    public const SHOW_IN_SALES = 2;
    public const SHOW_IN_RECEIVINGS = 4;
+    public const SHOW_IN_SEARCH = 8;
    public function deleteDropdownAttributeValue(string $attribute_value, int $definition_id): bool
    {
        $attribute_id = $this->getAttributeIdByValue($attribute_value);
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@@ -31,6 +31,7 @@ class Item extends Model
        'allow_alt_description',
        'is_serialized'
    ];
+
    protected $table = 'items';
    protected $primaryKey = 'item_id';
    protected $useAutoIncrement = true;
@@ -58,7 +59,6 @@ class Item extends Model
        'hsn_code'
    ];

-
    /**
     * Determines if a given item_id is an item
     */
@@ -132,32 +132,186 @@ class Item extends Model
        return $this->search($search, $filters, 0, 0, 'items.name', 'asc', true);
    }

+    /**
+     * Parse search string for attribute-specific queries
+     * Supports syntax like "color: blue size: large" or "color:blue AND size:large"
+     *
+     * @param string $search The raw search string
+     * @return array{terms: array, attributes: array} Parsed terms and attribute queries
+     */
+    public function parseAttributeSearch(string $search): array
+    {
+        $result = [
+            'terms'    => [],
+            'attributes' => []
+        ];
+
+        if ($search === '') {
+            return $result;
+        }
+
+        $pattern = '/([[:alpha:]][[:alnum:] _-]*?)\s*:\s*([^\s,]+)(?:\s+(?:AND|OR)\s+)?/iu';
+        $remaining = preg_replace($pattern, '', $search);
+
+        if (preg_match_all($pattern, $search, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $attrName = strtolower(trim($match[1]));
+                $attrValue = trim($match[2]);
+                $result['attributes'][$attrName][] = $attrValue;
+            }
+        }
+
+        $remaining = trim(preg_replace('/\s+/', ' ', $remaining));
+        if ($remaining !== '') {
+            $result['terms'][] = $remaining;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Search for items by attribute values
+     * Returns an array of item_ids matching the attribute search criteria
+     *
+     * @param string $search Search term
+     * @param array $definitionIds Attribute definition IDs to search within
+     * @param bool $matchDeleted Whether to match items where deleted flag equals this value
+     * @param string $logic 'AND' or 'OR' for multiple attribute matching
+     * @return array Array of matching item_ids
+     */
+    public function searchByAttributes(string $search, array $definitionIds, bool $matchDeleted = false, string $logic = 'OR'): array
+    {
+        if ($definitionIds === [] || $search === '') {
+            return [];
+        }
+
+        $parsed = $this->parseAttributeSearch($search);
+        $matchingItemIds = [];
+
+        if (!empty($parsed['attributes'])) {
+            $attribute = model(Attribute::class);
+            $allDefinitions = $attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_SEARCH, true);
+            $definitionNameToId = [];
+
+            foreach ($allDefinitions as $id => $defInfo) {
+                $name = is_array($defInfo) ? $defInfo['name'] : $defInfo;
+                $definitionNameToId[strtolower($name)] = (int) $id;
+            }
+
+            foreach ($parsed['attributes'] as $attrName => $values) {
+                if (!isset($definitionNameToId[$attrName])) {
+                    continue;
+                }
+
+                $definitionId = $definitionNameToId[$attrName];
+
+                // Skip if this attribute is not in the caller-provided definitionIds filter
+                if (!in_array($definitionId, $definitionIds, true)) {
+                    continue;
+                }
+
+                foreach ($values as $value) {
+                    $builder = $this->db->table('attribute_links');
+                    $builder->select('DISTINCT attribute_links.item_id');
+                    $builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+                    $builder->join('items', 'items.item_id = attribute_links.item_id');
+                    $builder->groupStart();
+                    $builder->like('attribute_values.attribute_value', $value);
+                    $builder->orWhere('attribute_values.attribute_decimal', $value);
+                    $builder->orWhere('attribute_values.attribute_date', $value);
+                    $builder->groupEnd();
+                    $builder->where('attribute_links.definition_id', $definitionId);
+                    $builder->where('attribute_links.sale_id', null);
+                    $builder->where('attribute_links.receiving_id', null);
+                    $builder->where('items.deleted', $matchDeleted);
+
+                    $foundIds = array_column($builder->get()->getResultArray(), 'item_id');
+
+                    if ($logic === 'AND') {
+                        if (empty($matchingItemIds)) {
+                            $matchingItemIds = $foundIds;
+                        } else {
+                            $matchingItemIds = array_intersect($matchingItemIds, $foundIds);
+                        }
+                    } else {
+                        $matchingItemIds = array_unique(array_merge($matchingItemIds, $foundIds));
+                    }
+                }
+            }
+        }
+
+        if (!empty($parsed['terms'])) {
+            $term = implode(' ', $parsed['terms']);
+            $termIds = $this->searchByAttributeValue($term, $definitionIds, $matchDeleted);
+
+            if (empty($matchingItemIds)) {
+                return $termIds;
+            }
+
+            return $logic === 'AND'
+                ? array_values(array_intersect($matchingItemIds, $termIds))
+                : array_values(array_unique(array_merge($matchingItemIds, $termIds)));
+        }
+
+        return $matchingItemIds;
+    }
+
+    /**
+     * Search for items by a single attribute value
+     *
+     * @param string $search Search term
+     * @param array $definitionIds Attribute definition IDs to search within
+     * @param bool $matchDeleted Whether to match items where deleted flag equals this value
+     * @return array Array of matching item_ids
+     */
+    private function searchByAttributeValue(string $search, array $definitionIds, bool $matchDeleted = false): array
+    {
+        $builder = $this->db->table('attribute_links');
+        $builder->select('DISTINCT attribute_links.item_id');
+        $builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+        $builder->join('items', 'items.item_id = attribute_links.item_id');
+        $builder->groupStart();
+        $builder->like('attribute_values.attribute_value', $search);
+        $builder->orWhere('attribute_values.attribute_decimal', $search);
+        $builder->orWhere('attribute_values.attribute_date', $search);
+        $builder->groupEnd();
+        $builder->whereIn('attribute_links.definition_id', $definitionIds);
+        $builder->where('attribute_links.sale_id', null);
+        $builder->where('attribute_links.receiving_id', null);
+        $builder->where('items.deleted', $matchDeleted);
+
+        return array_column($builder->get()->getResultArray(), 'item_id');
+    }
+
+    /**
+     * Get attribute definition ID from column name for sorting
+     *
+     * @param string $sortColumn The sort column name
+     * @return int|null The definition ID or null if not an attribute column
+     */
+    private function getAttributeSortDefinitionId(string $sortColumn): ?int
+    {
+        if (!ctype_digit($sortColumn)) {
+            return null;
+        }
+
+        return (int) $sortColumn;
+    }
+
    /**
     * Perform a search on items
     */
    public function search(string $search, array $filters, ?int $rows = 0, ?int $limit_from = 0, ?string $sort = 'items.name', ?string $order = 'asc', ?bool $count_only = false)
    {
-        // Set default values
-        if ($rows == null) {
-            $rows = 0;
-        }
-        if ($limit_from == null) {
-            $limit_from = 0;
-        }
-        if ($sort == null) {
-            $sort = 'items.name';
-        }
-        if ($order == null) {
-            $order = 'asc';
-        }
-        if ($count_only == null) {
-            $count_only = false;
-        }
+        $rows = $rows ?? 0;
+        $limit_from = $limit_from ?? 0;
+        $sort = $sort ?? 'items.name';
+        $order = $order ?? 'asc';
+        $count_only = $count_only ?? false;

        $config = config(OSPOS::class)->settings;
-        $builder = $this->db->table('items AS items');    // TODO: I'm not sure if it's needed to write items AS items... I think you can just get away with items
+        $builder = $this->db->table('items AS items');

-        // get_found_rows case
        if ($count_only) {
            $builder->select('COUNT(DISTINCT items.item_id) AS count');
        } else {
@@ -212,13 +366,33 @@ class Item extends Model
            : 'trans_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date']));
        $builder->where($where);

-        $attributes_enabled = count($filters['definition_ids']) > 0;
+        $attributesEnabled = count($filters['definition_ids']) > 0;
+        $matchingItemIds = [];

-        if (!empty($search)) {
-            if ($attributes_enabled && $filters['search_custom']) {
-                $builder->havingLike('attribute_values', $search);
-                $builder->orHavingLike('attribute_dtvalues', $search);
-                $builder->orHavingLike('attribute_dvalues', $search);
+        if ($search !== '' && $attributesEnabled && $filters['search_custom']) {
+            $matchingItemIds = $this->searchByAttributes($search, $filters['definition_ids'], $filters['is_deleted']);
+        }
+
+        if ($search !== '') {
+            if ($attributesEnabled && $filters['search_custom']) {
+                if (empty($matchingItemIds)) {
+                    $builder->groupStart();
+                    $builder->like('name', $search);
+                    $builder->orLike('item_number', $search);
+                    $builder->orLike('items.item_id', $search);
+                    $builder->orLike('company_name', $search);
+                    $builder->orLike('items.category', $search);
+                    $builder->groupEnd();
+                } else {
+                    $builder->groupStart();
+                    $builder->whereIn('items.item_id', $matchingItemIds);
+                    $builder->orLike('name', $search);
+                    $builder->orLike('item_number', $search);
+                    $builder->orLike('items.item_id', $search);
+                    $builder->orLike('company_name', $search);
+                    $builder->orLike('items.category', $search);
+                    $builder->groupEnd();
+                }
            } else {
                $builder->groupStart();
                $builder->like('name', $search);
@@ -230,16 +404,43 @@ class Item extends Model
            }
        }

-        if ($attributes_enabled) {
+        if ($attributesEnabled && !$count_only) {
            $format = $this->db->escape(dateformat_mysql());
            $this->db->simpleQuery('SET SESSION group_concat_max_len=49152');
            $builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
            $builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
            $builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
-            $builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $filters['definition_ids']) . ')', 'left');
+            $sanitizedIds = array_map('intval', $filters['definition_ids']);
+            $builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $sanitizedIds) . ')', 'left');
            $builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
        }

+        // Handle attribute column sorting
+        $sortDefinitionId = $this->getAttributeSortDefinitionId($sort);
+        if ($sortDefinitionId !== null && $attributesEnabled && !$count_only) {
+            $sortAlias = "sort_attr_{$sortDefinitionId}";
+            $builder->join("attribute_links AS {$sortAlias}", "{$sortAlias}.item_id = items.item_id AND {$sortAlias}.definition_id = {$sortDefinitionId} AND {$sortAlias}.sale_id IS NULL AND {$sortAlias}.receiving_id IS NULL", 'left');
+            $builder->join("attribute_values AS {$sortAlias}_val", "{$sortAlias}_val.attribute_id = {$sortAlias}.attribute_id", 'left');
+            
+            // Determine the correct column to sort by based on attribute type
+            $attribute = model(Attribute::class);
+            $definitionInfo = $attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS, true);
+            $sortColumn = "{$sortAlias}_val.attribute_value"; // default to text
+            
+            if (isset($definitionInfo[$sortDefinitionId])) {
+                $defType = is_array($definitionInfo[$sortDefinitionId]) ? ($definitionInfo[$sortDefinitionId]['type'] ?? TEXT) : TEXT;
+                if ($defType === DECIMAL) {
+                    $sortColumn = "{$sortAlias}_val.attribute_decimal";
+                } elseif ($defType === DATE) {
+                    $sortColumn = "{$sortAlias}_val.attribute_date";
+                }
+            }
+            
+            $builder->orderBy($sortColumn, $order);
+        } else {
+            $builder->orderBy($sort, $order);
+        }
+
        $builder->where('items.deleted', $filters['is_deleted']);

        if ($filters['empty_upc']) {
@@ -261,17 +462,12 @@ class Item extends Model
            $builder->whereIn('items.item_type', $non_temp);
        }

-        // get_found_rows case
        if ($count_only) {
            return $builder->get()->getRow()->count;
        }

-        // Avoid duplicated entries with same name because of inventory reporting multiple changes on the same item in the same date range
        $builder->groupBy('items.item_id');

-        // Order by name of item by default
-        $builder->orderBy($sort, $order);
-
        if ($rows > 0) {
            $builder->limit($rows, $limit_from);
        }
Author	SHA1	Message	Date
Ollama	e3c2175b04	feat: Add show_in_search language strings to all languages - Add 'show_in_search' and 'show_in_search_visibility' to all language files - Translated: de-DE, es-ES, fr, it - Placeholder English for remaining languages (awaiting translation) This ensures the SHOW_IN_SEARCH attribute flag works in all locales.	2026-05-16 21:02:34 +02:00
Ollama	2d93a96ac9	fix: Make item_sort_columns return format compatible with sanitizeSortColumn - sanitizeSortColumn expects nested array format [['col' => 'label'], ...] - Reuse item_headers() as base and add attribute columns - This maintains DRY principle by not redefining columns twice	2026-05-16 21:02:34 +02:00
Ollama	c681dc51ed	fix: Use typed column for attribute sorting (DECIMAL/DATE/TEXT) - When sorting by attribute column, determine the attribute type - Use attribute_decimal for DECIMAL type - Use attribute_date for DATE type - Use attribute_value for TEXT/DROPDOWN/CHECKBOX types - This ensures numeric and date attributes sort correctly instead of lexicographically Fixes CodeRabbit feedback on PR #4442.	2026-05-16 21:02:34 +02:00
Ollama	65568cf224	fix: Address remaining PR review comments - Update regex pattern to support multi-word attribute names (e.g., 'aspect ratio') - Rename $includeDeleted to $matchDeleted for clarity (matches deleted flag value) - Add check to skip attributes not in caller-provided definitionIds filter - Use Unicode pattern modifier 'u' for international character support in attribute names This addresses CodeRabbit's feedback on PR #4442.	2026-05-16 21:02:34 +02:00
Ollama	5cb4371344	fix: Address PR review comments - Rename methods to camelCase (PSR-12): parseAttributeSearch, searchByAttributes, searchByAttributeValue, getAttributeSortDefinitionId - Rename variables to camelCase (PSR-12) - Add DATE attribute search support in searchByAttributeValue - Fix get_definitions_by_flags to request typed payload (second param true) - Handle both array and string return shapes for definition info - Fix term-only search to merge with attribute matches instead of replacing - Use strict emptiness checks (=== '' instead of empty()) - Sanitize definition_ids before SQL interpolation (array_map intval) - Include DATE in attribute search conditions	2026-05-16 21:02:34 +02:00
Ollama	281f402b8e	style: Apply PSR-12 formatting - Fix PHPDoc comment format in item_sort_columns() helper - Remove duplicate blank line after properties in Item model - Remove unused variable assignment in Items controller	2026-05-16 21:02:34 +02:00
Ollama	c74fa7aeb5	Refactor: Use existing sanitizeSortColumn method with item_sort_columns helper - Add item_sort_columns() helper function in tabular_helper.php - Helper returns all sortable columns including dynamic attribute IDs - Remove duplicate sanitizeSortColumnAttribute method from Items controller - Remove unused ALLOWED_SORT_COLUMNS constant from Item model - Reuses existing sanitizeSortColumn method from Secure_Controller	2026-05-16 21:02:34 +02:00
Ollama	be01555a34	Refactor: Add ALLOWED_SORT_COLUMNS constant and reuse in sanitization - Add Item::ALLOWED_SORT_COLUMNS constant for allowed sort columns - Use constant in sanitizeSortColumnAttribute() instead of inline array - Enables reuse across the codebase for sort column validation	2026-05-16 21:02:34 +02:00
Ollama	abc381d35c	Implement Phase 3: Multi-attribute search AND logic and Phase 4: Sort by attribute columns Phase 3 - Multi-attribute Search: - Add parse_attribute_search() method to parse search syntax like 'color: blue size: large' or 'color:blue AND size:large' - Update search_by_attributes() to support AND/OR logic for multiple attribute queries - Add search_by_attribute_value() private method for single value search Phase 4 - Sort by Attribute Columns: - Add get_attribute_sort_definition_id() method to detect attribute column sorting - Update Item::search() to join attribute tables when sorting by attribute columns - Update tabular_helper to make attribute columns sortable - Add sanitizeSortColumnAttribute() method in Items controller to validate attribute definition IDs as sort columns Fixes #2722 - sorting by attribute columns now works	2026-05-16 21:02:34 +02:00
Ollama	cacd320206	Add SHOW_IN_SEARCH flag to separate attribute search from visibility Phase 2 implementation: - Add SHOW_IN_SEARCH constant (value 8) to Attribute model - Update Items controller to include searchable attributes when search_custom filter is enabled - Add language strings for the new visibility flag - Update Attributes controller to include new flag in form This allows attributes to be searchable even if they are not displayed in the items table, addressing issue #2919. Fixes #2919	2026-05-16 21:02:34 +02:00
Ollama	a7a52f800c	Refactor attribute search to fix pagination and multi-attribute search - Add new search_by_attributes() method that returns matching item_ids - Refactor search() method to use subquery approach instead of HAVING LIKE - Fix pagination count issue (#2819) - get_found_rows() now returns correct count - Enable combined search (attributes OR regular fields) - GROUP_CONCAT still used for display but removed from search/count logic - Fixes #2407 - multi-attribute search now works correctly Related: #2819, #2407, #2722, #2919	2026-05-16 21:02:34 +02:00