From da17356e89f4a96e1c309f0b9bfab4c0cee146b6 Mon Sep 17 00:00:00 2001 From: Steve Ireland Date: Sat, 13 Mar 2021 19:05:29 -0500 Subject: [PATCH] Fix discount round plus some other minor tweaks. (#3125) --- application/models/Sale.php | 16 +++----- .../models/reports/Summary_payments.php | 6 +-- application/models/reports/Summary_report.php | 37 +++++++++++++++---- application/models/reports/Summary_taxes.php | 21 ++++++++--- 4 files changed, 54 insertions(+), 26 deletions(-) diff --git a/application/models/Sale.php b/application/models/Sale.php index a58abc5d1..4b639b147 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -33,18 +33,15 @@ class Sale extends CI_Model . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) " . 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END'; - $sales_tax = "ROUND(IFNULL(SUM(sales_items_taxes.sales_tax), 0), $decimals)"; - $internal_tax = "ROUND(IFNULL(SUM(sales_items_taxes.internal_tax), 0), $decimals)"; + $sales_tax = 'IFNULL(SUM(sales_items_taxes.sales_tax), 0)'; $cash_adjustment = 'IFNULL(SUM(payments.sale_cash_adjustment), 0)'; if($this->config->item('tax_included')) { $sale_total = "ROUND(SUM($sale_price), $decimals) + $cash_adjustment"; -// $sale_subtotal = "$sale_total - $internal_tax"; } else { -// $sale_subtotal = "ROUND(SUM($sale_price), $decimals) - $internal_tax - $cash_adjustment"; $sale_total = "ROUND(SUM($sale_price), $decimals) + $sales_tax + $cash_adjustment"; } @@ -57,8 +54,8 @@ class Sale extends CI_Model SELECT sales_items_taxes.sale_id AS sale_id, sales_items_taxes.item_id AS item_id, sales_items_taxes.line AS line, - SUM(CASE WHEN sales_items_taxes.tax_type = 0 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS internal_tax, - SUM(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS sales_tax + SUM(ROUND(CASE WHEN sales_items_taxes.tax_type = 0 THEN sales_items_taxes.item_tax_amount ELSE 0 END, ' . $decimals . ') AS internal_tax, + SUM(ROUND(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END), ' . $decimals . ' AS sales_tax FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales ON sales.sale_id = sales_items_taxes.sale_id @@ -1055,7 +1052,6 @@ class Sale extends CI_Model /** * Checks if quote number exists */ - // TODO change to use new quote_number field public function check_quote_number_exists($quote_number, $sale_id = '') { $this->db->from('sales'); @@ -1168,9 +1164,9 @@ class Sale extends CI_Model SELECT sales_items_taxes.sale_id AS sale_id, sales_items_taxes.item_id AS item_id, sales_items_taxes.line AS line, - SUM(sales_items_taxes.item_tax_amount) AS tax, - SUM(CASE WHEN sales_items_taxes.tax_type = 0 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS internal_tax, - SUM(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS sales_tax + SUM(ROUND(sales_items_taxes.item_tax_amount, ' . $decimals . ')) AS tax, + SUM(ROUND(CASE WHEN sales_items_taxes.tax_type = 0 THEN sales_items_taxes.item_tax_amount ELSE 0 END, ' . $decimals . ')) AS internal_tax, + SUM(ROUND(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END, ' . $decimals . ')) AS sales_tax FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales ON sales.sale_id = sales_items_taxes.sale_id diff --git a/application/models/reports/Summary_payments.php b/application/models/reports/Summary_payments.php index b2eda838b..8866d0e45 100644 --- a/application/models/reports/Summary_payments.php +++ b/application/models/reports/Summary_payments.php @@ -121,9 +121,9 @@ class Summary_payments extends Summary_report { $decimals = totals_decimals(); - $trans_amount = 'ROUND(SUM(CASE WHEN sales_items.discount_type = ' . PERCENT - . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ' - . 'ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END), ' . $decimals . ') AS trans_amount'; + $trans_amount = 'SUM(CASE WHEN sales_items.discount_type = ' . PERCENT + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) " + . ' ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END) AS trans_amount'; $this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sumpay_taxes_temp') . ' (INDEX(sale_id)) ENGINE=MEMORY diff --git a/application/models/reports/Summary_report.php b/application/models/reports/Summary_report.php index cf2643acb..81ad59522 100644 --- a/application/models/reports/Summary_report.php +++ b/application/models/reports/Summary_report.php @@ -28,17 +28,21 @@ abstract class Summary_report extends Report . 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END'; $sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)'; - $tax = 'IFNULL(SUM(sales_items_taxes.tax), 0)'; + $sales_tax = "IFNULL(SUM(sales_items_taxes.tax), 0)"; + + $cash_adjustment = 'IFNULL(SUM(payments.sale_cash_adjustment), 0)'; + if($this->config->item('tax_included')) { - $sale_total = 'ROUND(SUM(' . $sale_price . '), ' . $decimals . ')'; - $sale_subtotal = $sale_total . ' - ' . $tax; + $sale_total = "ROUND(SUM($sale_price), $decimals) + $cash_adjustment"; + $sale_subtotal = "$sale_total - $sales_tax"; + } else { - $sale_subtotal = 'ROUND(SUM(' . $sale_price . '), ' . $decimals . ')'; - $sale_total = $sale_subtotal . ' + ' . $tax; + $sale_subtotal = "ROUND(SUM($sale_price), $decimals) + $cash_adjustment"; + $sale_total = "ROUND(SUM($sale_price), $decimals) + $sales_tax + $cash_adjustment"; } // create a temporary table to contain all the sum of taxes per sale item @@ -48,7 +52,7 @@ abstract class Summary_report extends Report SELECT sales_items_taxes.sale_id AS sale_id, sales_items_taxes.item_id AS item_id, sales_items_taxes.line AS line, - SUM(sales_items_taxes.item_tax_amount) AS tax + SUM(ROUND(sales_items_taxes.item_tax_amount,' . $decimals . ')) AS tax FROM ' . $this->db->dbprefix('sales_items_taxes') . ' AS sales_items_taxes INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales ON sales.sale_id = sales_items_taxes.sale_id @@ -59,9 +63,26 @@ abstract class Summary_report extends Report )' ); + $this->db->query('CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->dbprefix('sales_payments_temp') . + ' (PRIMARY KEY(sale_id), INDEX(sale_id)) + ( + SELECT payments.sale_id AS sale_id, + SUM(CASE WHEN payments.cash_adjustment = 0 THEN payments.payment_amount ELSE 0 END) AS sale_payment_amount, + SUM(CASE WHEN payments.cash_adjustment = 1 THEN payments.payment_amount ELSE 0 END) AS sale_cash_adjustment, + SUM(payments.cash_refund) AS sale_cash_refund, + GROUP_CONCAT(CONCAT(payments.payment_type, " ", (payments.payment_amount - payments.cash_refund)) SEPARATOR ", ") AS payment_type + FROM ' . $this->db->dbprefix('sales_payments') . ' AS payments + INNER JOIN ' . $this->db->dbprefix('sales') . ' AS sales + ON sales.sale_id = payments.sale_id + WHERE ' . $where . ' + GROUP BY sale_id + )' + ); + + $this->db->select(" IFNULL($sale_subtotal, $sale_total) AS subtotal, - $tax AS tax, + $sales_tax AS tax, IFNULL($sale_total, $sale_subtotal) AS total, $sale_cost AS cost, (IFNULL($sale_subtotal, $sale_total) - $sale_cost) AS profit @@ -75,6 +96,8 @@ abstract class Summary_report extends Report $this->db->join('sales_items_taxes_temp AS sales_items_taxes', 'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line', 'left outer'); + $this->db->join('sales_payments_temp AS payments', 'sales.sale_id = payments.sale_id', 'LEFT OUTER'); + } private function __common_where(array $inputs) diff --git a/application/models/reports/Summary_taxes.php b/application/models/reports/Summary_taxes.php index 9ae838306..8562385e5 100644 --- a/application/models/reports/Summary_taxes.php +++ b/application/models/reports/Summary_taxes.php @@ -40,19 +40,28 @@ class Summary_taxes extends Summary_report { $where .= 'AND sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])); } + $decimals = totals_decimals(); if($this->config->item('tax_included')) { - $sale_total = '(CASE WHEN sales_items.discount_type = ' . PERCENT . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END)'; - $sale_subtotal = '(CASE WHEN sales_items.discount_type = ' . PERCENT . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END * (100 / (100 + sales_items_taxes.percent)))'; + $sale_total = '(CASE WHEN sales_items.discount_type = ' . PERCENT + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals)" + . ' ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END)'; + + $sale_subtotal = '(CASE WHEN sales_items.discount_type = ' . PERCENT + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) " + . 'ELSE sales_items.quantity_purchased * sales_items.item_unit_price - sales_items.discount END * (100 / (100 + sales_items_taxes.percent)))'; } else { - $sale_total = '(CASE WHEN sales_items.discount_type = ' . PERCENT . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END * (1 + (sales_items_taxes.percent / 100)))'; - $sale_subtotal = '(CASE WHEN sales_items.discount_type = ' . PERCENT . ' THEN sales_items.item_unit_price * sales_items.quantity_purchased * (1 - sales_items.discount / 100) ELSE sales_items.item_unit_price * sales_items.quantity_purchased - sales_items.discount END)'; - } + $sale_total = '(CASE WHEN sales_items.discount_type = ' . PERCENT + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals)" + . ' ELSE sales_items.quantity_purchased * sales_items.item_unit_price - sales_items.discount END * (1 + (sales_items_taxes.percent / 100)))'; - $decimals = totals_decimals(); + $sale_subtotal = '(CASE WHEN sales_items.discount_type = ' . PERCENT + . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals)" + . ' ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END)'; + } $query = $this->db->query("SELECT percent, count(*) AS count, ROUND(SUM(subtotal), $decimals) AS subtotal, ROUND(SUM(tax), $decimals) AS tax, ROUND(SUM(total), $decimals) AS total FROM (