mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added Transactions column to Employees Summary Report and Transactions Summary Report

Browse Source
This commit is contained in:
Carl Hunter
2020-11-14 19:12:53 -05:00
committed by jekkos
parent 8571cd1a44
commit 20d78224a4
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Reports.php
View File

@@ -51,6 +51,7 @@ class Reports extends Secure_Controller
{
$tabular_data[] = $this->xss_clean(array(
'sale_date' => to_date(strtotime($row['sale_date'])),
'sales' => to_quantity_decimals($row['sales']),
'quantity' => to_quantity_decimals($row['quantity_purchased']),
'subtotal' => to_currency($row['subtotal']),
'tax' => to_currency_tax($row['tax']),
@@ -265,6 +266,7 @@ class Reports extends Secure_Controller
{
$tabular_data[] = $this->xss_clean(array(
'employee_name' => $row['employee'],
'sales' => to_quantity_decimals($row['sales']),
'quantity' => to_quantity_decimals($row['quantity_purchased']),
'subtotal' => to_currency($row['subtotal']),
'tax' => to_currency_tax($row['tax']),

4
application/models/reports/Summary_employees.php
View File

@@ -8,6 +8,7 @@ class Summary_employees extends Summary_report
{
return array(
array('employee_name' => $this->lang->line('reports_employee')),
array('sales' => $this->lang->line('reports_sales'), 'sorter' => 'number_sorter'),
array('quantity' => $this->lang->line('reports_quantity')),
array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
@@ -22,7 +23,8 @@ class Summary_employees extends Summary_report
$this->db->select('
MAX(CONCAT(employee_p.first_name, " ", employee_p.last_name)) AS employee,
SUM(sales_items.quantity_purchased) AS quantity_purchased
SUM(sales_items.quantity_purchased) AS quantity_purchased,
COUNT(DISTINCT sales.sale_id) AS sales
');
}

4
application/models/reports/Summary_sales.php
View File

@@ -8,6 +8,7 @@ class Summary_sales extends Summary_report
{
return array(
array('sale_date' => $this->lang->line('reports_date'), 'sortable' => FALSE),
array('sales' => $this->lang->line('reports_sales'), 'sorter' => 'number_sorter'),
array('quantity' => $this->lang->line('reports_quantity')),
array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
array('tax' => $this->lang->line('reports_tax'), 'sorter' => 'number_sorter'),
@@ -22,7 +23,8 @@ class Summary_sales extends Summary_report
$this->db->select('
DATE(sales.sale_time) AS sale_date,
SUM(sales_items.quantity_purchased) AS quantity_purchased
SUM(sales_items.quantity_purchased) AS quantity_purchased,
COUNT(DISTINCT sales.sale_id) AS sales
');
}