Merged develop into master

mediaopt · Nov 22, 2022 · fed3bb1 · fed3bb1
2 parents 0dc0c95 + d3f8dfb
commit fed3bb1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,9 @@
 # Changelog
+
+## 1.6.8
+* bugfix: improved PHP 8.1 compatibility
+* fixed country value not being sent in form
+
 ## 1.6.7
 * bugfix: remove PackstationType.php
 * bugfix: prevent null parameter in html_entity_decode

diff --git a/project.json b/project.json
@@ -4,7 +4,7 @@
     "pathToModule": "copy_this/modules/mo/mo_dhl",
     "prefix": "mo_",
     "suffix": "",
-    "version": "1.6.7",
+    "version": "1.6.8",
     "compatibility": {
         "minimumVersion": "6.0",
         "maximumVersion": null,

diff --git a/src/modules/mo/mo_dhl/Install.php b/src/modules/mo/mo_dhl/Install.php
@@ -32,7 +32,7 @@ public static function onActivate()
         static::cleanUp();
     }
 
-    protected function ensureDocumentsFolderExists()
+    protected static function ensureDocumentsFolderExists()
     {
         $path = Registry::get(ViewConfig::class)->getModulePath('mo_dhl', '') . 'documents';
         if (!is_dir($path)) {
@@ -251,7 +251,7 @@ protected static function addColumns()
 
     /**
      */
-    protected function alterColumns()
+    protected static function alterColumns()
     {
         self::alterColumn('oxorder', 'MO_DHL_PARTICIPATION', 'CHAR(5)');
         self::alterColumn('oxdeliveryset', 'MO_DHL_PARTICIPATION', 'CHAR(5)');

diff --git a/src/modules/mo/mo_dhl/metadata.php b/src/modules/mo/mo_dhl/metadata.php
@@ -17,7 +17,7 @@
         'en' => '<p>Enable features providing Post & Paket Delivery to your OXID shop.</p>' . '<p><a href="https://projects.mediaopt.de/projects/mopt-postp-ua/wiki" target="_blank">Handbook</a></p>',
     ],
     'thumbnail'   => 'logo.png',
-    'version'     => '1.6.7',
+    'version'     => '1.6.8',
     'author'      => '<a href="http://www.mediaopt.de" target="_blank">mediaopt.</a>',
     'url'         => 'http://www.mediaopt.de',
     'email'       => '[email protected]',

diff --git a/src/modules/mo/mo_dhl/out/src/js/widgets/flow/mo_dhl.js b/src/modules/mo/mo_dhl/out/src/js/widgets/flow/mo_dhl.js
@@ -116,10 +116,19 @@
         },
         fixCountryToGermany: function () {
             var germany = $("#germany-oxid").text();
-            $("[name='deladr[oxaddress__oxcountryid]']").val(germany).attr('disabled', 'disabled').selectpicker('refresh');
+            var $hiddenInput = $('<input type="hidden" class="mo-hidden-deladr-country" name="deladr[oxaddress__oxcountryid]">');
+            $hiddenInput.val(germany);
+            $("[name='deladr[oxaddress__oxcountryid]']")
+                .val(germany)
+                .attr('disabled', 'disabled')
+                .selectpicker('refresh')
+                .parent()
+                .append($hiddenInput)
+            ;
         },
         loosenFixedCountry: function () {
-            $("[name='deladr[oxaddress__oxcountryid]']").removeAttr("disabled");
+            $("[name='deladr[oxaddress__oxcountryid]']").removeAttr("disabled").selectpicker('refresh');
+            $(".mo-hidden-deladr-country").remove();
         },
         addAddressChangeListener: function () {
             var self = this;

diff --git a/src/modules/mo/mo_dhl/out/src/js/widgets/wave/mo_dhl.js b/src/modules/mo/mo_dhl/out/src/js/widgets/wave/mo_dhl.js
@@ -116,10 +116,18 @@
         },
         fixCountryToGermany: function () {
             var germany = $("#germany-oxid").text();
-            $("[name='deladr[oxaddress__oxcountryid]']").val(germany).attr('disabled', 'disabled');
+            var $hiddenInput = $('<input type="hidden" class="mo-hidden-deladr-country" name="deladr[oxaddress__oxcountryid]">');
+            $hiddenInput.val(germany);
+            $("[name='deladr[oxaddress__oxcountryid]']")
+                .val(germany)
+                .attr('disabled', 'disabled')
+                .parent()
+                .append($hiddenInput)
+            ;
         },
         loosenFixedCountry: function () {
             $("[name='deladr[oxaddress__oxcountryid]']").removeAttr("disabled");
+            $(".mo-hidden-deladr-country").remove();
         },
         addAddressChangeListener: function () {
             var self = this;