Include changes from 2.1.2 release (#3)

Author: tikohov20

Components/MonduApi/Service/MonduClient.php

@@ -54,8 +54,14 @@ public function createOrder($order, $returnUrl, $cancelUrl, $declineUrl, $paymen
      * @return array|null
      * @throws RequestException
      */
-    public function confirmMonduOrder($orderUid): ?array {
-        $response = $this->sendRequest('post', 'orders/'. $orderUid . '/confirm', null, 'CONFIRM_ORDER');
+    public function confirmMonduOrder($orderUid, $orderNumber = null): ?array {
+        $body = null;
+        if ($orderNumber) {
+            $body = [
+                'external_reference_id' => $orderNumber
+            ];
+        }
+        $response = $this->sendRequest('post', 'orders/'. $orderUid . '/confirm', json_encode($body), 'CONFIRM_ORDER');
         return $response['order'] ?? null;
     }
 

Controllers/Frontend/Mondu.php

@@ -111,7 +111,8 @@ public function returnAction()
         }
 
         $orderUid = $this->request->get('order_uuid');
-        $monduOrder = $this->monduClient->confirmMonduOrder($orderUid);
+        $orderNumber = $this->saveOrder($orderUid, $orderUid, Status::PAYMENT_STATE_OPEN);
+        $monduOrder = $this->monduClient->confirmMonduOrder($orderUid, $orderNumber);
 
         if (!$monduOrder || !$this->isMonduOrderSuccessful($monduOrder['state'])) {
             $this->handleError('Mondu: Unable to confirm the Order');
@@ -120,24 +121,15 @@ public function returnAction()
 
         switch ($monduOrder['state']) {
             case PaymentMethods::MONDU_STATE_CONFIRMED:
-                $orderNumber = $this->saveOrder(
-                    $orderUid,
-                    $orderUid,
-                    self::PAYMENTSTATUSPAID
-                );
+                $this->savePaymentStatus($orderUid, $orderUid, Status::PAYMENT_STATE_COMPLETELY_PAID);
                 break;
             default:
-                $orderNumber = $this->saveOrder(
-                    $orderUid,
-                    $orderUid,
-                    Status::PAYMENT_STATE_REVIEW_NECESSARY
-                );
+                $this->savePaymentStatus($orderUid, $orderUid, Status::PAYMENT_STATE_REVIEW_NECESSARY);
         }
 
-
+        $monduOrder = $this->orderHelper->getMonduOrder($orderUid);
         $repo = $this->getModelManager()->getRepository(Order::class);
         $order = $repo->findOneBy(['number' => $orderNumber]);
-        $monduOrder = $this->orderHelper->updateExternalInfoOrder($order);
 
         $this->updateShopwareOrder($order,
             [

plugin.xml

@@ -5,7 +5,7 @@
     <label lang="en">Mondu Payment</label>
     <label lang="de">Mondu Payment</label>
 
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <copyright>(c) Mondu GmbH</copyright>
     <author>Mondu GmbH</author>
     <link>https://mondu.ai</link>
@@ -15,6 +15,11 @@
     <description lang="en">This module offers you Mondu as a checkout option</description>
     <description lang="de">This module offers you Mondu as a checkout option</description>
 
+    <changelog version="2.1.2">
+        <changes lang="en">Bugfixes and improvements</changes>
+        <changes lang="de">Bugfixes and improvements</changes>
+    </changelog>
+
     <changelog version="2.1.1">
         <changes lang="en">Bugfixes and improvements</changes>
         <changes lang="de">Bugfixes and improvements</changes>