[ECP-9064] Use constant definition for payment action field

Adyen · Mar 25, 2024 · b46398e · b46398e
1 parent ff0fee7
commit b46398e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Model/Config/Source/PaymentAction.php b/Model/Config/Source/PaymentAction.php
@@ -12,6 +12,7 @@
 namespace Adyen\Payment\Model\Config\Source;
 
 use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Payment\Model\MethodInterface;
 
 class PaymentAction implements OptionSourceInterface
 {
@@ -21,8 +22,8 @@ class PaymentAction implements OptionSourceInterface
     public function toOptionArray()
     {
         return [
-            ['value' => 'authorize', 'label' => 'Authorize'],
-            ['value' => 'order', 'label' => 'Order']
+            ['value' => MethodInterface::ACTION_AUTHORIZE, 'label' => MethodInterface::ACTION_AUTHORIZE],
+            ['value' => MethodInterface::ACTION_ORDER, 'label' => MethodInterface::ACTION_ORDER],
         ];
     }
 

diff --git a/Observer/SetOrderStateAfterPaymentObserver.php b/Observer/SetOrderStateAfterPaymentObserver.php
@@ -19,7 +19,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Paypal\Model\AbstractConfig;
+use Magento\Payment\Model\MethodInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\StatusResolver;
@@ -75,7 +75,7 @@ private function handlePosPayment(Payment $payment): void
         $storeId = $payment->getOrder()->getStoreId();
         $posPaymentAction = $this->configHelper->getAdyenPosCloudPaymentAction($storeId);
 
-        if ($posPaymentAction === AbstractConfig::PAYMENT_ACTION_ORDER) {
+        if ($posPaymentAction === MethodInterface::ACTION_ORDER) {
             $order = $payment->getOrder();
             $status = $this->statusResolver->getOrderStatusByState(
                 $payment->getOrder(),

diff --git a/Observer/SubmitQuoteObserver.php b/Observer/SubmitQuoteObserver.php
@@ -16,7 +16,7 @@
 use Adyen\Payment\Helper\PaymentResponseHandler;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Paypal\Model\AbstractConfig;
+use Magento\Payment\Model\MethodInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Sales\Model\Order;
 
@@ -66,7 +66,7 @@ public function execute(Observer $observer): void
         $isPosPayment = $payment->getMethod() === 'adyen_pos_cloud';
         $posPaymentAction = $this->configHelper->getAdyenPosCloudPaymentAction($storeId);
 
-        if (($isPosPayment && $posPaymentAction === AbstractConfig::PAYMENT_ACTION_ORDER) ||
+        if (($isPosPayment && $posPaymentAction === MethodInterface::ACTION_ORDER) ||
             ($isAdyenPaymentMethod && $isActionRequired)) {
             // Further shopper action required (e.g. redirect or 3DS authentication)
             /** @var Quote $quote */