From c6c5fcac260a2965b0ca72106715e7b61728c189 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Wed, 5 Feb 2025 22:01:31 +0100
Subject: [PATCH] Fix sales tax summary with time filter (#4166)

---
 app/Models/Reports/Summary_sales_taxes.php |  2 +-
 app/Views/configs/system_info.php          | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/Models/Reports/Summary_sales_taxes.php b/app/Models/Reports/Summary_sales_taxes.php
index 48b50f267..f774838c6 100644
--- a/app/Models/Reports/Summary_sales_taxes.php
+++ b/app/Models/Reports/Summary_sales_taxes.php
@@ -61,7 +61,7 @@ class Summary_sales_taxes extends Summary_report
 		}
 		else
 		{
-			$builder->where('sale_time BETWEEN ' . rawurldecode($inputs['start_date']) . ' AND ' . rawurldecode($inputs['end_date']));
+			$builder->where('sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
 		}
 
 		$builder->select('reporting_authority, jurisdiction_name, tax_category, tax_rate, SUM(sale_tax_amount) AS tax');
diff --git a/app/Views/configs/system_info.php b/app/Views/configs/system_info.php
index 82bf22ccb..2bb168d63 100644
--- a/app/Views/configs/system_info.php
+++ b/app/Views/configs/system_info.php
@@ -77,13 +77,11 @@ use Config\OSPOS;
                         }
                         echo esc(getBrowserNameAndVersion($_SERVER['HTTP_USER_AGENT']));
                     ?><br>
-                .Server Software: <?= esc($_SERVER['SERVER_SOFTWARE']) ?><br>
-                .PHP Version: <?= PHP_VERSION ?><br>
-                .DB Version: <?= esc($dbVersion) ?><br>
-                .Server Port: <?= esc($_SERVER['SERVER_PORT']) ?><br>
-                .OS: <?= php_uname('s') .' '. php_uname('r') ?><br><br>
-                .OS Time Zone: <span id="timezone" style="font-weight:600"></span><br>
-                .OSPOS Time Zone: <span id="ostimezone" style="font-weight:600;" ><?= esc($config['timezone']) ?></span>
+                Server Software: <?= esc($_SERVER['SERVER_SOFTWARE']) ?><br>
+                PHP Version: <?= PHP_VERSION ?><br>
+                DB Version: <?= esc($dbVersion) ?><br>
+                Server Port: <?= esc($_SERVER['SERVER_PORT']) ?><br>
+                OS: <?= php_uname('s') .' '. php_uname('r') ?><br><br>
                 <br><br>
 
                 File Permissions:<br>
@@ -229,13 +227,14 @@ use Config\OSPOS;
                 document.getSelection().removeAllRanges();
             });
 
-            document.getElementById("timezone").innerText = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
             $(function() {
                 $('#timezone').clone().appendTo('#timezoneE');
             });
 
-            if($('#timezone').html() !== $('#ostimezone').html())
-            document.getElementById("TimeError").innerHTML = '<span style="color: red;"><?= lang('Config.timezone_error') ?></span><br><br><?= lang('Config.user_timezone') ?><div id="timezoneE" style="font-weight:600;"></div><br><?= lang('Config.os_timezone') ?><div id="ostimezoneE" style="font-weight:600;"><?= esc($config['timezone']) ?></div><br>';
+            if($('#timezone').html() !== $('#ostimezone').html()) {
+				document.getElementById("timezone").innerText = Intl.DateTimeFormat().resolvedOptions().timeZone;
+				document.getElementById("TimeError").innerHTML = '<span style="color: red;"><?= lang('Config.timezone_error') ?></span><br><br><?= lang('Config.user_timezone') ?><div id="timezoneE" style="font-weight:600;"></div><br><?= lang('Config.os_timezone') ?><div id="ostimezoneE" style="font-weight:600;"><?= esc($config['timezone']) ?></div><br>';
+			}
+
         </script>
 </div>