PT-2291: Temp order ID visible in the order confirmation email (#27)

Author: ivan-pugach-mondu

Controller/OrderController.php

@@ -5,6 +5,9 @@
 use OxidEsales\Eshop\Application\Model\Basket;
 use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Application\Model\User;
+use OxidEsales\Eshop\Core\DatabaseProvider;
+use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
+use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
 use OxidEsales\Eshop\Core\Exception\StandardException;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Core\Request;
@@ -39,7 +42,7 @@ public function isMonduPayment()
 
     public function getPaymentPageUrl()
     {
-        $shopUrl = \OxidEsales\Eshop\Core\Registry::getConfig()->getShopSecureHomeURL();
+        $shopUrl = Registry::getConfig()->getShopSecureHomeURL();
         return $shopUrl . '&cl=payment&payerror=2';
     }
 
@@ -56,23 +59,13 @@ public function execute()
             }
 
             $oBasket = $this->getBasket();
-            $data = [];
-            if ($oBasket->getOrderId()) {
-                $data['external_reference_id'] = $oBasket->getOrderId();
-            }
-            $response = $this->_client->confirmOrder($orderUuid, $data);
-            $this->_logger->debug('MonduOrderController [execute $response]: ' . print_r($response, true));
-
-            if (isset($response['state']) && ($response['state'] == 'confirmed' || $response['state'] == 'pending')) {
-                $isPending = $response['state'] == 'pending';
 
-                try {
-                    $iSuccess = $this->monduExecute($oBasket, $isPending);
+            try {
+                $iSuccess = $this->monduExecute($oBasket, $orderUuid);
 
-                    return $this->getNextStep($iSuccess);
-                } catch (Exception $e) {
-                    throw new \Exception('Mondu: Error during the order process');
-                }
+                return $this->_getNextStep($iSuccess);
+            } catch (Exception $e) {
+                throw new \Exception('Mondu: Error during the order process');
             }
         }
 
@@ -88,10 +81,12 @@ public function execute()
      * Save order to database, delete order_id from session and redirect to thank you page
      *
      * @param Basket $oBasket
-     * @param bool   $isPending
-     * @return bool|int|mixed
+     * @param        $orderUuid
+     * @return string
+     * @throws DatabaseConnectionException
+     * @throws DatabaseErrorException
      */
-    protected function monduExecute(Basket $oBasket, bool $isPending)
+    protected function monduExecute(Basket $oBasket, $orderUuid)
     {
         if (!Registry::getSession()->getVariable('sess_challenge')) {
             Registry::getSession()->setVariable('sess_challenge', Registry::getUtilsObject()->generateUID());
@@ -102,7 +97,7 @@ protected function monduExecute(Basket $oBasket, bool $isPending)
         $oOrder = oxNew(Order::class);
 
         try {
-            $iSuccess = $oOrder->finalizeOrder($oBasket, $oBasket->getUser(), false, $isPending);
+            $iSuccess = $oOrder->finalizeOrder($oBasket, $oBasket->getUser(), false);
         } catch (StandardException $e) {
             Registry::get(UtilsView::class)->addErrorToDisplay($e);
         }
@@ -112,6 +107,51 @@ protected function monduExecute(Basket $oBasket, bool $isPending)
             $this->_oUser->onOrderExecute($oBasket, $iSuccess);
         }
 
+        $this->confirmOrder($oBasket, $orderUuid);
+
         return $iSuccess;
     }
+
+    /**
+     * @param $oBasket
+     * @param $orderUuid
+     * @return void
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseErrorException
+     */
+    protected function confirmOrder($oBasket, $orderUuid)
+    {
+        if (!$oBasket->getOrderId()) {
+            return;
+        }
+
+        $data = [];
+        $order = oxNew(Order::class);
+        $order->load($oBasket->getOrderId());
+        $data['external_reference_id'] = $order->getFieldData('oxorder__oxordernr');
+
+        $response = $this->_client->confirmOrder($orderUuid, $data);
+        $this->_logger->debug('MonduOrderController [execute $response]: ' . print_r($response, true));
+
+        if (isset($response['state']) && ($response['state'] == 'confirmed' || $response['state'] == 'pending')) {
+            $isPending = $response['state'] == 'pending';
+
+            if ($isPending) {
+                $sQuery = "
+                    UPDATE 
+                        oxorder
+                    SET 
+                        oxfolder = 'ORDERFOLDER_PROBLEMS', 
+                        oxtransstatus = 'PENDING'
+                    WHERE 
+                        OXORDERNR = '{$order->getFieldData('oxorder__oxordernr')}'
+                ";
+                DatabaseProvider::getDb()->execute($sQuery);
+            }
+
+            $this->_logger->debug(
+                'MonduOrderController [execute $response]: ' . print_r($response, true)
+            );
+        }
+    }
 }

composer.json

@@ -2,7 +2,7 @@
     "name": "mondu/bnpl-checkout-oxid",
     "description": "Mondu payment method for the OXID eShop.",
     "type": "oxideshop-module",
-    "version": "1.1.7",
+    "version": "1.1.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

metadata.php

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