diff --git a/app/Models/Reports/Summary_taxes.php b/app/Models/Reports/Summary_taxes.php
index 078738e18..bbfe31060 100644
--- a/app/Models/Reports/Summary_taxes.php
+++ b/app/Models/Reports/Summary_taxes.php
@@ -14,10 +14,7 @@ class Summary_taxes extends Summary_report
         $this->config = config(OSPOS::class)->settings;
     }
 
-    /**
-     * @return array[]
-     */
-    protected function _get_data_columns(): array    // TODO: hungarian notation
+    protected function _get_data_columns(): array
     {
         return [
             ['tax_name'     => lang('Reports.tax_name'), 'sortable' => false],
@@ -29,12 +26,7 @@ class Summary_taxes extends Summary_report
         ];
     }
 
-    /**
-     * @param array $inputs
-     * @param $builder
-     * @return void
-     */
-    protected function _where(array $inputs, &$builder): void    // TODO: hungarian notation
+    protected function _where(array $inputs, &$builder): void
     {
         $builder->where('sales.sale_status', COMPLETED);
 
@@ -45,51 +37,90 @@ class Summary_taxes extends Summary_report
         }
     }
 
-    /**
-     * @param array $inputs
-     * @return array
-     */
     public function getData(array $inputs): array
     {
         $decimals = totals_decimals();
         $db_prefix = $this->db->getPrefix();
 
+        $sale_amount = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
+            . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals)"
+            . ' ELSE ' . $db_prefix . 'sales_items.quantity_purchased * (' . $db_prefix . "sales_items.item_unit_price - " . $db_prefix . "sales_items.discount) END)";
+
+        $sale_tax = "IFNULL(" . $db_prefix . "sales_items_taxes.item_tax_amount, 0)";
+
         if ($this->config['tax_included']) {
-            $sale_total = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
-                . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals)"
-                . ' ELSE ' . $db_prefix . 'sales_items.quantity_purchased * (' . $db_prefix . 'sales_items.item_unit_price - ' . $db_prefix . 'sales_items.discount) END)';
-
-            $sale_subtotal = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
-                . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals) "
-                . 'ELSE ' . $db_prefix . 'sales_items.quantity_purchased * ' . $db_prefix . 'sales_items.item_unit_price - ' . $db_prefix . 'sales_items.discount END * (100 / (100 + ' . $db_prefix . 'sales_items_taxes.percent)))';
+            $sale_subtotal = "ROUND($sale_amount - $sale_tax, $decimals)";
+            $sale_total = "ROUND($sale_amount, $decimals)";
         } else {
-            $sale_total = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
-                . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals)"
-                . ' ELSE ' . $db_prefix . 'sales_items.quantity_purchased * ' . $db_prefix . 'sales_items.item_unit_price - ' . $db_prefix . 'sales_items.discount END * (1 + (' . $db_prefix . 'sales_items_taxes.percent / 100)))';
-
-            $sale_subtotal = '(CASE WHEN ' . $db_prefix . 'sales_items.discount_type = ' . PERCENT
-                . " THEN " . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price - ROUND(" . $db_prefix . "sales_items.quantity_purchased * " . $db_prefix . "sales_items.item_unit_price * " . $db_prefix . "sales_items.discount / 100, $decimals)"
-                . ' ELSE ' . $db_prefix . 'sales_items.quantity_purchased * (' . $db_prefix . 'sales_items.item_unit_price - ' . $db_prefix . 'sales_items.discount) END)';
+            $sale_subtotal = "ROUND($sale_amount, $decimals)";
+            $sale_total = "ROUND($sale_amount + $sale_tax, $decimals)";
         }
 
         $subquery_builder = $this->db->table('sales_items');
-        $subquery_builder->select("name AS name, CONCAT(IFNULL(ROUND(percent, $decimals), 0), '%') AS percent, sales.sale_id AS sale_id, $sale_subtotal AS subtotal, IFNULL($db_prefix" . "sales_items_taxes.item_tax_amount, 0) AS tax, IFNULL($sale_total, $sale_subtotal) AS total");
+        $subquery_builder->select(
+            "name AS name, "
+            . "CONCAT(IFNULL(ROUND(percent, $decimals), 0), '%') AS percent, "
+            . "sales.sale_id AS sale_id, "
+            . "$sale_subtotal AS subtotal, "
+            . "ROUND($sale_tax, $decimals) AS tax, "
+            . "$sale_total AS total"
+        );
 
         $subquery_builder->join('sales', 'sales_items.sale_id = sales.sale_id', 'inner');
-        $subquery_builder->join('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');
+        $subquery_builder->join(
+            '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'
+        );
 
         $subquery_builder->where('sale_status', COMPLETED);
 
         if (empty($this->config['date_or_time_format'])) {
-            $subquery_builder->where('DATE(' . $db_prefix . 'sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+            $subquery_builder->where(
+                'DATE(' . $db_prefix . 'sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date'])
+                . ' AND ' . $this->db->escape($inputs['end_date'])
+            );
         } else {
-            $subquery_builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+            $subquery_builder->where(
+                'sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date']))
+                . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date']))
+            );
         }
 
         $builder = $this->db->newQuery()->fromSubquery($subquery_builder, 'temp_taxes');
-        $builder->select("name, percent, COUNT(DISTINCT sale_id) AS count, ROUND(SUM(subtotal), $decimals) AS subtotal, ROUND(SUM(tax), $decimals) AS tax, ROUND(SUM(total), $decimals) total");
+        $builder->select(
+            "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"
+        );
         $builder->groupBy('percent, name');
 
         return $builder->get()->getResultArray();
     }
-}
+
+    public function getSummaryData(array $inputs): array
+    {
+        $decimals = totals_decimals();
+        $data = $this->getData($inputs);
+
+        $subtotal = 0;
+        $tax = 0;
+        $total = 0;
+        $count = 0;
+
+        foreach ($data as $row) {
+            $subtotal += (float) $row['subtotal'];
+            $tax += (float) $row['tax'];
+            $total += (float) $row['total'];
+            $count += (int) $row['count'];
+        }
+
+        return [
+            'subtotal' => round($subtotal, $decimals),
+            'tax'      => round($tax, $decimals),
+            'total'    => round($total, $decimals),
+            'count'    => $count
+        ];
+    }
+}
\ No newline at end of file