mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-25 00:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with deleted items not being included in reprinted receipts.

Browse Source
This commit is contained in:
Steve Ireland
2018-09-26 21:36:04 -04:00
committed by jekkos
parent 3a7d8415f6
commit 6d5f518855
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/libraries/Sale_lib.php
View File

@@ -698,7 +698,7 @@ class Sale_lib
public function add_item(&$item_id, $quantity = 1, $item_location, $discount = 0, $discount_type = 0, $price_mode = PRICE_MODE_STANDARD, $kit_price_option = NULL, $kit_print_option = NULL, $price_override = NULL, $description = NULL, $serialnumber = NULL, $include_deleted = FALSE, $print_option = NULL )
{
$item_info = $this->CI->Item->get_info_by_id_or_number($item_id);
$item_info = $this->CI->Item->get_info_by_id_or_number($item_id, $include_deleted);
//make sure item exists
if(empty($item_info))
@@ -883,7 +883,7 @@ class Sale_lib
//make sure item exists
if($item_id != -1)
{
$item_info = $this->CI->Item->get_info_by_id_or_number($item_id);
$item_info = $this->CI->Item->get_info_by_id_or_number($item_id, TRUE);
if($item_info->stock_type == HAS_STOCK)
{
@@ -1001,7 +1001,7 @@ class Sale_lib
foreach($this->CI->Item_kit_items->get_info($item_kit_id) as $item_kit_item)
{
$result &= $this->add_item($item_kit_item['item_id'], $item_kit_item['quantity'], $item_location, $discount, $discount_type, PRICE_MODE_KIT, $kit_price_option, $kit_print_option, NULL, NULL, NULL, NULL);
$result &= $this->add_item($item_kit_item['item_id'], $item_kit_item['quantity'], $item_location, $discount, $discount_type, PRICE_MODE_KIT, $kit_price_option, $kit_print_option, NULL, NULL, NULL, FALSE);
if($stock_warning == NULL)
{

7
application/models/Item.php
View File

@@ -321,7 +321,7 @@ class Item extends CI_Model
/*
Gets information about a particular item by item id or number
*/
public function get_info_by_id_or_number($item_id)
public function get_info_by_id_or_number($item_id, $include_deleted = TRUE)
{
$this->db->from('items');
@@ -338,6 +338,11 @@ class Item extends CI_Model
$this->db->group_end();
if(!$include_deleted)
{
$this->db->where("items.deleted = '0'");
}
// limit to only 1 so there is a result in case two are returned
// due to barcode and item_id clash
$this->db->limit(1);