PIOXD-376 - Removal of Order API - Step 1

Application/Model/Payment/Banktransfer.php

@@ -50,13 +50,8 @@ protected function getDueDate()
     public function getPaymentSpecificParameters(Order $oOrder)
     {
         $aParams = parent::getPaymentSpecificParameters($oOrder);
-
         $aParams['billingEmail'] = $oOrder->oxorder__oxbillemail->value;
         $aParams['dueDate'] = $this->getDueDate();
-
-        if ($this->getApiMethod() == 'order') {
-            unset($aParams['billingEmail']); // existance of billingEmail param in OrderAPI triggers error
-        }
         return $aParams;
     }
 }

Application/Model/Payment/Base.php

@@ -31,13 +31,6 @@ abstract class Base
      */
     protected $aPaymentConfig = null;
 
-    /**
-     * Determines if the payment methods only supports the order API
-     *
-     * @var bool
-     */
-    protected $blIsOnlyOrderApiSupported = false;
-
     /**
      * Determines if the payment methods supports the order expiry mechanism
      *
@@ -161,16 +154,6 @@ public function getMolliePaymentCode()
         return $this->sMolliePaymentCode;
     }
 
-    /**
-     * Returns if the payment methods only supports the order API
-     *
-     * @return bool
-     */
-    public function isOnlyOrderApiSupported()
-    {
-        return $this->blIsOnlyOrderApiSupported;
-    }
-
     /**
      * Returns array of billing country restrictions
      *
@@ -275,7 +258,7 @@ public function getApiEndpoint($sMode = false, $sApiMethod = false)
         if ($sApiMethod === false) {
             $sApiMethod = $this->getApiMethod();
         }
-        if ($sApiMethod == 'order') {
+        if ($sApiMethod == 'order') { // FCRM_REMOVE_ORDERS_API
             return Payment::getInstance()->loadMollieApi($sMode)->orders;
         }
         return Payment::getInstance()->loadMollieApi($sMode)->payments;
@@ -308,6 +291,7 @@ public function getApiEndpointByOrder($oOrder)
      */
     public function getApiRequestModel($oOrder = false)
     {
+        // FCRM_REMOVE_ORDERS_API
         if ($this->getApiMethod($oOrder) == 'order') {
             return oxNew(\Mollie\Payment\Application\Model\Request\Order::class);
         }
@@ -322,6 +306,7 @@ public function getApiRequestModel($oOrder = false)
      */
     public function getTransactionHandler($oOrder = false)
     {
+        // FCRM_REMOVE_ORDERS_API
         if ($this->getApiMethod($oOrder) == 'order') {
             return oxNew(\Mollie\Payment\Application\Model\TransactionHandler\Order::class);
         }
@@ -340,14 +325,7 @@ public function getApiMethod($oOrder = false)
             return $oOrder->oxorder__mollieapi->value;
         }
 
-        $sApiMethod = $this->getConfigParam('api');
-        if (empty($sApiMethod)) {
-            $sApiMethod = $this->sDefaultApi;
-            if ($this->blIsOnlyOrderApiSupported === true) {
-                $sApiMethod = 'order';
-            }
-        }
-        return $sApiMethod;
+        return 'payment'; // order API was removed in 2025-12
     }
 
     /**
@@ -586,7 +564,7 @@ public function getPaymentSpecificParameters(Order $oOrder)
         $aParams = [];
 
         $sCaptureMethod = $this->getCaptureMethod();
-        if ($this->getApiMethod($oOrder) == 'payment' && $sCaptureMethod !== false) { // Merchant capture only available for Payment API
+        if ($sCaptureMethod !== false) { // Merchant capture only available for Payment API
             $oOrder->mollieSetCaptureMode($sCaptureMethod);
             $aParams['captureMode'] = $sCaptureMethod;
             if ($sCaptureMethod === 'automatic') {

Application/Model/Payment/KlarnaPayLater.php

@@ -2,6 +2,7 @@
 
 namespace Mollie\Payment\Application\Model\Payment;
 
+// FCRM_REMOVE_ORDERS_API
 class KlarnaPayLater extends Base
 {
     /**
@@ -19,11 +20,13 @@ class KlarnaPayLater extends Base
     protected $sMolliePaymentCode = 'klarnapaylater';
 
     /**
-     * Determines if the payment methods only supports the order API
+     * Determines if payment method is deprecated.
+     * Deprecated methods are disabled, can't be used anymore and will be removed in a future release.
+     * They stay in the module to allow finishing old orders where these methods have been used
      *
      * @var bool
      */
-    protected $blIsOnlyOrderApiSupported = true;
+    protected $blMethodIsDeprecated = true;
 
     /**
      * @var bool

Application/Model/Payment/KlarnaPayNow.php

@@ -2,6 +2,7 @@
 
 namespace Mollie\Payment\Application\Model\Payment;
 
+// FCRM_REMOVE_ORDERS_API
 class KlarnaPayNow extends Base
 {
     /**
@@ -19,11 +20,13 @@ class KlarnaPayNow extends Base
     protected $sMolliePaymentCode = 'klarnapaynow';
 
     /**
-     * Determines if the payment methods only supports the order API
+     * Determines if payment method is deprecated.
+     * Deprecated methods are disabled, can't be used anymore and will be removed in a future release.
+     * They stay in the module to allow finishing old orders where these methods have been used
      *
      * @var bool
      */
-    protected $blIsOnlyOrderApiSupported = true;
+    protected $blMethodIsDeprecated = true;
 
     /**
      * @var bool

Application/Model/Payment/KlarnaSliceIt.php

@@ -2,6 +2,7 @@
 
 namespace Mollie\Payment\Application\Model\Payment;
 
+// FCRM_REMOVE_ORDERS_API
 class KlarnaSliceIt extends Base
 {
     /**
@@ -19,11 +20,13 @@ class KlarnaSliceIt extends Base
     protected $sMolliePaymentCode = 'klarnasliceit';
 
     /**
-     * Determines if the payment methods only supports the order API
+     * Determines if payment method is deprecated.
+     * Deprecated methods are disabled, can't be used anymore and will be removed in a future release.
+     * They stay in the module to allow finishing old orders where these methods have been used
      *
      * @var bool
      */
-    protected $blIsOnlyOrderApiSupported = true;
+    protected $blMethodIsDeprecated = true;
 
     /**
      * @var bool

Application/Model/Payment/MyBank.php

@@ -22,22 +22,4 @@ class MyBank extends Base
      * @var bool
      */
     protected $blNeedsExtendedAddress = true;
-
-    /**
-     * Returns if payment method is available for the current basket situation. The limiting factors are:
-     *
-     * 1. All factors from parent call
-     * 2. OrderAPI doesn't support requests without first- or lastname for MyBank, so don't show it
-     *
-     * @return bool
-     */
-    public function isMethodAvailable($oBasket)
-    {
-        $blReturn = parent::isMethodAvailable($oBasket);
-        $oUser = $oBasket->getBasketUser();
-        if ($this->getApiMethod() === 'order' && (empty($oUser->oxuser__oxfname->value) || empty($oUser->oxuser__oxlname->value))) {
-            $blReturn = false;
-        }
-        return $blReturn;
-    }
 }

Application/Model/Payment/Twint.php

@@ -49,10 +49,7 @@ public function isMolliePaymentActiveInGeneral()
     public function getPaymentSpecificParameters(Order $oOrder)
     {
         $aParams = parent::getPaymentSpecificParameters($oOrder);
-
-        if ($this->getApiMethod($oOrder) == 'payment') {
-            $aParams['locale'] = 'de_CH';
-        }
+        $aParams['locale'] = 'de_CH';
         return $aParams;
     }
 }

Application/Model/PaymentConfig.php

@@ -32,14 +32,7 @@ public static function getTableCreateQuery()
      */
     public function savePaymentConfig($sPaymentId, $aConfig)
     {
-        if (!isset($aConfig['api'])) {
-            return false; // Faulty values - cancel execution
-        }
-
-        $sMollieApi = $aConfig['api'];
-        unset($aConfig['api']);
-
-        return $this->handleData($sPaymentId, $sMollieApi, $aConfig);
+        return $this->handleData($sPaymentId, 'payment', $aConfig);
     }
 
     /**

Application/Model/Request/Base.php

@@ -511,12 +511,7 @@ protected function addRequestParameters(CoreOrder $oOrder, $dAmount, $sReturnUrl
 
         $this->addParameter('locale', PaymentHelper::getInstance()->getLocale());
 
-        $aPaymentSpecificParameters = $oPaymentModel->getPaymentSpecificParameters($oOrder);
-        if (!empty($aPaymentSpecificParameters) && $oPaymentModel->getApiMethod() == 'order') {
-            $aPaymentSpecificParameters = ['payment' => $aPaymentSpecificParameters];
-        }
-
-        $this->aParameters = array_merge($this->aParameters, $aPaymentSpecificParameters);
+        $this->aParameters = array_merge($this->aParameters, $oPaymentModel->getPaymentSpecificParameters($oOrder));
     }
 
     /**

Application/Model/Request/Order.php

@@ -4,6 +4,7 @@
 
 use OxidEsales\Eshop\Application\Model\Order as CoreOrder;
 
+// FCRM_REMOVE_ORDERS_API
 class Order extends Base
 {
     /**

Application/Model/TransactionHandler/Order.php

@@ -7,6 +7,7 @@
 use Mollie\Api\Resources\Order as ApiOrder;
 use OxidEsales\Eshop\Core\Registry;
 
+// FCRM_REMOVE_ORDERS_API
 class Order extends Base
 {
     /**

Tests/Unit/Application/Model/Payment/IdealTest.php

@@ -79,14 +79,6 @@ public function testGetMolliePaymentCode()
         $this->assertEquals("ideal", $result);
     }
 
-    public function testIsOnlyOrderApiSupported()
-    {
-        $oPayment = new \Mollie\Payment\Application\Model\Payment\Ideal();
-        $result = $oPayment->isOnlyOrderApiSupported();
-
-        $this->assertFalse($result);
-    }
-
     public function testIsOrderExpirySupported()
     {
         $oPayment = new \Mollie\Payment\Application\Model\Payment\Ideal();

Tests/Unit/Application/Model/Request/OrderTest.php

@@ -41,7 +41,6 @@ public function testSendRequest()
         $oPaymentModel = $this->getMockBuilder(Creditcard::class)->disableOriginalConstructor()->getMock();
         $oPaymentModel->method('getMolliePaymentCode')->willReturn('creditcard');
         $oPaymentModel->method('isRedirectUrlNeeded')->willReturn(true);
-        $oPaymentModel->method('getApiMethod')->willReturn('order');
         $oPaymentModel->method('getPaymentSpecificParameters')->willReturn(['foo' => 'bar']);
         $oPaymentModel->method('getApiEndpoint')->willReturn($oApiEndpoint);
         $oPaymentModel->method('getApiEndpointByOrder')->willReturn($oApiEndpoint);
@@ -103,7 +102,6 @@ public function testSendRequestFixProductsumMismatch()
         $oPaymentModel = $this->getMockBuilder(Creditcard::class)->disableOriginalConstructor()->getMock();
         $oPaymentModel->method('getMolliePaymentCode')->willReturn('creditcard');
         $oPaymentModel->method('isRedirectUrlNeeded')->willReturn(true);
-        $oPaymentModel->method('getApiMethod')->willReturn('order');
         $oPaymentModel->method('getPaymentSpecificParameters')->willReturn(['foo' => 'bar']);
         $oPaymentModel->method('getApiEndpoint')->willReturn($oApiEndpoint);
         $oPaymentModel->method('getApiEndpointByOrder')->willReturn($oApiEndpoint);
@@ -210,7 +208,6 @@ public function testSendRequestSumMismatch()
         $oPaymentModel = $this->getMockBuilder(Creditcard::class)->disableOriginalConstructor()->getMock();
         $oPaymentModel->method('getMolliePaymentCode')->willReturn('creditcard');
         $oPaymentModel->method('isRedirectUrlNeeded')->willReturn(true);
-        $oPaymentModel->method('getApiMethod')->willReturn('order');
         $oPaymentModel->method('getPaymentSpecificParameters')->willReturn(['foo' => 'bar']);
         $oPaymentModel->method('getApiEndpoint')->willReturn($oApiEndpoint);
         $oPaymentModel->method('getApiEndpointByOrder')->willReturn($oApiEndpoint);

Tests/Unit/Application/Model/Request/PaymentTest.php

@@ -33,7 +33,6 @@ public function testSendRequest()
         $oPaymentModel = $this->getMockBuilder(Creditcard::class)->disableOriginalConstructor()->getMock();
         $oPaymentModel->method('getMolliePaymentCode')->willReturn('creditcard');
         $oPaymentModel->method('isRedirectUrlNeeded')->willReturn(true);
-        $oPaymentModel->method('getApiMethod')->willReturn('order');
         $oPaymentModel->method('getPaymentSpecificParameters')->willReturn(['foo' => 'bar']);
         $oPaymentModel->method('getApiEndpoint')->willReturn($oApiEndpoint);
         $oPaymentModel->method('getApiEndpointByOrder')->willReturn($oApiEndpoint);
@@ -70,7 +69,6 @@ public function testSendRequestApiException()
         $oPaymentModel = $this->getMockBuilder(Creditcard::class)->disableOriginalConstructor()->getMock();
         $oPaymentModel->method('getMolliePaymentCode')->willReturn('creditcard');
         $oPaymentModel->method('isRedirectUrlNeeded')->willReturn(true);
-        $oPaymentModel->method('getApiMethod')->willReturn('order');
         $oPaymentModel->method('getPaymentSpecificParameters')->willReturn(['foo' => 'bar']);
         $oPaymentModel->method('getApiEndpoint')->willReturn($oApiEndpoint);
         $oPaymentModel->method('getApiEndpointByOrder')->willReturn($oApiEndpoint);
@@ -111,7 +109,6 @@ public function testSendRequestDetailsFailure()
         $oPaymentModel = $this->getMockBuilder(Creditcard::class)->disableOriginalConstructor()->getMock();
         $oPaymentModel->method('getMolliePaymentCode')->willReturn('creditcard');
         $oPaymentModel->method('isRedirectUrlNeeded')->willReturn(true);
-        $oPaymentModel->method('getApiMethod')->willReturn('order');
         $oPaymentModel->method('getPaymentSpecificParameters')->willReturn(['foo' => 'bar']);
         $oPaymentModel->method('getApiEndpoint')->willReturn($oApiEndpoint);
         $oPaymentModel->method('getApiEndpointByOrder')->willReturn($oApiEndpoint);
@@ -152,7 +149,6 @@ public function testSendRequestExtraFailure()
         $oPaymentModel = $this->getMockBuilder(Creditcard::class)->disableOriginalConstructor()->getMock();
         $oPaymentModel->method('getMolliePaymentCode')->willReturn('creditcard');
         $oPaymentModel->method('isRedirectUrlNeeded')->willReturn(true);
-        $oPaymentModel->method('getApiMethod')->willReturn('order');
         $oPaymentModel->method('getPaymentSpecificParameters')->willReturn(['foo' => 'bar']);
         $oPaymentModel->method('getApiEndpoint')->willReturn($oApiEndpoint);
         $oPaymentModel->method('getApiEndpointByOrder')->willReturn($oApiEndpoint);

extend/Application/Model/Order.php

@@ -395,7 +395,7 @@ protected function setPayment($sPaymentid)
 
             if ($this->mollieIsMolliePaymentUsed()) {
                 $this->oxorder__molliemode = new Field(PaymentHelper::getInstance()->getMollieMode());
-                $this->oxorder__mollieapi = new Field($this->mollieGetPaymentModel()->getApiMethod());
+                $this->oxorder__mollieapi = new Field('payment');
             }
             return $mParentReturn;
         }