mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add item attributes functionality (#68)

Browse Source
This commit is contained in:
jekkos
2017-09-22 22:12:58 +02:00
committed by jekkos
parent f521257570
commit df61ee09bb
101 changed files with 2397 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
application/controllers/Items.php
View File

@@ -25,7 +25,7 @@ class Items extends Secure_Controller
'low_inventory' => $this->lang->line('items_low_inventory_items'),
'is_serialized' => $this->lang->line('items_serialized_items'),
'no_description' => $this->lang->line('items_no_description_items'),
'search_custom' => $this->lang->line('items_search_custom_items'),
'search_custom' => $this->lang->line('items_search_attributes'),
'is_deleted' => $this->lang->line('items_is_deleted'),
'temporary' => $this->lang->line('items_temp'));
@@ -164,16 +164,6 @@ class Items extends Secure_Controller
echo json_encode($suggestions);
}
/*
Gives search suggestions based on what is being searched for
*/
public function suggest_custom()
{
$suggestions = $this->xss_clean($this->Item->get_custom_suggestions($this->input->post('term'), $this->input->post('field_no')));
echo json_encode($suggestions);
}
public function get_row($item_ids)
{
@@ -201,6 +191,12 @@ class Items extends Secure_Controller
$data['default_tax_1_rate'] = '';
$data['default_tax_2_rate'] = '';
$data['item_kits_enabled'] = $this->Employee->has_grant('item_kits', $this->Employee->get_logged_in_employee_info()->person_id);
$data['definition_values'] = $this->Attribute->get_attributes_by_item($item_id);
$categories = array(-1 => $this->lang->line('common_none_selected_text'));
$categories = $categories + $this->Attribute->get_definitions_by_type(CATEGORY);
$selected_category = $this->Attribute->get_selected_category($item_id);
$data['selected_category'] = empty($selected_category) ? NULL : $selected_category->definition_id;
$data['categories'] = $categories;
$item_info = $this->Item->get_info($item_id);
foreach(get_object_vars($item_info) as $property => $value)
@@ -235,6 +231,7 @@ class Items extends Secure_Controller
$item_info->receiving_quantity = 1;
$item_info->reorder_level = 1;
$item_info->item_type = ITEM; // standard
$item_info->item_id = $item_id;
$item_info->stock_type = HAS_STOCK;
$item_info->tax_category_id = 1; // Standard
$item_info->qty_per_pack = 1;
@@ -389,6 +386,13 @@ class Items extends Secure_Controller
$this->load->view('barcodes/barcode_sheet', $data);
}
public function attributes($item_id, $definition_id)
{
$data['item_id'] = $item_id;
$data['definition_values'] = $this->Attribute->get_values_by_parent($definition_id);
$this->load->view('attributes/item', $data);
}
public function bulk_edit()
{
$suppliers = array('' => $this->lang->line('items_none'));
@@ -444,17 +448,7 @@ class Items extends Secure_Controller
'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' => $this->input->post('low_sell_item_id') == NULL ? -1 : $this->input->post('low_sell_item_id'),
'deleted' => $this->input->post('is_deleted') != NULL,
'custom1' => $this->input->post('custom1') == NULL ? '' : $this->input->post('custom1'),
'custom2' => $this->input->post('custom2') == NULL ? '' : $this->input->post('custom2'),
'custom3' => $this->input->post('custom3') == NULL ? '' : $this->input->post('custom3'),
'custom4' => $this->input->post('custom4') == NULL ? '' : $this->input->post('custom4'),
'custom5' => $this->input->post('custom5') == NULL ? '' : $this->input->post('custom5'),
'custom6' => $this->input->post('custom6') == NULL ? '' : $this->input->post('custom6'),
'custom7' => $this->input->post('custom7') == NULL ? '' : $this->input->post('custom7'),
'custom8' => $this->input->post('custom8') == NULL ? '' : $this->input->post('custom8'),
'custom9' => $this->input->post('custom9') == NULL ? '' : $this->input->post('custom9'),
'custom10' => $this->input->post('custom10') == NULL ? '' : $this->input->post('custom10')
'deleted' => $this->input->post('is_deleted') != NULL
);
if($item_data['item_type'] == ITEM_TEMP)
@@ -748,8 +742,7 @@ class Items extends Secure_Controller
// XSS file data sanity check
$data = $this->xss_clean($data);
/* haven't touched this so old templates will work, or so I guess... */
if(sizeof($data) >= 23)
if(sizeof($data) >= 18)
{
$item_data = array(
'name' => $data[1],
@@ -760,17 +753,7 @@ class Items extends Secure_Controller
'reorder_level' => $data[10],
'supplier_id' => $this->Supplier->exists($data[3]) ? $data[3] : NULL,
'allow_alt_description' => $data[12] != '' ? '1' : '0',
'is_serialized' => $data[13] != '' ? '1' : '0',
'custom1' => $data[14],
'custom2' => $data[15],
'custom3' => $data[16],
'custom4' => $data[17],
'custom5' => $data[18],
'custom6' => $data[19],
'custom7' => $data[20],
'custom8' => $data[21],
'custom9' => $data[22],
'custom10' => $data[23]
'is_serialized' => $data[13] != '' ? '1' : '0'
);
/* we could do something like this, however, the effectiveness of
@@ -778,7 +761,7 @@ class Items extends Secure_Controller
into that directory, so you really can do whatever you want, this probably
needs further discussion */
$pic_file = $data[24];
$pic_file = $data[19];
/*if(strcmp('.htaccess', $pic_file)==0)
{
$pic_file='';