mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-11 18:38:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix item form refresh (#2538)

Browse Source
This commit is contained in:
jekkos
2020-01-03 14:26:11 +01:00
parent f9da801f06
commit d52c16fbba
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/models/Item.php
View File

@@ -286,12 +286,13 @@ class Item extends CI_Model
$this->db->select('GROUP_CONCAT(attribute_value SEPARATOR \'|\') AS attribute_values');
$this->db->select('GROUP_CONCAT(attribute_decimal SEPARATOR \'|\') AS attribute_dvalues');
$this->db->select('GROUP_CONCAT(attribute_date SEPARATOR \'|\') AS attribute_dtvalues');
$this->db->select('suppliers.company_name');
$this->db->select("MAX(". $this->db->dbprefix('suppliers') .".company_name) AS company_name");
$this->db->from('items');
$this->db->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left');
$this->db->join('attribute_links', 'attribute_links.item_id = items.item_id', 'left');
$this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id', 'left');
$this->db->where('items.item_id', $item_id);
$this->db->group_by('items.item_id');
$query = $this->db->get();
@@ -383,11 +384,11 @@ class Item extends CI_Model
{
$format = $this->db->escape(dateformat_mysql());
$this->db->select('items.*');
$this->db->select('company_name');
$this->db->select('MAX(company_name) AS company_name');
$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
$this->db->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) ORDER BY definition_id SEPARATOR '|') AS attribute_dtvalues");
$this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) ORDER BY definition_id SEPARATOR \'|\') AS attribute_dvalues');
$this->db->select('quantity');
$this->db->select('MAX(quantity) as quantity');
$this->db->from('items');
$this->db->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left');
$this->db->join('item_quantities', 'item_quantities.item_id = items.item_id', 'left');