Merge pull request #48 from logeecom/5.0

Release 5.2.1

Author: logeecom

IntegrationCore/BusinessLogic/Http/DTO/Orders/Order.php

@@ -119,6 +119,10 @@ class Order extends BaseDto
      * @var string
      */
     protected $redirectUrl;
+    /**
+     * @var string
+     */
+    protected $cancelUrl;
     /**
      * @var string
      */
@@ -179,6 +183,7 @@ public static function fromArray(array $raw)
         $shippingAddress = static::getValue($raw, 'shippingAddress', array());
         $order->shippingAddress = !empty($shippingAddress) ? Address::fromArray($shippingAddress) : null;
         $order->redirectUrl = static::getValue($raw, 'redirectUrl');
+        $order->cancelUrl = static::getValue($raw, 'cancelUrl');
         $order->webhookUrl = static::getValue($raw, 'webhookUrl');
         $order->cardToken = static::getValue($raw, 'cardToken');
         $order->setLines(OrderLine::fromArrayBatch(static::getValue($raw, 'lines', array())));
@@ -254,6 +259,7 @@ public function toArray()
             'orderNumber' => $this->orderNumber,
             'shippingAddress' => $this->shippingAddress ? $this->shippingAddress->toArray() : array(),
             'redirectUrl' => $this->redirectUrl,
+            'cancelUrl' => $this->cancelUrl,
             'webhookUrl' => $this->webhookUrl,
             'payment' => $this->payment ? $this->payment->toArray() : null,
             'lines' => $lines,
@@ -673,6 +679,22 @@ public function setRedirectUrl($redirectUrl)
         $this->redirectUrl = $redirectUrl;
     }
 
+    /**
+     * @return string
+     */
+    public function getCancelUrl()
+    {
+        return $this->cancelUrl;
+    }
+
+    /**
+     * @param string $cancelUrl
+     */
+    public function setCancelUrl($cancelUrl)
+    {
+        $this->cancelUrl = $cancelUrl;
+    }
+
     /**
      * @return string
      */

IntegrationCore/BusinessLogic/Http/OrgToken/ProxyDataProvider.php

@@ -98,6 +98,7 @@ public function transformOrder(Order $order)
             'orderNumber' => $order->getOrderNumber(),
             'billingAddress' => $this->transformAddress($order->getBillingAddress()),
             'redirectUrl' => $order->getRedirectUrl(),
+            'cancelUrl' => $order->getCancelUrl(),
             'webhookUrl' => $order->getWebhookUrl(),
 
             'locale' => $order->getLocale(),

Mapper/MollieDtoMapper.php

@@ -185,6 +185,13 @@ public function getOrderData(PaymentTransaction $paymentTransaction)
                     UrlGeneratorInterface::ABSOLUTE_URL
                 )
             ),
+            'cancelUrl' => $this->ensureDebugWebhookUrl(
+                $this->router->generate(
+                    'oro_payment_callback_error',
+                    ['accessIdentifier' => $paymentTransaction->getAccessIdentifier()],
+                    UrlGeneratorInterface::ABSOLUTE_URL
+                )
+            ),
             'payment' => [
                 'issuer' => $this->getRequestParam('mollie-issuer', $paymentTransaction->getPaymentMethod()),
                 'cardToken' => $cardToken,

README.md

@@ -26,7 +26,17 @@ To finalize the installation you need to enter your organization API token in th
 Read more about the integration configuration on [our Wiki](https://github.com/mollie/orocommerce/wiki).
 
 ## Release notes
- - **5.0.10:**
-   - Added support for OroCommerce 5.0.0.
-   - Added single-click payments.
-   - Added surcharge rules.
+
+**5.2.1:**
+- Added cancel url to fix issue caused by clicking "previous page" on Mollie hosted payment page
+
+**5.2.0:**
+- Update from iDeal 1.0 to iDeal 2.0
+
+**5.1.0:**
+- Added compatibility with OroCommerce 5.1.0
+
+**5.0.10:**
+ - Added support for OroCommerce 5.0.0.
+ - Added single-click payments.
+ - Added surcharge rules.

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "mollie/orocommerce",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "type": "symfony-bundle",
   "description": "Mollie Payment Module for OroCommerce",
   "keywords": [