Version 4.7.1

zencartpro · May 22, 2024 · b144a97 · b144a97
1 parent fac58ff
commit b144a97
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 24 deletions.
diff --git a/NEUE DATEIEN/DEINADMIN/includes/classes/editOrders.php b/NEUE DATEIEN/DEINADMIN/includes/classes/editOrders.php
@@ -7,7 +7,7 @@
  * Zen Cart German Version - www.zen-cart-pro.at
  * @copyright Portions Copyright 2003 osCommerce
  * @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
- * @version $Id: editOrders.php 2024-03-13 20:04:16Z webchills $
+ * @version $Id: editOrders.php 2024-05-22 15:50:16Z webchills $
  */  
 
 zen_define_default('EO_DEBUG_TAXES_ONLY', 'false');  //-Either 'true' or 'false'
@@ -116,6 +116,10 @@ public function getZoneId(int $country_id, string $zone_name): int
         );
         return ($zone_id_query->EOF) ? 0 : (int)$zone_id_query->fields['zone_id'];
     }
+
+
+
+
 
     public function getCountryId(string $country_name): int
     {

diff --git a/NEUE DATEIEN/DEINADMIN/includes/classes/observers/EditOrdersAdminObserver.php b/NEUE DATEIEN/DEINADMIN/includes/classes/observers/EditOrdersAdminObserver.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package Edit Orders for Zen Cart German 
+ * @package Edit Orders for Zen Cart 1.5.7h German
  * Edit Orders plugin by Cindy Merkin a.k.a. lat9 (cindy@vinosdefrutastropicales.com)
  * Copyright (c) 2017-2024 Vinos de Frutas Tropicales
  * @copyright Copyright 2003-2024 Zen Cart Development Team
  * Zen Cart German Version - www.zen-cart-pro.at
  * @copyright Portions Copyright 2003 osCommerce
  * @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
- * @version $Id: EditOrdersAdminObserver.php 2024-03-13 20:21:16Z webchills $
+ * @version $Id: EditOrdersAdminObserver.php 2024-05-22 16:28:16Z webchills $
  */
 
 if (!defined('IS_ADMIN_FLAG') || IS_ADMIN_FLAG !== true) {
@@ -252,7 +252,7 @@ public function update(&$class, $eventID, $p1, &$p2, &$p3, &$p4, &$p5)
 
     protected function addEditOrderButton($orders_id)
     {
-        return $this->createEditOrdersLink($orders_id, 'button', IMAGE_EDIT);
+        return $this->createEditOrdersLink($orders_id, 'button', EO_IMAGE_EDIT);
     }
 
     protected function createEditOrdersLink($orders_id, $link_button, $link_text)

diff --git a/NEUE DATEIEN/DEINADMIN/includes/init_includes/init_eo_config.php b/NEUE DATEIEN/DEINADMIN/includes/init_includes/init_eo_config.php
@@ -8,7 +8,7 @@
  * Zen Cart German Version - www.zen-cart-pro.at
  * @copyright Portions Copyright 2003 osCommerce
  * @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
- * @version $Id: init_eo_config.php 2024-03-13 21:21:16Z webchills $
+ * @version $Id: init_eo_config.php 2024-05-22 18:40:16Z webchills $
  */  
 
 if (!defined('IS_ADMIN_FLAG')) {
@@ -284,7 +284,7 @@
                 "INSERT IGNORE INTO " . TABLE_CONFIGURATION . " 
                     (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added, use_function, set_function) 
                  VALUES 
-                    ('Show Edit-Order Icon on Orders\' Listing?', 'EO_SHOW_EDIT_ORDER_ICON', 'Yes', 'Should the edit-icon be shown for each order on the orders\' listing?  Default: <b>Yes</b>', $cgi, 50, now(), NULL, 'zen_cfg_select_option([\'Yes\', \'No\'],'),
+                    ('Show Edit-Order Icon on Orders\' Listing?', 'EO_SHOW_EDIT_ORDER_ICON', 'No', 'Should the edit-icon be shown for each order on the orders\' listing?  Default: <b>No</b>', $cgi, 50, now(), NULL, 'zen_cfg_select_option([\'Yes\', \'No\'],'),
 
                     ('Edit Button Location on Sidebox', 'EO_SHOW_EDIT_ORDER_BUTTON', 'Both', 'At which position(s) should the <em>Edit</em> button be displayed on the currently-selected order\'s sidebox display, relative to the order\'s information?  Default: <b>Both</b>', $cgi, 50, now(), NULL, 'zen_cfg_select_option([\'Both\', \'Top Only\', \'Bottom Only\', \'Neither\'],')"
             ); 
@@ -293,7 +293,7 @@
             "REPLACE INTO " . TABLE_CONFIGURATION_LANGUAGE . " 
              (configuration_title, configuration_key, configuration_language_id, configuration_description, last_modified, date_added)
              VALUES 
-            ('Edit Orders Icon in der Bestellübersicht', 'EO_SHOW_EDIT_ORDER_ICON', '43', 'Soll das Edit Orders bearbeiten Icon bei jeder Bestellung in der Bestellübersicht angezeigt werden? Voreinstellung: <b>Yes</b>', now(), now())"
+            ('Edit Orders Icon in der Bestellübersicht', 'EO_SHOW_EDIT_ORDER_ICON', '43', 'Soll das Edit Orders bearbeiten Icon bei jeder Bestellung in der Bestellübersicht angezeigt werden? Voreinstellung: <b>No</b>', now(), now())"
         );
 
         $db->Execute (
@@ -302,6 +302,17 @@
              VALUES 
             ('Edit Orders Button in der Sidebox', 'EO_SHOW_EDIT_ORDER_BUTTON', '43', 'An welcher Position soll die Schaltfläche <em>Bearbeiten</em> in der Seitenanzeige der aktuell ausgewählten Bestellung relativ zu den Informationen der Bestellung angezeigt werden?  Voreinstellung: <b>Both</b>', now(), now())"
         );
+
+        // -----
+        // v4.7.1 German:
+        // - set countries_name in table countries to german ones
+        // 
+        // -----
+
+         $db->Execute (        
+        "UPDATE " . TABLE_COUNTRIES . " c  JOIN " . TABLE_COUNTRIES_NAME . " cn ON c.countries_id = cn.countries_id SET c.countries_name = cn.countries_name WHERE cn.language_id = 43;" 
+         );
+
          //-Fall-through for additional checks
         // -----
         // Way-old versions of EO didn't have the EO_DEBUG_ACTION_LEVEL setting set.

diff --git a/.../DEINADMIN/includes/languages/english/extra_definitions/edit_orders_extra_definitions.php b/.../DEINADMIN/includes/languages/english/extra_definitions/edit_orders_extra_definitions.php
@@ -1,11 +1,7 @@
 <?php
-// -----
-// Admin-level extra language definitions for the "Edit Orders" plugin, provided by lat9.
-// Copyright (C) 2017-2024, Vinos de Frutas Tropicales.
-//
 define('BOX_CONFIGURATION_EDIT_ORDERS', 'Edit Orders');
-
-define('EO_ICON_DETAILS', 'Edit this Order');
+define('EO_IMAGE_EDIT', 'Edit with EDIT ORDERS');
+define('EO_ICON_DETAILS', 'Edit with EDIT ORDERS');
 
 define('EO_INIT_VERSION_UPDATED', '<em>Edit Orders</em> was updated from v%1$s to v%2$s.');
 define('EO_INIT_INSTALLED', '<em>Edit Orders</em> v%s was installed.');
diff --git a/NEUE DATEIEN/DEINADMIN/includes/languages/german/extra_definitions/edit_orders.php b/NEUE DATEIEN/DEINADMIN/includes/languages/german/extra_definitions/edit_orders.php
@@ -1,15 +1,9 @@
 <?php
 define('BOX_CONFIGURATION_EDIT_ORDERS', 'Edit Orders');
 define('EO_IMAGE_EDIT', 'mit EDIT ORDERS bearbeiten');
-define('EO_IMAGE_DETAILS', 'mit EDIT ORDERS bearbeiten');
 define('EO_ICON_DETAILS', 'mit EDIT ORDERS bearbeiten');
-define('EO_BUTTON_ICON_DETAILS', 'icon_details.gif');
-define('EO_IMAGE_BUTTON_EDIT', 'button_edit.gif');
-define('EO_IMAGE_BUTTON_DETAILS', 'button_details.gif');
 
-define('EO_ZC156_FA_ICON', '<div class="fa-stack fa-lg edit"><i class="fa fa-circle fa-stack-2x base"></i><i class="fa fa-wrench fa-stack-1x overlay" title="mit EDIT ORDERS bearbeiten"></i></div>');
-define('EO_ZC157_FA_ICON', '<i class="fa fa-wrench overlay" title="mit EDIT ORDERS bearbeiten"></i>');
-define ('EO_INIT_MISSING_FILES', 'Eine Datei (%1$s) die für die <em>Edit Orders</em> Funktionalität erforderlich ist, fehlt.');
-define ('EO_INIT_MISSING_NOTIFIERS', 'Einer oder mehr Notifier (%2$s), die für die <em>Edit Orders</em> Funktionalität erforderlich ist, fehlen in der Datei %1$s.');
+
+
 define('EO_INIT_VERSION_UPDATED', '<em>Edit Orders</em> wurde aktualisiert von v%1$s auf v%2$s.');
 define('EO_INIT_INSTALLED', '<em>Edit Orders</em> v%s wurde installiert.');
diff --git a/liesmich.txt b/liesmich.txt
@@ -1,4 +1,4 @@
-Edit Orders 4.7.1 für Zen Cart 1.5.7g/1.5.7h deutsch
+Edit Orders 4.7.1 für Zen Cart 1.5.7h deutsch
 
 Mit dieser Erweiterung können Bestellungen nachträglich bearbeitet werden.
 z.B.
@@ -9,8 +9,7 @@ Attribute eines bestellten Artikels ändern
 Versandart / Versandkosten einer Bestellung ändern
 Aktionskupons/Gutscheine hinzufügen
 
-Diese Version erfordert mindestens Zen Cart 1.5.7g deutsch!
-
+Diese Version ist nur für Zen Cart 1.5.7h deutsch geeignet!
 
 Dieses Modul keinesfalls direkt in einem Liveshop einbauen!
 Erst in einem Testshop die Änderungsfunktionen testen und dann entscheiden, welche davon überhaupt für den Shop sinnvoll verwendbar sind.