Remove PaymentCtrl-Check

OXID-eSales · Sep 20, 2024 · 58fb7af · 58fb7af
1 parent 9fd07e6
commit 58fb7af
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 109 deletions.
diff --git a/src/Core/Module.php b/src/Core/Module.php
@@ -105,7 +105,6 @@ final class Module
             'constraints' => self::PAYMENT_CONSTRAINTS,
             'sort' => -1,
             'capturedelay' => true,
-            'paymentCtrl' => false,
             'handleAssets' => true,
         ],
         self::PAYMENT_PAYPAL_ID => [
@@ -126,7 +125,6 @@ final class Module
             'constraints' => self::PAYMENT_CONSTRAINTS,
             'sort' => 0,
             'capturedelay' => true,
-            'paymentCtrl' => false,
             'handleAssets' => false,
         ],
         self::PAYMENT_GOOGLE_PAY_ID => [
@@ -147,7 +145,6 @@ final class Module
             'constraints' => self::PAYMENT_CONSTRAINTS,
             'sort' => 0,
             'capturedelay' => true,
-            'paymentCtrl' => false,
             'handleAssets' => false,
         ],
         self::PAYMENT_KLARNA_LATER_ID => [
@@ -168,7 +165,6 @@ final class Module
             'constraints' => self::PAYMENT_CONSTRAINTS,
             'sort' => 0,
             'capturedelay' => true,
-            'paymentCtrl' => false,
             'handleAssets' => false,
         ],
         self::PAYMENT_KLARNA_OVER_TIME_ID => [
@@ -189,7 +185,6 @@ final class Module
             'constraints' => self::PAYMENT_CONSTRAINTS,
             'sort' => 0,
             'capturedelay' => true,
-            'paymentCtrl' => false,
             'handleAssets' => false,
         ],
         self::PAYMENT_KLARNA_IMMEDIATE_ID => [
@@ -210,7 +205,6 @@ final class Module
             'constraints' => self::PAYMENT_CONSTRAINTS,
             'sort' => 0,
             'capturedelay' => true,
-            'paymentCtrl' => false,
             'handleAssets' => false,
         ],
         self::PAYMENT_TWINT_ID => [
@@ -231,7 +225,6 @@ final class Module
             'constraints' => self::PAYMENT_CONSTRAINTS,
             'sort' => 0,
             'capturedelay' => true,
-            'paymentCtrl' => false,
             'handleAssets' => false,
             'supported_currencies' => ['CHF'],
         ],
@@ -253,7 +246,6 @@ final class Module
             'constraints' => self::PAYMENT_CONSTRAINTS,
             'sort' => 0,
             'capturedelay' => true,
-            'paymentCtrl' => false,
             'handleAssets' => true,
         ],
     ];

diff --git a/src/Model/Payment.php b/src/Model/Payment.php
@@ -39,24 +39,12 @@ public function isAdyenCreditCardPayment(): bool
         return $this->getAdyenPaymentConfigService()->isAdyenCreditCardPayment($this->getId());
     }
 
-    /**
-     * Checks if the payment method is show on Payment Controller
-     */
-    public function showInPaymentCtrl(): bool
-    {
-        return ($this->isAdyenPayment() &&
-            $this->getServiceFromContainer(ModuleService::class)->showInPaymentCtrl($this->getId()) &&
-            $this->getAdyenBoolData('oxactive') === true
-        );
-    }
-
     /**
      * Checks if the payment method is show on Order Controller
      */
     public function showInOrderCtrl(): bool
     {
         return ($this->isAdyenPayment() &&
-            !$this->getServiceFromContainer(ModuleService::class)->showInPaymentCtrl($this->getId()) &&
             $this->getAdyenBoolData('oxactive') === true
         );
     }

diff --git a/src/Model/PaymentGateway.php b/src/Model/PaymentGateway.php
@@ -37,9 +37,7 @@ public function executePayment($amount, &$order)
         $paymentId = $sessionSettings->getPaymentId();
 
         if ($moduleService->isAdyenPayment($paymentId)) {
-            if (!$moduleService->showInPaymentCtrl($paymentId)) {
-                $payGatewayService->doCollectAdyenRequestData();
-            }
+            $payGatewayService->doCollectAdyenRequestData();
             /** @var Order $order */
             $payGatewayService->doFinishAdyenPayment($amount, $order);
         }

diff --git a/src/Service/Module.php b/src/Service/Module.php
@@ -16,12 +16,6 @@ public function isAdyenCreditCardPayment(string $paymentId): bool
         return $paymentId === ModuleCore::PAYMENT_CREDITCARD_ID;
     }
 
-    public function showInPaymentCtrl(string $paymentId): bool
-    {
-        return ($this->isAdyenPayment($paymentId) &&
-            ModuleCore::PAYMENT_DEFINTIONS[$paymentId]['paymentCtrl']);
-    }
-
     public function handleAssets(string $paymentId): bool
     {
         return ($this->isAdyenPayment($paymentId) &&

diff --git a/src/Service/PaymentGateway.php b/src/Service/PaymentGateway.php
@@ -74,7 +74,7 @@ public function doFinishAdyenPayment(float $amount, Order $order): bool
             );
             $order->save();
 
-            // trigger Capture for all PaymentCtrl-Payments with Capture-Delay "immediate"
+            // trigger Capture for all Payments with Capture-Delay "immediate"
             if ($this->paymentConfigService->isAdyenImmediateCapture($paymentId)) {
                 $order->captureAdyenOrder($amount);
             }
@@ -86,7 +86,7 @@ public function doFinishAdyenPayment(float $amount, Order $order): bool
     }
 
     /**
-     * put RequestData from OrderCtrl in the session as well as from PaymentCtrl
+     * put RequestData from OrderCtrl in the session
      */
     public function doCollectAdyenRequestData(): void
     {

diff --git a/tests/Integration/Model/PaymentTest.php b/tests/Integration/Model/PaymentTest.php
@@ -52,23 +52,11 @@ public function testIsAdyenPaymentAndCheckCapture($paymentId, $isManualCapture,
         $payment->load($paymentId);
         $this->assertSame(isset(Module::PAYMENT_DEFINTIONS[$paymentId]), $payment->isAdyenPayment());
 
-        // Check: showInPaymentCtrl
-        $isActive = $payment->getFieldData('oxactive') === '1' ;
-        $this->assertSame(
-            (
-                isset(Module::PAYMENT_DEFINTIONS[$paymentId]) &&
-                Module::PAYMENT_DEFINTIONS[$paymentId]['paymentCtrl'] &&
-                $isActive
-            ),
-            $payment->showInPaymentCtrl()
-        );
-
         // Check: showInOrderCtrl
         $isActive = $payment->getFieldData('oxactive') === '1' ;
         $this->assertSame(
             (
                 isset(Module::PAYMENT_DEFINTIONS[$paymentId]) &&
-                !Module::PAYMENT_DEFINTIONS[$paymentId]['paymentCtrl'] &&
                 $isActive
             ),
             $payment->showInOrderCtrl()

diff --git a/tests/Unit/Model/PaymentGatewayTest.php b/tests/Unit/Model/PaymentGatewayTest.php
@@ -42,9 +42,7 @@ public function testExecutePaymentSuccess()
         );
         $moduleServiceMock = $this->createModuleServiceMock(
             $paymentId,
-            1,
-            true,
-            false
+            true
         );
 
         $paymentGatewayMock = $this->createPaymentGatewayMock(
@@ -72,7 +70,7 @@ public function testExecutePaymentSuccessCollectFromRequest()
             0,
             1
         );
-        $moduleServiceMock = $this->createModuleServiceMock($paymentId, 1);
+        $moduleServiceMock = $this->createModuleServiceMock($paymentId);
 
         $paymentGatewayMock = $this->createPaymentGatewayMock(
             $sessionSettingsMock,
@@ -101,7 +99,6 @@ public function testExecutePaymentInvalidAdyenPayment()
         );
         $moduleServiceMock = $this->createModuleServiceMock(
             $paymentId,
-            0,
             false
         );
 
@@ -169,21 +166,14 @@ private function createPaymentGatewayMock(
 
     private function createModuleServiceMock(
         string $paymentId = Module::PAYMENT_CREDITCARD_ID,
-        int $showInCtrlInvokeCount = 0,
-        bool $isAdyenPayment = true,
-        bool $showInPaymentCtrl = true
+        bool $isAdyenPayment = true
     ): MockObject {
         $moduleServiceMock = $this->createMock(ModuleService::class);
         $moduleServiceMock->expects($this->once())
             ->method('isAdyenPayment')
             ->with($paymentId)
             ->willReturn($isAdyenPayment);
 
-        $moduleServiceMock->expects($this->exactly($showInCtrlInvokeCount))
-            ->method('showInPaymentCtrl')
-            ->with($paymentId)
-            ->willReturn($showInPaymentCtrl);
-
         return $moduleServiceMock;
     }
 }
diff --git a/tests/Unit/Service/ModuleTest.php b/tests/Unit/Service/ModuleTest.php
@@ -30,39 +30,6 @@ public function testIsAdyenPaymentFalse()
         $this->assertFalse($moduleService->isAdyenPayment($paymentId));
     }
 
-    /**
-     * @covers \OxidSolutionCatalysts\Adyen\Service\Module::showInPaymentCtrl
-     */
-    public function testShowInPaymentCtrlTrue()
-    {
-        $paymentId = ModuleCore::PAYMENT_CREDITCARD_ID;
-        $moduleService = oxNew(ModuleService::class);
-
-        $this->assertTrue($moduleService->showInPaymentCtrl($paymentId));
-    }
-
-    /**
-     * @covers \OxidSolutionCatalysts\Adyen\Service\Module::showInPaymentCtrl
-     */
-    public function testShowInPaymentCtrlFalseInvalidPaymentId()
-    {
-        $paymentId = 'invalid';
-        $moduleService = oxNew(ModuleService::class);
-
-        $this->assertFalse($moduleService->showInPaymentCtrl($paymentId));
-    }
-
-    /**
-     * @covers \OxidSolutionCatalysts\Adyen\Service\Module::showInPaymentCtrl
-     */
-    public function testShowInPaymentCtrlFalseNoPaymentCtrl()
-    {
-        $paymentId = ModuleCore::PAYMENT_PAYPAL_ID;
-        $moduleService = oxNew(ModuleService::class);
-
-        $this->assertFalse($moduleService->showInPaymentCtrl($paymentId));
-    }
-
     /**
      * @covers \OxidSolutionCatalysts\Adyen\Service\Module::handleAssets
      */
@@ -88,17 +55,6 @@ public function testHandleAssetsFalseInvalidPaymentId()
         $this->assertFalse($moduleService->handleAssets($paymentId));
     }
 
-    /**
-     * @covers \OxidSolutionCatalysts\Adyen\Service\Module::handleAssets
-     */
-    public function testHandleAssetsFalseNoPaymentCtrl()
-    {
-        $paymentId = ModuleCore::PAYMENT_PAYPAL_ID;
-        $moduleService = oxNew(ModuleService::class);
-
-        $this->assertFalse($moduleService->handleAssets($paymentId));
-    }
-
     /**
      * @covers \OxidSolutionCatalysts\Adyen\Service\Module::isCaptureDelay
      */

diff --git a/views/frontend/blocks/page/checkout/select_payment.tpl b/views/frontend/blocks/page/checkout/select_payment.tpl
@@ -1,13 +1,7 @@
-[{if $paymentmethod|method_exists:'isAdyenPayment' && $paymentmethod->isAdyenPayment() && $paymentmethod->showInPaymentCtrl()}]
+[{if $paymentmethod|method_exists:'isAdyenPayment' && $paymentmethod->isAdyenPayment() && $oViewConf->checkAdyenHealth() && $oView->isValidAdyenAuthorisation()}]
     [{* Show Adyen Payments only if Adyen is healthy *}]
-    [{if $oViewConf->checkAdyenHealth()}]
-        [{* We include it as template, so that it can be modified in custom themes *}]
-        [{if $oView->isValidAdyenAuthorisation()}]
-            [{include file="modules/osc/adyen/payment/adyen_payment_inauthorisation.tpl"}]
-        [{else}]
-            [{include file="modules/osc/adyen/payment/adyen_payment.tpl"}]
-        [{/if}]
-    [{/if}]
+    [{* We include it as template, so that it can be modified in custom themes *}]
+    [{include file="modules/osc/adyen/payment/adyen_payment_inauthorisation.tpl"}]
 [{else}]
     [{$smarty.block.parent}]
 [{/if}]