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

Made invoice optional from store config checkbox, updated and regen database script, few config fixes (#410)

Browse Source
This commit is contained in:
FrancescoUK
2016-04-24 17:11:37 +01:00
parent b88575b2a5
commit 34d09bc575
15 changed files with 247 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/controllers/Sales.php
View File

@@ -56,8 +56,15 @@ class Sales extends Secure_area
$total_rows = $this->Sale->get_found_rows($search, $filters);
// filters that will be loaded in the multiselect dropdown
$data['filters'] = array('only_cash' => $this->lang->line('sales_cash_filter'),
'only_invoices' => $this->lang->line('sales_invoice_filter'));
if($this->config->item('invoice_enable') == TRUE)
{
$data['filters'] = array('only_cash' => $this->lang->line('sales_cash_filter'),
'only_invoices' => $this->lang->line('sales_invoice_filter'));
}
else
{
$data['filters'] = array('only_cash' => $this->lang->line('sales_cash_filter'));
}
$data['selected'] = array( ($only_cash ? 'only_cash' : ''), ($only_invoices ? 'only_invoices' : '') );
$data['start_date'] = $start_date;
@@ -103,7 +110,14 @@ class Sales extends Secure_area
$sale_type = 'all';
$location_id = 'all';
$only_invoices = $this->input->post('only_invoices') != null;
if($this->config->item('invoice_enable') == TRUE)
{
$only_invoices = $this->input->post('only_invoices') != null;
}
else
{
$only_invoices = FALSE;
}
$only_cash = $this->input->post('only_cash') != null;
$filters = array('sale_type' => $sale_type,