mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-15 09:22:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2319 from opensourcepos/fix-attribute-datetime

Browse Source 
Fix attribute datetime formatting
This commit is contained in:
FrancescoUK
2019-06-15 10:32:22 +01:00
committed by GitHub
parent e60d2ab900 0ae6470b35
commit 01dfd023eb
29 changed files with 159 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/controllers/Items.php
View File

@@ -484,19 +484,6 @@ class Items extends Secure_Controller
}
$default_pack_name = $this->lang->line('items_default_pack_name');
if ($item_id == -1)
{
// Set low_sell_item_id to -1 for a new item so that when it is saved the item will point to itself for the
// low sell item.
$low_sell_item_id = $this->input->post('low_sell_item_id') == NULL ? -1 : $this->input->post('low_sell_item_id');
}
else
{
// On an existing item where the low sell item is not prompted for always force the item_id as the low sell item Id
$low_sell_item_id = $this->input->post('low_sell_item_id') == NULL ? $item_id : $this->input->post('low_sell_item_id');
}
//Save item data
$item_data = array(
'name' => $this->input->post('name'),
@@ -514,7 +501,7 @@ class Items extends Secure_Controller
'is_serialized' => $this->input->post('is_serialized') != NULL,
'qty_per_pack' => $this->input->post('qty_per_pack') == NULL ? 1 : $this->input->post('qty_per_pack'),
'pack_name' => $this->input->post('pack_name') == NULL ? $default_pack_name : $this->input->post('pack_name'),
'low_sell_item_id' => $low_sell_item_id,
'low_sell_item_id' => $this->input->post('low_sell_item_id') == NULL ? $item_id : $this->input->post('low_sell_item_id'),
'deleted' => $this->input->post('is_deleted') != NULL,
'hsn_code' => $this->input->post('hsn_code') == NULL ? '' : $this->input->post('hsn_code')
);

4
application/controllers/Reports.php
View File

@@ -1345,6 +1345,7 @@ class Reports extends Secure_Controller
}
$attribute_values = (isset($drow['attribute_values'])) ? $drow['attribute_values'] : '';
$attribute_values = (isset($drow['attribute_dtvalues'])) ? $attribute_values . '|' . $drow['attribute_dtvalues'] : $attribute_values;
$attribute_values = expand_attribute_values($definition_names, $attribute_values);
$details_data[$row['sale_id']][] = $this->xss_clean(array_merge(array(
@@ -1462,6 +1463,8 @@ class Reports extends Secure_Controller
}
$attribute_values = (isset($drow['attribute_values'])) ? $drow['attribute_values'] : '';
$attribute_values = (isset($drow['attribute_dtvalues'])) ? $attribute_values . '|' . $drow['attribute_dtvalues'] : $attribute_values;
$attribute_values = expand_attribute_values($definition_names, $attribute_values);
$details_data[$row['receiving_id']][] = $this->xss_clean(array_merge(array(
@@ -1471,7 +1474,6 @@ class Reports extends Secure_Controller
$quantity_purchased,
to_currency($drow['total']),
($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])), $attribute_values));
}
}