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

Implement CHECKBOX attribute type

Browse Source 
Attribute Configuration view
Attributes section of item management view
Attributes section of CSV item import
This commit is contained in:
objecttothis
2020-02-25 15:44:49 +04:00
parent bf88927e66
commit ff79b73e34
5 changed files with 362 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

328
application/controllers/Items.php
View File

@@ -7,19 +7,19 @@ class Items extends Secure_Controller
public function __construct()
{
parent::__construct('items');
$this->load->library('item_lib');
}
public function index()
{
$this->session->set_userdata('allow_temp_items', 0);
$data['table_headers'] = $this->xss_clean(get_items_manage_table_headers());
$data['stock_location'] = $this->xss_clean($this->item_lib->get_item_location());
$data['stock_locations'] = $this->xss_clean($this->Stock_location->get_allowed_locations());
// filters that will be loaded in the multiselect dropdown
$data['filters'] = array('empty_upc' => $this->lang->line('items_empty_upc_items'),
'low_inventory' => $this->lang->line('items_low_inventory_items'),
@@ -28,10 +28,10 @@ class Items extends Secure_Controller
'search_custom' => $this->lang->line('items_search_attributes'),
'is_deleted' => $this->lang->line('items_is_deleted'),
'temporary' => $this->lang->line('items_temp'));
$this->load->view('items/manage', $data);
}
/*
Returns Items table data rows. This will be called with AJAX.
*/
@@ -42,11 +42,11 @@ class Items extends Secure_Controller
$offset = $this->input->get('offset');
$sort = $this->input->get('sort');
$order = $this->input->get('order');
$this->item_lib->set_item_location($this->input->get('stock_location'));
$definition_names = $this->Attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
$filters = array('start_date' => $this->input->get('start_date'),
'end_date' => $this->input->get('end_date'),
'stock_location_id' => $this->item_lib->get_item_location(),
@@ -58,15 +58,15 @@ class Items extends Secure_Controller
'is_deleted' => FALSE,
'temporary' => FALSE,
'definition_ids' => array_keys($definition_names));
// check if any filter is set in the multiselect dropdown
$filledup = array_fill_keys($this->input->get('filters'), TRUE);
$filters = array_merge($filters, $filledup);
$items = $this->Item->search($search, $filters, $limit, $offset, $sort, $order);
$total_rows = $this->Item->get_found_rows($search, $filters);
$data_rows = array();
foreach($items->result() as $item)
{
@@ -76,19 +76,19 @@ class Items extends Secure_Controller
$this->_update_pic_filename($item);
}
}
echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
}
public function pic_thumb($pic_filename)
{
$this->load->helper('file');
$this->load->library('image_lib');
// in this context, $pic_filename always has .ext
$ext = pathinfo($pic_filename, PATHINFO_EXTENSION);
$images = glob('./uploads/item_pics/' . $pic_filename);
// make sure we pick only the file name, without extension
$base_path = './uploads/item_pics/' . pathinfo($pic_filename, PATHINFO_FILENAME);
if(sizeof($images) > 0)
@@ -111,7 +111,7 @@ class Items extends Secure_Controller
$this->output->set_output(file_get_contents($thumb_path));
}
}
/*
Gives search suggestions based on what is being searched for
*/
@@ -119,75 +119,75 @@ class Items extends Secure_Controller
{
$suggestions = $this->xss_clean($this->Item->get_search_suggestions($this->input->post_get('term'),
array('search_custom' => $this->input->post('search_custom'), 'is_deleted' => $this->input->post('is_deleted') != NULL), FALSE));
echo json_encode($suggestions);
}
public function suggest()
{
$suggestions = $this->xss_clean($this->Item->get_search_suggestions($this->input->post_get('term'),
array('search_custom' => FALSE, 'is_deleted' => FALSE), TRUE));
echo json_encode($suggestions);
}
public function suggest_low_sell()
{
$suggestions = $this->xss_clean($this->Item->get_low_sell_suggestions($this->input->post_get('name')));
echo json_encode($suggestions);
}
public function suggest_kits()
{
$suggestions = $this->xss_clean($this->Item->get_kit_search_suggestions($this->input->post_get('term'),
array('search_custom' => FALSE, 'is_deleted' => FALSE), TRUE));
echo json_encode($suggestions);
}
/*
Gives search suggestions based on what is being searched for
*/
public function suggest_category()
{
$suggestions = $this->xss_clean($this->Item->get_category_suggestions($this->input->get('term')));
echo json_encode($suggestions);
}
/*
Gives search suggestions based on what is being searched for
*/
public function suggest_location()
{
$suggestions = $this->xss_clean($this->Item->get_location_suggestions($this->input->get('term')));
echo json_encode($suggestions);
}
public function get_row($item_ids)
{
$item_infos = $this->Item->get_multiple_info(explode(":", $item_ids), $this->item_lib->get_item_location());
$result = array();
foreach($item_infos->result() as $item_info)
{
$result[$item_info->item_id] = $this->xss_clean(get_item_data_row($item_info));
}
echo json_encode($result);
}
public function view($item_id = -1)
{
if($item_id == -1)
{
$data = array();
}
// allow_temp_items is set in the index function of items.php or sales.php
$data['allow_temp_item'] = $this->session->userdata('allow_temp_items');
$data['item_tax_info'] = $this->xss_clean($this->Item_taxes->get_info($item_id));
@@ -196,19 +196,19 @@ class Items extends Secure_Controller
$data['item_kit_disabled'] = !$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);
$data['definition_names'] = $this->Attribute->get_definition_names();
foreach($data['definition_values'] as $definition_id => $definition)
{
unset($data['definition_names'][$definition_id]);
}
$item_info = $this->Item->get_info($item_id);
foreach(get_object_vars($item_info) as $property => $value)
{
$item_info->$property = $this->xss_clean($value);
}
if($data['allow_temp_item'] == 1)
{
if($item_id != -1)
@@ -226,15 +226,15 @@ class Items extends Secure_Controller
$data['allow_temp_item'] = 1;
}
}
$use_destination_based_tax = (boolean)$this->config->item('use_destination_based_tax');
$data['include_hsn'] = $this->config->item('include_hsn') == '1';
if($item_id == -1)
{
$data['default_tax_1_rate'] = $this->config->item('default_tax_1_rate');
$data['default_tax_2_rate'] = $this->config->item('default_tax_2_rate');
$item_info->receiving_quantity = 1;
$item_info->reorder_level = 1;
$item_info->item_type = ITEM; // standard
@@ -249,13 +249,13 @@ class Items extends Secure_Controller
$item_info->tax_category_id = $this->config->item('default_tax_category');
}
}
$data['standard_item_locked'] = ($data['item_kit_disabled'] && $item_info->item_type == ITEM_KIT
&& !$data['allow_temp_item']
&& !($this->config->item('derive_sale_quantity') == '1'));
&& !$data['allow_temp_item']
&& !($this->config->item('derive_sale_quantity') == '1'));
$data['item_info'] = $item_info;
$suppliers = array('' => $this->lang->line('items_none'));
foreach($this->Supplier->get_all()->result_array() as $row)
{
@@ -263,7 +263,7 @@ class Items extends Secure_Controller
}
$data['suppliers'] = $suppliers;
$data['selected_supplier'] = $item_info->supplier_id;
if($data['include_hsn'])
{
$data['hsn_code'] = $item_info->hsn_code;
@@ -272,7 +272,7 @@ class Items extends Secure_Controller
{
$data['hsn_code'] = '';
}
if($use_destination_based_tax)
{
$data['use_destination_based_tax'] = TRUE;
@@ -297,7 +297,7 @@ class Items extends Secure_Controller
$data['tax_categories'] = array();
$data['tax_category'] = '';
}
$data['logo_exists'] = $item_info->pic_filename != '';
$ext = pathinfo($item_info->pic_filename, PATHINFO_EXTENSION);
if($ext == '')
@@ -315,15 +315,15 @@ class Items extends Secure_Controller
foreach($stock_locations as $location)
{
$location = $this->xss_clean($location);
$quantity = $this->xss_clean($this->Item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity);
$quantity = ($item_id == -1) ? 0 : $quantity;
$location_array[$location['location_id']] = array('location_name' => $location['location_name'], 'quantity' => $quantity);
$data['stock_locations'] = $location_array;
}
$data['selected_low_sell_item_id'] = $item_info->low_sell_item_id;
if($item_id != -1 && $item_info->item_id != $item_info->low_sell_item_id)
{
$low_sell_item_info = $this->Item->get_info($item_info->low_sell_item_id);
@@ -333,10 +333,10 @@ class Items extends Secure_Controller
{
$data['selected_low_sell_item'] = '';
}
$this->load->view('items/form', $data);
}
public function inventory($item_id = -1)
{
$item_info = $this->Item->get_info($item_id);
@@ -345,21 +345,21 @@ class Items extends Secure_Controller
$item_info->$property = $this->xss_clean($value);
}
$data['item_info'] = $item_info;
$data['stock_locations'] = array();
$stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
foreach($stock_locations as $location)
{
$location = $this->xss_clean($location);
$quantity = $this->xss_clean($this->Item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity);
$data['stock_locations'][$location['location_id']] = $location['location_name'];
$data['item_quantities'][$location['location_id']] = $quantity;
}
$this->load->view('items/form_inventory', $data);
}
public function count_details($item_id = -1)
{
$item_info = $this->Item->get_info($item_id);
@@ -368,62 +368,62 @@ class Items extends Secure_Controller
$item_info->$property = $this->xss_clean($value);
}
$data['item_info'] = $item_info;
$data['stock_locations'] = array();
$stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
foreach($stock_locations as $location)
{
$location = $this->xss_clean($location);
$quantity = $this->xss_clean($this->Item_quantity->get_item_quantity($item_id, $location['location_id'])->quantity);
$data['stock_locations'][$location['location_id']] = $location['location_name'];
$data['item_quantities'][$location['location_id']] = $quantity;
}
$this->load->view('items/form_count_details', $data);
}
public function generate_barcodes($item_ids)
{
$this->load->library('barcode_lib');
$item_ids = explode(':', $item_ids);
$result = $this->Item->get_multiple_info($item_ids, $this->item_lib->get_item_location())->result_array();
$config = $this->barcode_lib->get_barcode_config();
$data['barcode_config'] = $config;
// check the list of items to see if any item_number field is empty
foreach($result as &$item)
{
$item = $this->xss_clean($item);
// update the barcode field if empty / NULL with the newly generated barcode
if(empty($item['item_number']) && $this->config->item('barcode_generate_if_empty'))
{
// get the newly generated barcode
$barcode_instance = Barcode_lib::barcode_instance($item, $config);
$item['item_number'] = $barcode_instance->getData();
$save_item = array('item_number' => $item['item_number']);
// update the item in the database in order to save the barcode field
$this->Item->save($save_item, $item['item_id']);
}
}
$data['items'] = $result;
// display barcodes
$this->load->view('barcodes/barcode_sheet', $data);
}
public function attributes($item_id)
{
$data['item_id'] = $item_id;
$definition_ids = json_decode($this->input->post('definition_ids'), TRUE);
$data['definition_values'] = $this->Attribute->get_attributes_by_item($item_id) + $this->Attribute->get_values_by_definitions($definition_ids);
$data['definition_names'] = $this->Attribute->get_definition_names();
foreach($data['definition_values'] as $definition_id => $definition_value)
{
$attribute_value = $this->Attribute->get_attribute_value($item_id, $definition_id);
@@ -432,32 +432,32 @@ class Items extends Secure_Controller
$values['attribute_id'] = $attribute_id;
$values['attribute_value'] = $attribute_value;
$values['selected_value'] = '';
if ($definition_value['definition_type'] == DROPDOWN)
{
$values['values'] = $this->Attribute->get_definition_values($definition_id);
$link_value = $this->Attribute->get_link_value($item_id, $definition_id);
$values['selected_value'] = (empty($link_value)) ? '' : $link_value->attribute_id;
}
if (!empty($definition_ids[$definition_id]))
{
$values['selected_value'] = $definition_ids[$definition_id];
}
unset($data['definition_names'][$definition_id]);
}
$this->load->view('attributes/item', $data);
}
public function bulk_edit()
{
$suppliers = array('' => $this->lang->line('items_none'));
foreach($this->Supplier->get_all()->result_array() as $row)
{
$row = $this->xss_clean($row);
$suppliers[$row['person_id']] = $row['company_name'];
}
$data['suppliers'] = $suppliers;
@@ -465,29 +465,29 @@ class Items extends Secure_Controller
'' => $this->lang->line('items_do_nothing'),
1 => $this->lang->line('items_change_all_to_allow_alt_desc'),
0 => $this->lang->line('items_change_all_to_not_allow_allow_desc'));
$data['serialization_choices'] = array(
'' => $this->lang->line('items_do_nothing'),
1 => $this->lang->line('items_change_all_to_serialized'),
0 => $this->lang->line('items_change_all_to_unserialized'));
$this->load->view('items/form_bulk', $data);
}
public function save($item_id = -1)
{
$upload_success = $this->_handle_image_upload();
$upload_data = $this->upload->data();
$receiving_quantity = parse_quantity($this->input->post('receiving_quantity'));
$item_type = $this->input->post('item_type') == NULL ? ITEM : $this->input->post('item_type');
if($receiving_quantity == '0' && $item_type!= ITEM_TEMP)
{
$receiving_quantity = '1';
}
$default_pack_name = $this->lang->line('items_default_pack_name');
//Save item data
$item_data = array(
'name' => $this->input->post('name'),
@@ -509,14 +509,14 @@ class Items extends Secure_Controller
'deleted' => $this->input->post('is_deleted') != NULL,
'hsn_code' => $this->input->post('hsn_code') == NULL ? '' : $this->input->post('hsn_code')
);
if($item_data['item_type'] == ITEM_TEMP)
{
$item_data['stock_type'] = HAS_NO_STOCK;
$item_data['receiving_quantity'] = 0;
$item_data['reorder_level'] = 0;
}
$x = $this->input->post('tax_category_id');
if(!isset($x))
{
@@ -526,7 +526,7 @@ class Items extends Secure_Controller
{
$item_data['tax_category_id'] = $this->input->post('tax_category_id') == '' ? NULL : $this->input->post('tax_category_id');
}
if(!empty($upload_data['orig_name']))
{
// XSS file image sanity check
@@ -535,9 +535,9 @@ class Items extends Secure_Controller
$item_data['pic_filename'] = $upload_data['raw_name'];
}
}
$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
if($this->Item->save($item_data, $item_id))
{
$success = TRUE;
@@ -548,9 +548,9 @@ class Items extends Secure_Controller
$item_id = $item_data['item_id'];
$new_item = TRUE;
}
$use_destination_based_tax = (boolean)$this->config->item('use_destination_based_tax');
if(!$use_destination_based_tax)
{
$items_taxes_data = array();
@@ -567,7 +567,7 @@ class Items extends Secure_Controller
}
$success &= $this->Item_taxes->save($items_taxes_data, $item_id);
}
//Save item quantity
$stock_locations = $this->Stock_location->get_undeleted_all()->result_array();
foreach($stock_locations as $location)
@@ -580,13 +580,13 @@ class Items extends Secure_Controller
$location_detail = array('item_id' => $item_id,
'location_id' => $location['location_id'],
'quantity' => $updated_quantity);
$item_quantity = $this->Item_quantity->get_item_quantity($item_id, $location['location_id']);
if($item_quantity->quantity != $updated_quantity || $new_item)
{
$success &= $this->Item_quantity->save($location_detail, $item_id, $location['location_id']);
$inv_data = array(
'trans_date' => date('Y-m-d H:i:s'),
'trans_items' => $item_id,
@@ -595,11 +595,11 @@ class Items extends Secure_Controller
'trans_comment' => $this->lang->line('items_manually_editing_of_quantity'),
'trans_inventory' => $updated_quantity - $item_quantity->quantity
);
$success &= $this->Inventory->insert($inv_data);
}
}
// Save item attributes
$attribute_links = $this->input->post('attribute_links') != NULL ? $this->input->post('attribute_links') : array();
$attribute_ids = $this->input->post('attribute_ids');
@@ -613,34 +613,34 @@ class Items extends Secure_Controller
}
$this->Attribute->save_link($item_id, $definition_id, $attribute_id);
}
if($success && $upload_success)
{
$message = $this->xss_clean($this->lang->line('items_successful_' . ($new_item ? 'adding' : 'updating')) . ' ' . $item_data['name']);
echo json_encode(array('success' => TRUE, 'message' => $message, 'id' => $item_id));
}
else
{
$message = $this->xss_clean($upload_success ? $this->lang->line('items_error_adding_updating') . ' ' . $item_data['name'] : strip_tags($this->upload->display_errors()));
echo json_encode(array('success' => FALSE, 'message' => $message, 'id' => $item_id));
}
}
else // failure
{
$message = $this->xss_clean($this->lang->line('items_error_adding_updating') . ' ' . $item_data['name']);
echo json_encode(array('success' => FALSE, 'message' => $message, 'id' => -1));
}
}
public function check_item_number()
{
$exists = $this->Item->item_number_exists($this->input->post('item_number'), $this->input->post('item_id'));
echo !$exists ? 'true' : 'false';
}
/*
If adding a new item check to see if an item kit with the same name as the item already exists.
*/
@@ -656,11 +656,11 @@ class Items extends Secure_Controller
}
echo !$exists ? 'true' : 'false';
}
private function _handle_image_upload()
{
/* Let files be uploaded with their original name */
// load upload library
$config = array('upload_path' => './uploads/item_pics/',
'allowed_types' => 'gif|jpg|png',
@@ -670,18 +670,18 @@ class Items extends Secure_Controller
);
$this->load->library('upload', $config);
$this->upload->do_upload('item_image');
return strlen($this->upload->display_errors()) == 0 || !strcmp($this->upload->display_errors(), '<p>'.$this->lang->line('upload_no_file_selected').'</p>');
}
public function remove_logo($item_id)
{
$item_data = array('pic_filename' => NULL);
$result = $this->Item->save($item_data, $item_id);
echo json_encode(array('success' => $result));
}
public function save_inventory($item_id = -1)
{
$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
@@ -695,9 +695,9 @@ class Items extends Secure_Controller
'trans_comment' => $this->input->post('trans_comment'),
'trans_inventory' => parse_quantity($this->input->post('newquantity'))
);
$this->Inventory->insert($inv_data);
//Update stock quantity
$item_quantity = $this->Item_quantity->get_item_quantity($item_id, $location_id);
$item_quantity_data = array(
@@ -705,26 +705,26 @@ class Items extends Secure_Controller
'location_id' => $location_id,
'quantity' => $item_quantity->quantity + parse_quantity($this->input->post('newquantity'))
);
if($this->Item_quantity->save($item_quantity_data, $item_id, $location_id))
{
$message = $this->xss_clean($this->lang->line('items_successful_updating') . ' ' . $cur_item_info->name);
echo json_encode(array('success' => TRUE, 'message' => $message, 'id' => $item_id));
}
else//failure
{
$message = $this->xss_clean($this->lang->line('items_error_adding_updating') . ' ' . $cur_item_info->name);
echo json_encode(array('success' => FALSE, 'message' => $message, 'id' => -1));
}
}
public function bulk_update()
{
$items_to_update = $this->input->post('item_ids');
$item_data = array();
foreach($_POST as $key => $value)
{
//This field is nullable, so treat it differently
@@ -737,7 +737,7 @@ class Items extends Secure_Controller
$item_data["$key"] = $value;
}
}
//Item data could be empty if tax information is being updated
if(empty($item_data) || $this->Item->update_multiple($item_data, $items_to_update))
{
@@ -751,16 +751,16 @@ class Items extends Secure_Controller
if(!empty($tax_names[$k]) && is_numeric($tax_percents[$k]))
{
$tax_updated = TRUE;
$items_taxes_data[] = array('name' => $tax_names[$k], 'percent' => $tax_percents[$k]);
}
}
if($tax_updated)
{
$this->Item_taxes->save_multiple($items_taxes_data, $items_to_update);
}
echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('items_successful_bulk_edit'), 'id' => $this->xss_clean($items_to_update)));
}
else
@@ -768,11 +768,11 @@ class Items extends Secure_Controller
echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('items_error_updating_multiple')));
}
}
public function delete()
{
$items_to_delete = $this->input->post('ids');
if($this->Item->delete_list($items_to_delete))
{
$message = $this->lang->line('items_successful_deleted') . ' ' . count($items_to_delete) . ' ' . $this->lang->line('items_one_or_multiple');
@@ -783,7 +783,7 @@ class Items extends Secure_Controller
echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('items_cannot_be_deleted')));
}
}
/*
Items import from csv spreadsheet
*/
@@ -795,12 +795,12 @@ class Items extends Secure_Controller
$data = generate_import_items_csv($allowed_locations,$allowed_attributes);
force_download($name, $data, TRUE);
}
public function csv_import()
{
$this->load->view('items/form_csv_import', NULL);
}
/**
* Imports items from CSV formatted file.
*/
@@ -817,13 +817,13 @@ class Items extends Secure_Controller
$line_array = get_csv_file($_FILES['file_path']['tmp_name']);
$failCodes = array();
$keys = $line_array[0];
$this->db->trans_begin();
for($i = 1; $i < count($line_array); $i++)
{
$invalidated = FALSE;
$line = array_combine($keys,$this->xss_clean($line_array[$i])); //Build a XSS-cleaned associative array with the row to use to assign values
if(!empty($line))
{
$item_data = array(
@@ -839,15 +839,15 @@ class Items extends Secure_Controller
'hsn_code' => $line['HSN'],
'pic_filename' => $line['item_image']
);
$item_number = $line['Barcode'];
if($item_number != '')
{
$item_data['item_number'] = $item_number;
$invalidated = $this->Item->item_number_exists($item_number);
}
//Sanity check of data
if(!$invalidated)
{
@@ -858,7 +858,7 @@ class Items extends Secure_Controller
{
$invalidated = TRUE;
}
//Save to database
if(!$invalidated && $this->Item->save($item_data))
{
@@ -873,7 +873,7 @@ class Items extends Secure_Controller
log_message("ERROR","CSV Item import failed on line ". $failed_row .". This item was not imported.");
}
}
if(count($failCodes) > 0)
{
$message = $this->lang->line('items_csv_import_partially_failed', count($failCodes), implode(', ', $failCodes));
@@ -892,9 +892,9 @@ class Items extends Secure_Controller
}
}
}
/**
* Checks the entire line of data for errors
* Checks the entire line of data in an import file for errors
*
* @param array $line
* @param array $item_data
@@ -910,13 +910,13 @@ class Items extends Secure_Controller
$item_data['cost_price'],
$item_data['unit_price']
);
if(in_array('',$check_for_empty,true))
{
log_message("ERROR","Empty required value");
return TRUE; //Return fail on empty required fields
}
//Build array of fields to check for numerics
$check_for_numeric_values = array(
$item_data['cost_price'],
@@ -926,15 +926,15 @@ class Items extends Secure_Controller
$line['Tax 1 Percent'],
$line['Tax 2 Percent']
);
//Add in Stock Location values to check for numeric
$allowed_locations = $this->Stock_location->get_allowed_locations();
foreach($allowed_locations as $location_id => $location_name)
{
$check_for_numeric_values[] = $line['location_'. $location_name];
}
//Check for non-numeric values which require numeric
foreach($check_for_numeric_values as $value)
{
@@ -944,10 +944,10 @@ class Items extends Secure_Controller
return TRUE;
}
}
//Check Attribute Data
$definition_names = $this->Attribute->get_definition_names();
foreach($definition_names as $definition_name)
{
if(!empty($line['attribute_' . $definition_name]))
@@ -955,12 +955,12 @@ class Items extends Secure_Controller
$attribute_data = $this->Attribute->get_definition_by_name($definition_name)[0];
$attribute_type = $attribute_data['definition_type'];
$attribute_value = $line['attribute_' . $definition_name];
if($attribute_type == 'DROPDOWN')
{
$dropdown_values = $this->Attribute->get_definition_values($attribute_data['definition_id']);
$dropdown_values[] = '';
if(in_array($attribute_value, $dropdown_values) === FALSE)
{
log_message("ERROR","Value: '$attribute_value' is not an acceptable DROPDOWN value");
@@ -985,11 +985,13 @@ class Items extends Secure_Controller
}
}
}
return FALSE;
}
//TODO: Figure out if I need to have line 1003 be isset or empty. If zero is a possible answer, then empty will return false negatives.
/**
* Saves attribute data found in the CSV import.
*
* @param line
* @param failCodes
* @param attribute_data
@@ -997,15 +999,15 @@ class Items extends Secure_Controller
private function save_attribute_data($line, $item_data)
{
$definition_names = $this->Attribute->get_definition_names();
foreach($definition_names as $definition_name)
{
if(!empty($line['attribute_' . $definition_name]))
if(!isset($line['attribute_' . $definition_name]))
{
//Create attribute value
$attribute_data = $this->Attribute->get_definition_by_name($definition_name)[0];
$status = $this->Attribute->save_value($line['attribute_' . $definition_name], $attribute_data['definition_id'], $item_data['item_id'], FALSE, $attribute_data['definition_type']);
if($status === FALSE)
{
return FALSE;
@@ -1013,7 +1015,7 @@ class Items extends Secure_Controller
}
}
}
/**
* Saves inventory quantities for the row in the appropriate stock locations.
*
@@ -1027,26 +1029,26 @@ class Items extends Secure_Controller
$emp_info = $this->Employee->get_info($employee_id);
$comment = $this->lang->line('items_inventory_CSV_import_quantity');
$allowed_locations = $this->Stock_location->get_allowed_locations();
foreach($allowed_locations as $location_id => $location_name)
{
$item_quantity_data = array(
'item_id' => $item_data['item_id'],
'location_id' => $location_id
);
$csv_data = array(
'trans_items' => $item_data['item_id'],
'trans_user' => $employee_id,
'trans_comment' => $comment,
'trans_location' => $location_id,
);
if(!empty($line['location_' . $location_name]))
{
$item_quantity_data['quantity'] = $line['location_' . $location_name];
$this->Item_quantity->save($item_quantity_data, $item_data['item_id'], $location_id);
$csv_data['trans_inventory'] = $line['location_' . $location_name];
$this->Inventory->insert($csv_data);
}
@@ -1054,13 +1056,13 @@ class Items extends Secure_Controller
{
$item_quantity_data['quantity'] = 0;
$this->Item_quantity->save($item_quantity_data, $item_data['item_id'], $line[$col]);
$csv_data['trans_inventory'] = 0;
$this->Inventory->insert($csv_data);
}
}
}
/**
* Saves the tax data found in the line of the CSV items import file
*
@@ -1069,24 +1071,24 @@ class Items extends Secure_Controller
private function save_tax_data($line, $item_data)
{
$items_taxes_data = array();
if(is_numeric($line['Tax 1 Percent']) && $line['Tax 1 Name'] != '')
{
$items_taxes_data[] = array('name' => $line['Tax 1 Name'], 'percent' => $line['Tax 1 Percent'] );
}
if(is_numeric($line['Tax 2 Percent']) && $line['Tax 2 Name'] != '')
{
$items_taxes_data[] = array('name' => $line['Tax 2 Name'], 'percent' => $line['Tax 2 Percent'] );
}
if(count($items_taxes_data) > 0)
{
$this->Item_taxes->save($items_taxes_data, $item_data['item_id']);
}
}
/**
* Guess whether file extension is not in the table field, if it isn't, then it's an old-format (formerly pic_id) field, so we guess the right filename and update the table
*
@@ -1095,7 +1097,7 @@ class Items extends Secure_Controller
private function _update_pic_filename($item)
{
$filename = pathinfo($item->pic_filename, PATHINFO_FILENAME);
// if the field is empty there's nothing to check
if(!empty($filename))
{