#41: Correct VAT Number sorting in Customers :: Customers

lat9 · Mar 6, 2024 · 93ac891 · 93ac891
1 parent 1f10937
commit 93ac891
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/YOUR_ADMIN/includes/classes/observers/Vat4EuAdminObserver.php b/YOUR_ADMIN/includes/classes/observers/Vat4EuAdminObserver.php
@@ -3,7 +3,7 @@
 // Part of the VAT4EU plugin by Cindy Merkin a.k.a. lat9
 // Copyright (c) 2017-2024 Vinos de Frutas Tropicales
 //
-// Last updated: v3.2.0
+// Last updated: v3.2.1
 //
 if (!defined('IS_ADMIN_FLAG') || IS_ADMIN_FLAG !== true) {
     die('Illegal Access');
@@ -173,10 +173,13 @@ public function update(&$class, $eventID, $p1, &$p2, &$p3, &$p4, &$p5) {
                 $heading_text = VAT4EU_CUSTOMERS_HEADING;
                 if (isset($_GET['list_order']) && strpos($_GET['list_order'], 'vatnum') === 0) {
                     $heading_text = '<span class="SortOrderHeader">' . $heading_text . '</span>';
+                    global $disp_order;
                     if ($_GET['list_order'] === 'vatnum-asc') {
                         $asc_class = 'SortOrderHeader';
+                        $disp_order = 'a.entry_vat_number, c.customers_lastname, c.customers_firstname';
                     } else {
                         $desc_class = 'SortOrderHeader';
+                        $disp_order = 'a.entry_vat_number DESC, c.customers_lastname, c.customers_firstname';
                     }
                 }
                 $current_parms = zen_get_all_get_params(['list_order', 'page']);

diff --git a/YOUR_ADMIN/includes/init_includes/init_vat4eu_admin.php b/YOUR_ADMIN/includes/init_includes/init_vat4eu_admin.php
@@ -7,7 +7,7 @@
     die('Illegal Access');
 }
 
-define('VAT4EU_CURRENT_RELEASE', '3.2.0');
+define('VAT4EU_CURRENT_RELEASE', '3.2.1-beta1');
 define('VAT4EU_CURRENT_UPDATE_DATE', '2024-03-06');
 
 define('VAT4EU_CURRENT_VERSION', VAT4EU_CURRENT_RELEASE . ': ' . VAT4EU_CURRENT_UPDATE_DATE);

diff --git a/docs/vat4eu/readme.html b/docs/vat4eu/readme.html
@@ -81,7 +81,7 @@
 
 <body>
   <h1 id="title">VAT for EU Countries (VAT4EU) for Zen Cart&reg; 1.5.8a and 2.0.0</h1>
-  <p>Version 3.2.0 by lat9 and webchills.  Copyright &copy; 2017-2024, <a href="https://vinosdefrutastropicales.com" target="_blank">Vinos de Frutas Tropicales</a>.</p>
+  <p>Version 3.2.1 by lat9 and webchills.  Copyright &copy; 2017-2024, <a href="https://vinosdefrutastropicales.com" target="_blank">Vinos de Frutas Tropicales</a>.</p>
   <p>Current Support Thread on the Zen Cart forums: <a href="https://www.zen-cart.com/showthread.php?223003-VAT4EU-Support-Thread" target="_blank">https://www.zen-cart.com/showthread.php?223003-VAT4EU-Support-Thread</a></p>
 
   <p><strong>Usage Notes:</strong></p>
@@ -485,6 +485,13 @@ <h4>Define Tax Zones</h4>
         <noscript><h3>Version History</h3></noscript>
         <p>You can view the details of these changes on the plugin's <a href="https://github.com/lat9/vat4eu/issues" target="_blank">GitHub repository.</a></p>
         <ul>
+          <li>v3.2.1-beta1, 2024-03-06 (lat9, webchills):<ul>
+            <li>BUGFIX: Clicking on the link to sort by VAT Number in the admin customers' listing doesn't perform the sort.</li>
+            <li>The following files were changed:<ol>
+                <li>/YOUR_ADMIN/includes/classes/observers/Vat4EuAdminObserver.php</li>
+                <li>/YOUR_ADMIN/includes/init_includes/init_vat4eu_admin.php</li>
+            </ol></li>
+          </ul></li>
           <li>v3.2.0, 2024-03-06 (lat9, webchills):<ul>
             <li>BUGFIX: Correct text hidden on VAT4EU help-text pop-up.</li>
             <li>BUGFIX: Correct PHP Warning (PHP 8.0) on initial installation.</li>