Merged develop into master

Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.3
+* bugfix: don't apply the billing country to an existing delivery address
+* add order numbers to Soap fault log messages in GKV calls
+
 ## 1.6.2
 * filter out results not suitable to receive packages
 

project.json

@@ -4,7 +4,7 @@
     "pathToModule": "copy_this/modules/mo/mo_dhl",
     "prefix": "mo_",
     "suffix": "",
-    "version": "1.6.2",
+    "version": "1.6.3",
     "compatibility": {
         "minimumVersion": "6.0",
         "maximumVersion": null,

src/modules/mo/mo_dhl/Api/GKV.php

@@ -20,6 +20,7 @@
 use Mediaopt\DHL\Api\GKV\Response\GetVersionResponse;
 use Mediaopt\DHL\Api\GKV\Response\UpdateShipmentOrderResponse;
 use Mediaopt\DHL\Api\GKV\Response\ValidateShipmentResponse;
+use Mediaopt\DHL\Api\GKV\Shipment;
 use Mediaopt\DHL\Api\GKV\Version;
 use Mediaopt\DHL\Exception\WebserviceException;
 use Psr\Log\LoggerInterface;
@@ -167,6 +168,7 @@ protected function callSoap($functionName, $request)
             return $this->__soapCall($functionName, [$request], null, $header);
         } catch (\SoapFault $exception) {
             $message = __METHOD__ . " - The SOAP API call for function  $functionName failed due to {$exception->getMessage()}";
+            $message = $this->appendOrderNr($request, $message);
             $this->getLogger()->error($message, ['exception' => $exception]);
             throw new WebserviceException('Failed API call.', 0, $exception);
         }
@@ -280,4 +282,27 @@ public function buildVersion(): Version
     {
         return new Version(3, 0);
     }
+
+    /**
+     * @param $request
+     * @param $message
+     * @return mixed|string
+     */
+    protected function appendOrderNr($request, $message)
+    {
+        if (!method_exists($request, 'getShipmentOrder')) {
+            return $message;
+        }
+        $shipmentOrders = $request->getShipmentOrder();
+        $shipmentOrderNumbers = [];
+        foreach (is_array($shipmentOrders) ? $shipmentOrders : [$shipmentOrders] as $shipmentOrder) {
+            if (method_exists($shipmentOrder, 'getShipment') && $shipmentOrder->getShipment() instanceof Shipment) {
+                $shipmentOrderNumbers[] = $shipmentOrder->getShipment()->getShipmentDetails()->getCustomerReference();
+            }
+        }
+        if ($shipmentOrderNumbers) {
+            $message .= ' for orderNumbers: ' . implode(', ', $shipmentOrderNumbers);
+        }
+        return $message;
+    }
 }

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.2',
+    'version'     => '1.6.3',
     'author'      => '<a href="http://www.mediaopt.de" target="_blank">mediaopt.</a>',
     'url'         => 'http://www.mediaopt.de',
     'email'       => '[email protected]',

src/modules/mo/mo_dhl/out/src/js/widgets/azure/mo_dhl.js

@@ -362,6 +362,9 @@
             $("[name='deladr[oxaddress__oxcountryid]']").val($("#germany-oxid").text());
         },
         setDeliveryCountryToBillingCountry: function () {
+            if ($('#delCountrySelect').val()) {
+                return;
+            }
             $('#delCountrySelect').val($("#invCountrySelect").val());
         }
     };

src/modules/mo/mo_dhl/out/src/js/widgets/flow/mo_dhl.js

@@ -386,6 +386,9 @@
             $("[name='deladr[oxaddress__oxcountryid]']").val($("#germany-oxid").text());
         },
         setDeliveryCountryToBillingCountry: function () {
+            if ($('#delCountrySelect').val()) {
+                return;
+            }
             var invCountry = $("#invCountrySelect").val();
 
             var label = $('#invCountrySelect').children('[value="' + invCountry + '"]').text();

src/modules/mo/mo_dhl/out/src/js/widgets/wave/mo_dhl.js

@@ -386,6 +386,10 @@
             $("[name='deladr[oxaddress__oxcountryid]']").val($("#germany-oxid").text());
         },
         setDeliveryCountryToBillingCountry: function () {
+            if ($('#delCountrySelect').val()) {
+                return;
+            }
+
             var invCountry = $("#invCountrySelect").val();
 
             var label = $('#invCountrySelect').children('[value="' + invCountry + '"]').text();