Remove inexistent order canceled webhook

Controller/Webhooks/Index.php

@@ -77,7 +77,7 @@ public function execute()
 
         try {
             $content = $this->getRequest()->getContent();
-            
+
             $headers = $this->getRequest()->getHeaders()->toArray();
             $signature = hash_hmac('sha256', $content, $this->_monduConfig->getWebhookSecret());
             if ($signature !== ($headers['X-Mondu-Signature'] ?? null)) {
@@ -94,7 +94,6 @@ public function execute()
                 case 'order/pending':
                     [$resBody, $resStatus] = $this->handlePending($params);
                     break;
-                case 'order/canceled':
                 case 'order/declined':
                     [$resBody, $resStatus] = $this->handleDeclinedOrCanceled($params);
                     break;
@@ -135,7 +134,8 @@ public function handlePending($params): array
         if (empty($order->getData())) {
             return [['message' => 'Order does not exist', 'error' => 0], 200];
         }
-
+        $order->setStatus(Order::STATE_PAYMENT_REVIEW);
+        $order->save();
         $this->_monduLogger->updateLogMonduData($monduId, $params['order_state']);
 
         return [['message' => 'ok', 'error' => 0], 200];
@@ -163,6 +163,8 @@ public function handleConfirmed($params): array
             return [['message' => 'Order does not exist', 'error' => 0], 200];
         }
 
+        $order->setStatus(Order::STATE_PROCESSING);
+        $order->save();
         $this->_monduLogger->updateLogMonduData($monduId, $params['order_state'], $viban);
 
         return [['message' => 'ok', 'error' => 0], 200];

Model/Ui/ConfigProvider.php

@@ -101,7 +101,7 @@ public function getApiUrl($path = null): string
         return $baseUrl . ($path ? '/'.$path : '');
     }
 
-        /**
+    /**
      * Returns mondu.js url
      *
      * @return string

Observer/Config/Save.php

@@ -31,8 +31,7 @@ class Save implements ObserverInterface
     private $subscriptions = [
         'order/confirmed',
         'order/declined',
-        'order/pending',
-        'order/canceled'
+        'order/pending'
     ];
 
     /**
@@ -94,11 +93,6 @@ public function execute(Observer $observer)
                        ->setTopic('order/declined')
                        ->process();
 
-                    $this->requestFactory
-                       ->create(RequestFactory::WEBHOOKS_REQUEST_METHOD)
-                       ->setTopic('order/canceled')
-                       ->process();
-
                     $this->monduConfig->clearConfigurationCache();
                 } catch (\Exception $e) {
                     throw new LocalizedException(__($e->getMessage()));

Observer/CreateOrder.php

@@ -150,7 +150,7 @@ public function _execute(Observer $observer)
 
             $order->setData('mondu_reference_id', $orderUid);
             $order->addStatusHistoryComment(__('Mondu: order id %1', $orderData['uuid']));
-
+            $order = $this->assignMagentoStatus($order, $orderData['state']);
             $order->save();
             $this->monduFileLogger->info('Saved the order in Magento ', ['orderNumber' => $order->getIncrementId()]);
 
@@ -184,4 +184,19 @@ protected function confirmAuthorizedOrder($orderData, $orderNumber)
         }
         return $orderData;
     }
+
+    /**
+     * AssignMagentoStatus
+     *
+     * @param Order $order
+     * @param string $monduOrderState
+     * @return Order
+     */
+    protected function assignMagentoStatus($order, $monduOrderState)
+    {
+        if ($monduOrderState === 'pending') {
+            $order->setStatus(Order::STATE_PAYMENT_REVIEW);
+        }
+        return $order;
+    }
 }

composer.json

@@ -2,7 +2,7 @@
   "name": "mondu_gmbh/magento2-payment",
   "description": "Mondu payment method for magento 2",
   "type": "magento2-module",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "license": [
     "MIT"
   ],

docker-compose.yml

@@ -7,17 +7,19 @@ services:
     ports:
       - 80:8080
     environment:
+      - BITNAMI_DEBUG=true
       - MAGENTO_HOST=localhost
       - MAGENTO_MODE=developer
       - MAGENTO_DATABASE_HOST=mariadb
       - MAGENTO_DATABASE_PORT_NUMBER=3306
       - MAGENTO_DATABASE_USER=bn_magento
       - MAGENTO_DATABASE_NAME=bitnami_magento
+      - MAGENTO_ELASTICSEARCH_HOST=elasticsearch
+      - MAGENTO_ELASTICSEARCH_PORT_NUMBER=9200
       - MAGENTO_USERNAME=mondu
-      - MAGENTO_PASSWORD=mondu
+      - MAGENTO_PASSWORD=mondu123
+      - [email protected]
       - ALLOW_EMPTY_PASSWORD=yes
-      - ELASTICSEARCH_HOST=elasticsearch
-      - ELASTICSEARCH_PORT_NUMBER=9200
       - PHP_MEMORY_LIMIT=5120M
     volumes:
       - magento_data:/bitnami/magento

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Mondu_Mondu" setup_version="2.2.1">
+    <module name="Mondu_Mondu" setup_version="2.2.2">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>