From 93ac8914a42201f631e484ce6e59e62e02ce485a Mon Sep 17 00:00:00 2001 From: lat9 Date: Wed, 6 Mar 2024 15:43:08 -0500 Subject: [PATCH] #41: Correct VAT Number sorting in Customers :: Customers --- .../includes/classes/observers/Vat4EuAdminObserver.php | 5 ++++- YOUR_ADMIN/includes/init_includes/init_vat4eu_admin.php | 2 +- docs/vat4eu/readme.html | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/YOUR_ADMIN/includes/classes/observers/Vat4EuAdminObserver.php b/YOUR_ADMIN/includes/classes/observers/Vat4EuAdminObserver.php index ad1c717..4767f4d 100644 --- 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 = '' . $heading_text . ''; + 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 index 9ce9f94..275a3a0 100644 --- 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 index 5ab4510..9f0d30d 100644 --- a/docs/vat4eu/readme.html +++ b/docs/vat4eu/readme.html @@ -81,7 +81,7 @@

VAT for EU Countries (VAT4EU) for Zen Cart® 1.5.8a and 2.0.0

-

Version 3.2.0 by lat9 and webchills. Copyright © 2017-2024, Vinos de Frutas Tropicales.

+

Version 3.2.1 by lat9 and webchills. Copyright © 2017-2024, Vinos de Frutas Tropicales.

Current Support Thread on the Zen Cart forums: https://www.zen-cart.com/showthread.php?223003-VAT4EU-Support-Thread

Usage Notes:

@@ -485,6 +485,13 @@

Define Tax Zones

You can view the details of these changes on the plugin's GitHub repository.