mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-25 09:38:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix review issues

Browse Source
This commit is contained in:
FrancescoUK authored and GitHub committed 2018-07-14 09:26:47 +01:00
1 parent a4e135eb92
commit 1486a41363
1 file changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files
application/models/Item.php
+8 -8
View File
@@ -535,7 +535,7 @@ class Item extends CI_Model
{
if($item_field_name !== '')
{
if($label == "")
if($label == '')
{
if($item_field_name == 'name')
{
@@ -550,7 +550,7 @@ class Item extends CI_Model
{
if($item_field_name == 'name')
{
$label .= implode(NAME_SEPARATOR, array("", $item_info->name, $item_info->pack_name));
$label .= implode(NAME_SEPARATOR, array('', $item_info->name, $item_info->pack_name));
}
else
{
@@ -676,7 +676,7 @@ class Item extends CI_Model
$this->db->from('items');
$this->db->where('deleted', $filters['is_deleted']);
$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
$this->db->where("stock_type = '0'"); // stocked items only
$this->db->where('stock_type', '0'); // stocked items only
$this->db->like('name', $search);
$this->db->order_by('name', 'asc');
foreach($this->db->get()->result() as $row)
@@ -688,7 +688,7 @@ class Item extends CI_Model
$this->db->from('items');
$this->db->where('deleted', $filters['is_deleted']);
$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
$this->db->where("stock_type = '0'"); // stocked items only
$this->db->where('stock_type', '0'); // stocked items only
$this->db->like('item_number', $search);
$this->db->order_by('item_number', 'asc');
foreach($this->db->get()->result() as $row)
@@ -703,7 +703,7 @@ class Item extends CI_Model
$this->db->from('items');
$this->db->where('deleted', $filters['is_deleted']);
$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
$this->db->where("stock_type = '0'"); // stocked items only
$this->db->where('stock_type', '0'); // stocked items only
$this->db->distinct();
$this->db->like('category', $search);
$this->db->order_by('category', 'asc');
@@ -730,7 +730,7 @@ class Item extends CI_Model
$this->db->from('items');
$this->db->where('deleted', $filters['is_deleted']);
$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
$this->db->where("stock_type = '0'"); // stocked items only
$this->db->where('stock_type', '0'); // stocked items only
$this->db->like('description', $search);
$this->db->order_by('description', 'asc');
foreach($this->db->get()->result() as $row)
@@ -759,7 +759,7 @@ class Item extends CI_Model
$this->db->or_like('custom10', $search);
$this->db->group_end();
$this->db->where_in('item_type', $non_kit); // standard, exclude kit items since kits will be picked up later
$this->db->where("stock_type = '0'"); // stocked items only
$this->db->where('stock_type', '0'); // stocked items only
$this->db->where('deleted', $filters['is_deleted']);
foreach($this->db->get()->result() as $row)
{
@@ -889,7 +889,7 @@ class Item extends CI_Model
$this->db->select($this->get_search_suggestion_format('item_id, pack_name'));
$this->db->from('items');
$this->db->where('deleted', '0');
$this->db->where("stock_type = '0'"); // stocked items only
$this->db->where('stock_type', '0'); // stocked items only
$this->db->like('name', $search);
$this->db->order_by('name', 'asc');
foreach($this->db->get()->result() as $row)