mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-11 18:38:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tax name

Browse Source 
Added tax name to tax summary report.
Closes #3009
This commit is contained in:
WebShells
2021-09-19 00:52:19 +03:00
committed by jekkos
parent b15d0b046e
commit d2d9c9c532
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Reports.php
View File

@@ -304,6 +304,7 @@ class Reports extends Secure_Controller
foreach($report_data as $row) foreach($report_data as $row)
{ {
$tabular_data[] = $this->xss_clean(array( $tabular_data[] = $this->xss_clean(array(
'tax_name' => $row['name'],
'tax_percent' => $row['percent'], 'tax_percent' => $row['percent'],
'report_count' => $row['count'], 'report_count' => $row['count'],
'subtotal' => to_currency($row['subtotal']), 'subtotal' => to_currency($row['subtotal']),

1
application/language/en-US/reports_lang.php
View File

@@ -116,6 +116,7 @@ $lang["reports_supplier"] = "Supplier";
$lang["reports_suppliers"] = "Suppliers"; $lang["reports_suppliers"] = "Suppliers";
$lang["reports_suppliers_summary_report"] = "Suppliers Summary Report"; $lang["reports_suppliers_summary_report"] = "Suppliers Summary Report";
$lang["reports_tax"] = "Tax"; $lang["reports_tax"] = "Tax";
$lang["report_tax_name"] = "Tax Name";
$lang["reports_tax_category"] = "Tax Category"; $lang["reports_tax_category"] = "Tax Category";
$lang["reports_tax_percent"] = "Tax Percent"; $lang["reports_tax_percent"] = "Tax Percent";
$lang["reports_tax_rate"] = "Tax Rate"; $lang["reports_tax_rate"] = "Tax Rate";

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

@@ -7,6 +7,7 @@ class Summary_taxes extends Summary_report
protected function _get_data_columns() protected function _get_data_columns()
{ {
return array( return array(
array('tax_name' => $this->lang->line('reports_tax_name'), 'sortable' => FALSE),
array('tax_percent' => $this->lang->line('reports_tax_percent'), 'sorter' => 'number_sorter'), array('tax_percent' => $this->lang->line('reports_tax_percent'), 'sorter' => 'number_sorter'),
array('report_count' => $this->lang->line('reports_sales'), 'sorter' => 'number_sorter'), array('report_count' => $this->lang->line('reports_sales'), 'sorter' => 'number_sorter'),
array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'), array('subtotal' => $this->lang->line('reports_subtotal'), 'sorter' => 'number_sorter'),
@@ -63,9 +64,10 @@ class Summary_taxes extends Summary_report
. ' ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END)'; . ' ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END)';
} }
$query = $this->db->query("SELECT percent, COUNT(DISTINCT sale_id) AS count, ROUND(SUM(subtotal), $decimals) AS subtotal, ROUND(SUM(tax), $decimals) AS tax, ROUND(SUM(total), $decimals) AS total $query = $this->db->query("SELECT name as name, percent, COUNT(DISTINCT sale_id) AS count, ROUND(SUM(subtotal), $decimals) AS subtotal, ROUND(SUM(tax), $decimals) AS tax, ROUND(SUM(total), $decimals) AS total
FROM ( FROM (
SELECT SELECT
name AS name,
CONCAT(IFNULL(ROUND(percent, $decimals), 0), '%') AS percent, CONCAT(IFNULL(ROUND(percent, $decimals), 0), '%') AS percent,
sales.sale_id AS sale_id, sales.sale_id AS sale_id,
$sale_subtotal AS subtotal, $sale_subtotal AS subtotal,