From cfe5a3c84e2d3b6be73eedd6dbd1e2f366b46cc7 Mon Sep 17 00:00:00 2001 From: jekkos Date: Sun, 30 Jun 2019 17:39:00 +0200 Subject: [PATCH] Enable attribute search for datetime (#2441) --- application/models/Item.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/models/Item.php b/application/models/Item.php index ae1ce9bbd..00c4214d0 100644 --- a/application/models/Item.php +++ b/application/models/Item.php @@ -186,6 +186,8 @@ class Item extends CI_Model if ($filters['search_custom'] && $attributes_enabled) { $this->db->or_like('attribute_value', $search); + $this->db->or_like('attribute_date', $search); + $this->db->or_like('attribute_decimal', $search); } $this->db->group_end(); } @@ -197,7 +199,7 @@ class Item extends CI_Model $this->db->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues"); $this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues'); $this->db->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'); - $this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left'); + $this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id'); } $this->db->where('items.deleted', $filters['is_deleted']);