Merge branch 'main' of https://github.com/mondu-ai/bnpl-checkout-oxid into PT-887

Author: ivan-pugach-mondu

Core/Mappers/MonduAdjustmentMapper.php

@@ -14,7 +14,7 @@ public function getMappedOrderData($order)
 
         $data = [
             "currency" => $order->getOrderCurrency()->name,
-            "external_reference_id" => $order->getId(),
+            "external_reference_id" => $order->getFieldData('oxorder__oxordernr') ? (string) $order->getFieldData('oxorder__oxordernr') : $order->getId(),
             "amount" => [
                 "net_price_cents" => round($order->getOrderNetSum() * 100),
                 "tax_cents" => round($tax * 100),

Core/Mappers/MonduInvoiceMapper.php

@@ -11,7 +11,7 @@ public function getMappedInvoiceData($order)
     $invoiceLineItems = $this->getInvoiceLineItems($order);
 
     return MonduHelper::removeEmptyElementsFromArray([
-      'external_reference_id' => $order->getId(),
+      'external_reference_id' => $order->getFieldData('oxorder__oxordernr') ? (string) $order->getFieldData('oxorder__oxordernr') : $order->getId(),
       'invoice_url' => 'http://localhost',
       'gross_amount_cents' => round($order->getFieldData('oxtotalordersum') * 100),
       'line_items' => $invoiceLineItems

Core/OrderShippingProcessor.php

@@ -52,18 +52,20 @@ protected function createMonduInvoice()
         $invoiceDataMapper = oxNew(MonduInvoiceMapper::class);
         $invoiceData = $invoiceDataMapper->getMappedInvoiceData($this->_oOrder);
 
-        $response = $this->client->createInvoice($this->_oMonduOrder->getFieldData('order_uuid'), $invoiceData);
-
-        return $response;
+        return $this->client->createInvoice($this->_oMonduOrder->getFieldData('order_uuid'), $invoiceData);
     }
 
     protected function cancelMonduInvoice()
     {
-        $monduInvoice = array_values($this->_oOrder->getMonduInvoices()->getArray())[0];
+        if ($this->_oOrder->getMonduInvoices()) {
+            $monduInvoice = array_values($this->_oOrder->getMonduInvoices()->getArray())[0];
 
-        if ($monduInvoice) {
-            $response = $this->client->cancelInvoice($this->_oMonduOrder->getFieldData('order_uuid'), $monduInvoice->getFieldData('invoice_uuid'));
-            return $response;
+            if ($monduInvoice) {
+                return $this->client->cancelInvoice(
+                    $this->_oMonduOrder->getFieldData('order_uuid'),
+                    $monduInvoice->getFieldData('invoice_uuid')
+                );
+            }
         }
     }
 

Core/PaymentHandler/MonduInvoiceHandler.php

@@ -25,14 +25,9 @@ public function execute(Order $oOrder): bool
             return false;
         }
 
-        $updatedOrder = $this->_client->updateOrderExternalInfo(
-            $monduOrderUuid,
-            ['external_reference_id' => $oOrder->getId()]
-        );
+        $monduOrder = $this->_client->getMonduOrder($monduOrderUuid);
 
-        $monduOrder = $this->_client->getMonduOrder($updatedOrder['uuid']);
-
-        if (!$updatedOrder || !$monduOrder) {
+        if (!$monduOrder) {
             return false;
         }
 

Model/Order.php

@@ -3,12 +3,25 @@
 namespace OxidEsales\MonduPayment\Model;
 
 use OxidEsales\Eshop\Core\Model\ListModel;
+use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\MonduPayment\Core\Http\MonduClient;
 use OxidEsales\MonduPayment\Core\Utils\MonduHelper;
 use OxidEsales\MonduPayment\Model\MonduOrder;
 use OxidEsales\MonduPayment\Model\MonduInvoice;
 
 class Order extends Order_parent
 {
+    /**
+     * @var mixed|\oxdeliveryset|\oxField|\OxidEsales\Eshop\Core\Field|\OxidEsales\EshopCommunity\Application\Model\oxDeliverySet|MonduClient
+     */
+    private mixed $client;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->client = oxNew(MonduClient::class);
+    }
+
     public function getMonduOrders()
     {
         if ($this->isMonduPayment()) {
@@ -27,11 +40,16 @@ public function getMonduOrders()
     public function getMonduInvoices()
     {
         if ($this->isMonduPayment()) {
-            $sQuery = 'SELECT * FROM `oemondu_invoices` WHERE `invoice_id`=:oxorderid ORDER BY created_at DESC';
+            $sQuery = 'SELECT * FROM `oemondu_invoices` WHERE `invoice_id` IN (:oxorderid, :oxordernr) ORDER BY created_at DESC';
 
             $oMonduInvoices = oxNew(ListModel::class);
             $oMonduInvoices->init(MonduInvoice::class);
-            $oMonduInvoices->selectString($sQuery, [':oxorderid' => $this->getId()]);
+            $oMonduInvoices->selectString(
+                $sQuery, [
+                    ':oxorderid' => $this->getId(),
+                    ':oxordernr' => $this->getFieldData('oxorder__oxordernr')
+                ]
+            );
 
             return $oMonduInvoices;
         }
@@ -54,4 +72,47 @@ public function deleteAllArticles()
 
         $this->recalculateOrder();
     }
+
+    /**
+     * Order checking, processing and saving method.
+     * Before saving performed checking if order is still not executed (checks in
+     * database oxorder table for order with know ID), if yes - returns error code 3,
+     * if not - loads payment data, assigns all info from basket to new Order object
+     * and saves full order with error status. Then executes payment. On failure -
+     * deletes order and returns error code 2. On success - saves order (\OxidEsales\Eshop\Application\Model\Order::save()),
+     * removes article from wishlist (\OxidEsales\Eshop\Application\Model\Order::_updateWishlist()), updates voucher data
+     * (\OxidEsales\Eshop\Application\Model\Order::_markVouchers()). Finally sends order confirmation email to customer
+     * (\OxidEsales\Eshop\Core\Email::SendOrderEMailToUser()) and shop owner (\OxidEsales\Eshop\Core\Email::SendOrderEMailToOwner()).
+     * If this is order recalculation, skipping payment execution, marking vouchers as used
+     * and sending order by email to shop owner and user
+     * Mailing status (1 if OK, 0 on error) is returned.
+     *
+     * @param \OxidEsales\Eshop\Application\Model\Basket $oBasket              Basket object
+     * @param object                                     $oUser                Current User object
+     * @param bool                                       $blRecalculatingOrder Order recalculation
+     *
+     * @return integer
+     */
+    public function finalizeOrder(\OxidEsales\Eshop\Application\Model\Basket $oBasket, $oUser, $blRecalculatingOrder = false)
+    {
+        $result = parent::finalizeOrder($oBasket, $oUser, $blRecalculatingOrder);
+
+        if (
+            $this->isMonduPayment() &&
+            $this->getMonduOrders()
+        ) {
+            $monduOrderUuid = array_values($this->getMonduOrders()->getArray())[0]->getFieldData( 'order_uuid' );
+
+            if (!$monduOrderUuid || !$this->getFieldData( 'oxorder__oxordernr')) {
+                return $result;
+            }
+
+            $this->client->updateOrderExternalInfo(
+                $monduOrderUuid,
+                ['external_reference_id' => (string) $this->getFieldData('oxorder__oxordernr')]
+            );
+        }
+
+        return $result;
+    }
 }

composer.json

@@ -2,7 +2,7 @@
     "name": "mondu/bnpl-checkout-oxid",
     "description": "Mondu payment method for the OXID eShop.",
     "type": "oxideshop-module",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "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.0.0',
+    'version'      => '1.0.2',
     'author'       => 'Mondu GmbH',
     'url'          => 'https://www.mondu.ai',
     'email'        => '[email protected]',