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

Fix quantity decimals in Inventory Reports (#429)

Browse Source
This commit is contained in:
FrancescoUK
2016-04-08 09:12:09 +01:00
parent 984f6c5cac
commit 45bd6ece05
1 changed files with 155 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

267
application/controllers/Reports.php
View File

@@ -45,7 +45,7 @@ class Reports extends Secure_area
$summary_data = array(anchor('sales/edit/'.$report_data['sale_id'],
'POS '.$report_data['sale_id'],
array('class' => 'modal-dlg modal-btn-submit')),
array('class'=>'modal-dlg modal-btn-submit')),
$report_data['sale_date'],
$report_data['items_purchased'],
$report_data['employee_name'],
@@ -69,7 +69,7 @@ class Reports extends Secure_area
$summary_data = array(anchor('receivings/edit/'.$report_data['receiving_id'],
'RECV '.$report_data['receiving_id'],
array('class' => 'modal-dlg modal-btn-submit')),
array('class'=>'modal-dlg modal-btn-submit')),
$report_data['receiving_date'],
$report_data['items_purchased'],
$report_data['employee_name'],
@@ -81,7 +81,7 @@ class Reports extends Secure_area
echo get_detailed_data_row($summary_data, $this);
}
function get_summary_data($start_date, $end_date = null, $sale_type=0)
function get_summary_data($start_date, $end_date=null, $sale_type=0)
{
$end_date = $end_date ? $end_date : $start_date;
$this->load->model('reports/Summary_sales');
@@ -89,7 +89,7 @@ class Reports extends Secure_area
$summary = $model->getSummaryData(array(
'start_date'=>$start_date,
'end_date'=>$end_date,
'sale_type' => $sale_type));
'sale_type'=>$sale_type));
echo get_sales_summary_totals($summary, $this);
}
@@ -99,11 +99,17 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_sales');
$model = $this->Summary_sales;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
$tabular_data[] = array($row['sale_date'], to_quantity_decimals($row['quantity_purchased']), to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
$tabular_data[] = array($row['sale_date'],
to_quantity_decimals($row['quantity_purchased']),
to_currency($row['subtotal']),
to_currency($row['total']),
to_currency($row['tax']),
to_currency($row['cost']),
to_currency($row['profit']));
}
$data = array(
@@ -111,7 +117,7 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
@@ -124,11 +130,17 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_categories');
$model = $this->Summary_categories;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
$tabular_data[] = array($row['category'], to_quantity_decimals($row['quantity_purchased']), to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
$tabular_data[] = array($row['category'],
to_quantity_decimals($row['quantity_purchased']),
to_currency($row['subtotal']),
to_currency($row['total']),
to_currency($row['tax']),
to_currency($row['cost']),
to_currency($row['profit']));
}
$data = array(
@@ -136,7 +148,7 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
@@ -149,11 +161,17 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_customers');
$model = $this->Summary_customers;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
$tabular_data[] = array($row['customer'], to_quantity_decimals($row['quantity_purchased']), to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
$tabular_data[] = array($row['customer'],
to_quantity_decimals($row['quantity_purchased']),
to_currency($row['subtotal']),
to_currency($row['total']),
to_currency($row['tax']),
to_currency($row['cost']),
to_currency($row['profit']));
}
$data = array(
@@ -161,7 +179,7 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
@@ -174,11 +192,17 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_suppliers');
$model = $this->Summary_suppliers;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
$tabular_data[] = array($row['supplier'], to_quantity_decimals($row['quantity_purchased']), to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
$tabular_data[] = array($row['supplier'],
to_quantity_decimals($row['quantity_purchased']),
to_currency($row['subtotal']),
to_currency($row['total']),
to_currency($row['tax']),
to_currency($row['cost']),
to_currency($row['profit']));
}
$data = array(
@@ -186,7 +210,7 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
@@ -199,11 +223,17 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_items');
$model = $this->Summary_items;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
$tabular_data[] = array(character_limiter($row['name'], 40), to_quantity_decimals($row['quantity_purchased']), to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
$tabular_data[] = array(character_limiter($row['name'], 40),
to_quantity_decimals($row['quantity_purchased']),
to_currency($row['subtotal']),
to_currency($row['total']),
to_currency($row['tax']),
to_currency($row['cost']),
to_currency($row['profit']));
}
$data = array(
@@ -211,7 +241,7 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
@@ -224,11 +254,17 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_employees');
$model = $this->Summary_employees;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
$tabular_data[] = array($row['employee'], to_quantity_decimals($row['quantity_purchased']), to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']));
$tabular_data[] = array($row['employee'],
to_quantity_decimals($row['quantity_purchased']),
to_currency($row['subtotal']),
to_currency($row['total']),
to_currency($row['tax']),
to_currency($row['cost']),
to_currency($row['profit']));
}
$data = array(
@@ -236,7 +272,7 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
@@ -249,11 +285,15 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_taxes');
$model = $this->Summary_taxes;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
$tabular_data[] = array($row['percent'], $row['count'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']));
$tabular_data[] = array($row['percent'],
$row['count'],
to_currency($row['subtotal']),
to_currency($row['total']),
to_currency($row['tax']));
}
$data = array(
@@ -261,7 +301,7 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
@@ -274,7 +314,7 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_discounts');
$model = $this->Summary_discounts;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
@@ -286,7 +326,7 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
@@ -299,7 +339,7 @@ class Reports extends Secure_area
$this->load->model('reports/Summary_payments');
$model = $this->Summary_payments;
$tabular_data = array();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
foreach($report_data as $row)
{
@@ -311,11 +351,11 @@ class Reports extends Secure_area
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"data" => $tabular_data,
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
$this->load->view("reports/tabular",$data);
$this->load->view("reports/tabular", $data);
}
//Input for reports that require only a date range. (see routes.php to see that all graphical summary reports route here)
@@ -323,7 +363,7 @@ class Reports extends Secure_area
{
$data = array();
$data['mode'] = 'sale';
$this->load->view("reports/date_input",$data);
$this->load->view("reports/date_input", $data);
}
//Input for reports that require only a date range. (see routes.php to see that all graphical summary reports route here)
@@ -334,7 +374,7 @@ class Reports extends Secure_area
$stock_locations['all'] = $this->lang->line('reports_all');
$data['stock_locations'] = array_reverse($stock_locations, TRUE);
$data['mode'] = 'sale';
$this->load->view("reports/date_input",$data);
$this->load->view("reports/date_input", $data);
}
function date_input_recv()
@@ -344,7 +384,7 @@ class Reports extends Secure_area
$stock_locations['all'] = $this->lang->line('reports_all');
$data['stock_locations'] = array_reverse($stock_locations, TRUE);
$data['mode'] = 'receiving';
$this->load->view("reports/date_input",$data);
$this->load->view("reports/date_input", $data);
}
//Graphical summary sales report
@@ -357,10 +397,10 @@ class Reports extends Secure_area
"title" => $this->lang->line('reports_sales_summary_report'),
"data_file" => site_url("reports/graphical_summary_sales_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -368,7 +408,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_sales');
$model = $this->Summary_sales;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -383,7 +423,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/line",$data);
$this->load->view("reports/graphs/line", $data);
}
@@ -397,10 +437,10 @@ class Reports extends Secure_area
"title" => $this->lang->line('reports_items_summary_report'),
"data_file" => site_url("reports/graphical_summary_items_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -408,7 +448,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_items');
$model = $this->Summary_items;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -423,7 +463,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/hbar",$data);
$this->load->view("reports/graphs/hbar", $data);
}
//Graphical summary customers report
@@ -436,10 +476,10 @@ class Reports extends Secure_area
"title" => $this->lang->line('reports_categories_summary_report'),
"data_file" => site_url("reports/graphical_summary_categories_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -447,7 +487,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_categories');
$model = $this->Summary_categories;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -460,7 +500,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/pie",$data);
$this->load->view("reports/graphs/pie", $data);
}
//Graphical summary suppliers report
@@ -473,10 +513,10 @@ class Reports extends Secure_area
"title" => $this->lang->line('reports_suppliers_summary_report'),
"data_file" => site_url("reports/graphical_summary_suppliers_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -484,7 +524,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_suppliers');
$model = $this->Summary_suppliers;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -497,7 +537,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/pie",$data);
$this->load->view("reports/graphs/pie", $data);
}
//Graphical summary employees report
@@ -510,10 +550,10 @@ class Reports extends Secure_area
"title" => $this->lang->line('reports_employees_summary_report'),
"data_file" => site_url("reports/graphical_summary_employees_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -521,7 +561,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_employees');
$model = $this->Summary_employees;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -534,7 +574,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/pie",$data);
$this->load->view("reports/graphs/pie", $data);
}
//Graphical summary taxes report
@@ -547,10 +587,10 @@ class Reports extends Secure_area
"title" => $this->lang->line('reports_taxes_summary_report'),
"data_file" => site_url("reports/graphical_summary_taxes_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -558,7 +598,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_taxes');
$model = $this->Summary_taxes;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -571,7 +611,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/pie",$data);
$this->load->view("reports/graphs/pie", $data);
}
//Graphical summary customers report
@@ -584,10 +624,10 @@ class Reports extends Secure_area
"title" => $this->lang->line('reports_customers_summary_report'),
"data_file" => site_url("reports/graphical_summary_customers_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -595,7 +635,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_customers');
$model = $this->Summary_customers;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -610,7 +650,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/hbar",$data);
$this->load->view("reports/graphs/hbar", $data);
}
//Graphical summary discounts report
@@ -623,10 +663,10 @@ class Reports extends Secure_area
"title" => $this->lang->line('reports_discounts_summary_report'),
"data_file" => site_url("reports/graphical_summary_discounts_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -634,7 +674,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_discounts');
$model = $this->Summary_discounts;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -649,7 +689,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/bar",$data);
$this->load->view("reports/graphs/bar", $data);
}
//Graphical summary payments report
@@ -661,11 +701,11 @@ class Reports extends Secure_area
$data = array(
"title" => $this->lang->line('reports_payments_summary_report'),
"data_file" => site_url("reports/graphical_summary_payments_graph/$start_date/$end_date/$sale_type"),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type))
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) . '-' . date($this->config->item('dateformat'), strtotime($end_date)),
"summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type))
);
$this->load->view("reports/graphical",$data);
$this->load->view("reports/graphical", $data);
}
//The actual graph data
@@ -673,7 +713,7 @@ class Reports extends Secure_area
{
$this->load->model('reports/Summary_payments');
$model = $this->Summary_payments;
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type));
$graph_data = array();
foreach($report_data as $row)
@@ -688,7 +728,7 @@ class Reports extends Secure_area
"data" => $graph_data
);
$this->load->view("reports/graphs/pie",$data);
$this->load->view("reports/graphs/pie", $data);
}
function specific_customer_input()
@@ -702,7 +742,7 @@ class Reports extends Secure_area
$customers[$customer->person_id] = $customer->first_name .' '.$customer->last_name;
}
$data['specific_input_data'] = $customers;
$this->load->view("reports/specific_input",$data);
$this->load->view("reports/specific_input", $data);
}
function specific_customer($start_date, $end_date, $customer_id, $sale_type, $export_excel=0)
@@ -711,14 +751,14 @@ class Reports extends Secure_area
$model = $this->Specific_customer;
$headers = $model->getDataColumns();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'customer_id' =>$customer_id, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'customer_id' =>$customer_id, 'sale_type'=>$sale_type));
$summary_data = array();
$details_data = array();
foreach($report_data['summary'] as $key=>$row)
{
$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target' => '_blank')), $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target'=>'_blank')), $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
foreach($report_data['details'][$key] as $drow)
{
@@ -734,11 +774,11 @@ class Reports extends Secure_area
"summary_data" => $summary_data,
"details_data" => $details_data,
"header_width" => intval(100 / count($headers['summary'])),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'customer_id' =>$customer_id, 'sale_type' => $sale_type)),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'customer_id' =>$customer_id, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
$this->load->view("reports/tabular_details",$data);
$this->load->view("reports/tabular_details", $data);
}
function specific_employee_input()
@@ -752,7 +792,7 @@ class Reports extends Secure_area
$employees[$employee->person_id] = $employee->first_name .' '.$employee->last_name;
}
$data['specific_input_data'] = $employees;
$this->load->view("reports/specific_input",$data);
$this->load->view("reports/specific_input", $data);
}
function specific_employee($start_date, $end_date, $employee_id, $sale_type, $export_excel=0)
@@ -761,14 +801,14 @@ class Reports extends Secure_area
$model = $this->Specific_employee;
$headers = $model->getDataColumns();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'employee_id' =>$employee_id, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'employee_id' =>$employee_id, 'sale_type'=>$sale_type));
$summary_data = array();
$details_data = array();
foreach($report_data['summary'] as $key=>$row)
{
$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target' => '_blank')), $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target'=>'_blank')), $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
foreach($report_data['details'][$key] as $drow)
{
@@ -784,11 +824,11 @@ class Reports extends Secure_area
"summary_data" => $summary_data,
"details_data" => $details_data,
"header_width" => intval(100 / count($headers)),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'employee_id' =>$employee_id, 'sale_type' => $sale_type)),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'employee_id' =>$employee_id, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
$this->load->view("reports/tabular_details",$data);
$this->load->view("reports/tabular_details", $data);
}
function specific_discount_input()
@@ -802,7 +842,7 @@ class Reports extends Secure_area
$discounts[$i] = $i . '%';
}
$data['specific_input_data'] = $discounts;
$this->load->view("reports/specific_input",$data);
$this->load->view("reports/specific_input", $data);
}
function specific_discount($start_date, $end_date, $discount, $sale_type, $export_excel = 0)
@@ -811,14 +851,14 @@ class Reports extends Secure_area
$model = $this->Specific_discount;
$headers = $model->getDataColumns();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'discount' =>$discount, 'sale_type' => $sale_type));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'discount' =>$discount, 'sale_type'=>$sale_type));
$summary_data = array();
$details_data = array();
foreach($report_data['summary'] as $key=>$row)
{
$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target' => '_blank')), $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),/*to_currency($row['profit']),*/ $row['payment_type'], $row['comment']);
$summary_data[] = array(anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target'=>'_blank')), $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']),/*to_currency($row['profit']),*/ $row['payment_type'], $row['comment']);
foreach($report_data['details'][$key] as $drow)
{
@@ -827,18 +867,17 @@ class Reports extends Secure_area
}
$data = array(
"title" => $discount. '% '.$this->lang->line('reports_discount') . ' ' . $this->lang->line('reports_report'),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $headers,
"summary_data" => $summary_data,
"details_data" => $details_data,
"header_width" => intval(100 / count($headers['summary'])),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'discount' =>$discount, 'sale_type' => $sale_type)),
"export_excel" => $export_excel
"title" => $discount. '% '.$this->lang->line('reports_discount') . ' ' . $this->lang->line('reports_report'),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $headers,
"summary_data" => $summary_data,
"details_data" => $details_data,
"header_width" => intval(100 / count($headers['summary'])),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date,'discount' =>$discount, 'sale_type'=>$sale_type)),
"export_excel" => $export_excel
);
$this->load->view("reports/tabular_details",$data);
$this->load->view("reports/tabular_details", $data);
}
function detailed_sales($start_date, $end_date, $sale_type, $location_id='all', $export_excel=0)
@@ -847,7 +886,7 @@ class Reports extends Secure_area
$model = $this->Detailed_sales;
$headers = $model->getDataColumns();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type, 'location_id' => $location_id));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type, 'location_id'=>$location_id));
$summary_data = array();
$details_data = array();
@@ -856,7 +895,7 @@ class Reports extends Secure_area
foreach($report_data['summary'] as $key=>$row)
{
$summary_data[] = array(anchor('sales/edit/'.$row['sale_id'], 'POS '.$row['sale_id'], array('class' => 'modal-dlg modal-btn-submit')), $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
$summary_data[] = array(anchor('sales/edit/'.$row['sale_id'], 'POS '.$row['sale_id'], array('class'=>'modal-dlg modal-btn-submit')), $row['sale_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
foreach($report_data['details'][$key] as $drow)
{
@@ -870,18 +909,18 @@ class Reports extends Secure_area
}
$data = array(
"title" =>$this->lang->line('reports_detailed_sales_report'),
"title" => $this->lang->line('reports_detailed_sales_report'),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"editable" => "sales",
"summary_data" => $summary_data,
"details_data" => $details_data,
"header_width" => intval(100 / count($headers['summary'])),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type' => $sale_type, 'location_id' => $location_id)),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'sale_type'=>$sale_type, 'location_id'=>$location_id)),
"export_excel" => $export_excel
);
$this->load->view("reports/tabular_details",$data);
$this->load->view("reports/tabular_details", $data);
}
function detailed_receivings($start_date, $end_date, $receiving_type, $location_id='all', $export_excel=0)
@@ -890,7 +929,7 @@ class Reports extends Secure_area
$model = $this->Detailed_receivings;
$headers = $model->getDataColumns();
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'receiving_type'=>$receiving_type, 'location_id' => $location_id));
$report_data = $model->getData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'receiving_type'=>$receiving_type, 'location_id'=>$location_id));
$summary_data = array();
$details_data = array();
@@ -899,7 +938,7 @@ class Reports extends Secure_area
foreach($report_data['summary'] as $key=>$row)
{
$summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'], 'RECV '.$row['receiving_id'], array('class' => 'modal-dlg modal-btn-delete modal-btn-submit')), $row['receiving_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);
$summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'], 'RECV '.$row['receiving_id'], array('class'=>'modal-dlg modal-btn-delete modal-btn-submit')), $row['receiving_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);
foreach($report_data['details'][$key] as $drow)
{
@@ -913,7 +952,7 @@ class Reports extends Secure_area
}
$data = array(
"title" =>$this->lang->line('reports_detailed_receivings_report'),
"title" => $this->lang->line('reports_detailed_receivings_report'),
"subtitle" => date($this->config->item('dateformat'), strtotime($start_date)) .'-'.date($this->config->item('dateformat'), strtotime($end_date)),
"headers" => $model->getDataColumns(),
"header_width" => intval(100 / count($headers['summary'])),
@@ -921,16 +960,16 @@ class Reports extends Secure_area
"summary_data" => $summary_data,
"details_data" => $details_data,
"header_width" => intval(100 / count($headers['summary'])),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'receiving_type' => $receiving_type, 'location_id' => $location_id)),
"overall_summary_data" => $model->getSummaryData(array('start_date'=>$start_date, 'end_date'=>$end_date, 'receiving_type'=>$receiving_type, 'location_id'=>$location_id)),
"export_excel" => $export_excel
);
$this->load->view("reports/tabular_details",$data);
$this->load->view("reports/tabular_details", $data);
}
function excel_export()
{
$this->load->view("reports/excel_export",array());
$this->load->view("reports/excel_export", array());
}
function inventory_low($export_excel=0)
@@ -941,7 +980,12 @@ class Reports extends Secure_area
$report_data = $model->getData(array());
foreach($report_data as $row)
{
$tabular_data[] = array($row['name'], $row['item_number'], $row['description'], $row['quantity'], $row['reorder_level'], $row['location_name']);
$tabular_data[] = array($row['name'],
$row['item_number'],
$row['description'],
to_quantity_decimals($row['quantity']),
to_quantity_decimals($row['reorder_level']),
$row['location_name']);
}
$data = array(
@@ -953,7 +997,7 @@ class Reports extends Secure_area
"export_excel" => $export_excel
);
$this->load->view("reports/tabular",$data);
$this->load->view("reports/tabular", $data);
}
function inventory_summary_input()
@@ -971,19 +1015,19 @@ class Reports extends Secure_area
$this->load->view("reports/inventory_summary_input", $data);
}
function inventory_summary($export_excel=0, $location_id = 'all', $item_count = 'all')
function inventory_summary($export_excel=0, $location_id='all', $item_count='all')
{
$this->load->model('reports/Inventory_summary');
$model = $this->Inventory_summary;
$tabular_data = array();
$report_data = $model->getData(array('location_id'=>$location_id,'item_count'=>$item_count));
$report_data = $model->getData(array('location_id'=>$location_id, 'item_count'=>$item_count));
foreach($report_data as $row)
{
$tabular_data[] = array($row['name'],
$row['item_number'],
$row['description'],
$row['quantity'],
$row['reorder_level'],
to_quantity_decimals($row['quantity']),
to_quantity_decimals($row['reorder_level']),
$row['location_name'],
to_currency($row['cost_price']),
to_currency($row['unit_price']),
@@ -999,8 +1043,7 @@ class Reports extends Secure_area
"export_excel" => $export_excel
);
$this->load->view("reports/tabular",$data);
$this->load->view("reports/tabular", $data);
}
}
?>