mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-24 02:46:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable attribute search for datetime (#2441)

Browse Source
This commit is contained in:
jekkos
2019-06-30 17:39:00 +02:00
parent 6167a164ad
commit cfe5a3c84e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/Item.php
View File

@@ -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']);