mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-26 02:08:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix receipts after sale and receiving completion

Browse Source
This commit is contained in:
jekkos-t520
2015-02-09 23:37:19 +01:00
parent 0a29809f7a
commit 39301e7091
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/receivings.php
View File

@@ -6,6 +6,7 @@ class Receivings extends Secure_area
{
parent::__construct('receivings');
$this->load->library('receiving_lib');
$this->load->library('barcode_lib');
}
function index()
@@ -215,7 +216,8 @@ class Receivings extends Secure_area
{
$data['error_message'] = $this->lang->line('receivings_transaction_failed');
}
$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
$data['barcode']=$this->barcode_lib->generate_barcode($receiving_id,$barcode_config);
$this->load->view("receivings/receipt",$data);
$this->receiving_lib->clear_all();
}
@@ -270,7 +272,6 @@ class Receivings extends Secure_area
function receipt($receiving_id)
{
$this->load->library('barcode_lib');
$receiving_info = $this->Receiving->get_info($receiving_id)->row_array();
$this->receiving_lib->copy_entire_receiving($receiving_id);
$data['cart']=$this->receiving_lib->get_cart();

6
application/controllers/sales.php
View File

@@ -5,7 +5,8 @@ class Sales extends Secure_area
function __construct()
{
parent::__construct('sales');
$this->load->library('sale_lib');
$this->load->library('sale_lib');
$this->load->library('barcode_lib');
}
function index()
@@ -260,6 +261,8 @@ class Sales extends Secure_area
$this->email->send();
}
}
$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
$data['barcode']=$this->barcode_lib->generate_barcode($sale_id,$barcode_config);
$this->load->view("sales/receipt",$data);
$this->sale_lib->clear_all();
}
@@ -297,7 +300,6 @@ class Sales extends Secure_area
function receipt($sale_id)
{
$this->load->library('barcode_lib');
$sale_info = $this->Sale->get_info($sale_id)->row_array();
$this->sale_lib->copy_entire_sale($sale_id);
$stock_locations = $this->Stock_locations->get_undeleted_all()->result_array();