Merged develop into master

mediaopt · Sep 15, 2022 · ae5421e · ae5421e
2 parents f397387 + bc990a1
commit ae5421e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,7 @@
 # Changelog
+## 1.6.5
+* bugfix for selecting a Paketshop in the Filialfinder
+
 
 ## 1.6.4
 * new Service PDDP (Postal Delivery Duty Paid) for Paket International

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.4",
+    "version": "1.6.5",
     "compatibility": {
         "minimumVersion": "6.0",
         "maximumVersion": null,

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.4',
+    'version'     => '1.6.5',
     '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/mo_dhl.js b/src/modules/mo/mo_dhl/out/src/js/mo_dhl.js
@@ -98,6 +98,10 @@ Empfaengerservices = function ($, tailorer) {
         return type !== 'Packstation' ? 'Postfiliale' : type;
     };
 
+    this.fromProviderTypeToLabel = function (type) {
+        return type !== 'Packstation' ? 'Filiale' : type;
+    };
+
     this.getState = function () {
         return this.tailorer.isShippedToSeparateAddress() ? this.state : 'regular';
     };

diff --git a/src/modules/mo/mo_dhl/out/src/js/widgets/azure/mo_dhl.js b/src/modules/mo/mo_dhl/out/src/js/widgets/azure/mo_dhl.js
@@ -352,7 +352,7 @@
             return provider.number;
         },
         apply: function (provider) {
-            $('#select' + provider.type).prop('selected', true);
+            $('#select' + this.dhl.fromProviderTypeToLabel(provider.type)).prop('selected', true);
             $("#showShipAddress").attr('checked', false);
             var providerIdentifier = this.dhl.fromProviderTypeToIdentifier(provider.type);
             $("[name='deladr[oxaddress__oxstreet]']").val(providerIdentifier).parent().removeClass('oxInValid');

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
@@ -375,7 +375,7 @@
             return provider.number;
         },
         apply: function (provider) {
-            $('#select' + provider.type).prop('selected', true);
+            $('#select' + this.dhl.fromProviderTypeToLabel(provider.type)).prop('selected', true);
             $("#showShipAddress").prop('checked', false).change();
             $(".dd-add-delivery-address").find('label.btn').click();
             var providerIdentifier = this.dhl.fromProviderTypeToIdentifier(provider.type);

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
@@ -375,7 +375,7 @@
             return provider.number;
         },
         apply: function (provider) {
-            $('#select' + provider.type).prop('selected', true);
+            $('#select' + this.dhl.fromProviderTypeToLabel(provider.type)).prop('selected', true);
             $("#showShipAddress").prop('checked', false).change();
             $(".dd-add-delivery-address").find('label.btn').click();
             var providerIdentifier = this.dhl.fromProviderTypeToIdentifier(provider.type);