PT-3033: Fix error with different delivery address (#3)

Author: ivan-pugach-mondu

Core/Mappers/MonduOrderMapper.php

@@ -60,6 +60,13 @@ public function getMappedOrderData($paymentMethod)
         $shipping = $basket->getDeliveryCost()->getPrice();
         $shopUrl = Registry::getConfig()->getCurrentShopUrl();
 
+        $oDelAdressMD5 = $this->getBasketUser()->getEncodedDeliveryAddress();
+        if (Registry::getSession()->getVariable('deladrid')) {
+            $oDelAdress = oxNew(\OxidEsales\Eshop\Application\Model\Address::class);
+            $oDelAdress->load(Registry::getSession()->getVariable('deladrid'));
+            $oDelAdressMD5 .= $oDelAdress->getEncodedDeliveryAddress();
+        }
+
         $externalReferenceId = uniqid('M_OX_');
         $data = [
             "currency" => $basket->getBasketCurrency()->name,
@@ -69,7 +76,7 @@ public function getMappedOrderData($paymentMethod)
             "buyer" => MonduHelper::removeEmptyElementsFromArray($this->getBuyerData()),
             "billing_address" => MonduHelper::removeEmptyElementsFromArray($this->getUserBillingAddress()),
             "shipping_address" => MonduHelper::removeEmptyElementsFromArray($this->getUserDeliveryAddress()),
-            "success_url" => $shopUrl . '?cl=order&fnc=execute&order_uuid=' . $monduOrderUuid . '&sDeliveryAddressMD5=' . $this->getBasketUser()->getEncodedDeliveryAddress(),
+            "success_url" => $shopUrl . '?cl=order&fnc=execute&order_uuid=' . $monduOrderUuid . '&sDeliveryAddressMD5=' . $oDelAdressMD5,
             "cancel_url" => $shopUrl . '?cl=oemonducancel',
             "declined_url" => $shopUrl . '?cl=oemondudeclined',
             "state_flow" => 'authorization_flow',

composer.json

@@ -2,7 +2,7 @@
     "name": "https://github.com/mondu-ai/bnpl-checkout-oxid7",
     "description": "Mondu payment method for the OXID eShop.",
     "type": "oxideshop-module",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

metadata.php

@@ -10,7 +10,7 @@
         'en' => 'Module for Mondu payment.',
     ),
     'thumbnail'    => 'images/logo.png',
-    'version'      => '1.0.0',
+    'version'      => '1.0.1',
     'author'       => 'Mondu GmbH',
     'url'          => 'https://www.mondu.ai',
     'email'        => '[email protected]',