mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-26 01:53:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/opensourcepos/opensourcepos

Browse Source
This commit is contained in:
jekkos
2019-06-30 22:44:49 +02:00
parent 84a4f53aa0 8daab70725
commit 4cecfb5079
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/helpers/tabular_helper.php
View File

@@ -533,18 +533,18 @@ function get_item_kit_data_row($item_kit)
);
}
function concat_attribute_value($columns, $row) {
$attribute_values = '';
function parse_attribute_values($columns, $row) {
$attribute_values = array();
foreach($columns as $column) {
$attribute_values .= (isset($row[$column])) ? $row[$column] : '';
$attribute_value = explode('|', $row[$column]);
$attribute_values = array_merge($attribute_values, $attribute_value);
}
return explode('|', $attribute_values);
return $attribute_values;
}
function expand_attribute_values($definition_names, $row)
{
$values = concat_attribute_value(array('attribute_values', 'attribute_dtvalues', 'attribute_dvalues'), $row);
$values = parse_attribute_values(array('attribute_values', 'attribute_dtvalues', 'attribute_dvalues'), $row);
$indexed_values = array();
foreach($values as $attribute_value)