PW-1103: Execute the plugin only if payment is adyen_cc or adyen_oneclick,...

PW-1103: Execute the plugin only if payment is adyen_cc or adyen_oneclick, remove payment type since it is different for non card methods

Helper/Requests.php

@@ -66,7 +66,7 @@ class Requests extends AbstractHelper
      * @param $billingAddress
      * @return mixed
      */
-    public function buildCustomerData($request = [], $customerId = 0, $billingAddress, \Magento\Quote\Model\Quote\Payment $payment)
+    public function buildCustomerData($request = [], $customerId = 0, $billingAddress, $payment)
     {
         if ($customerId > 0) {
             $request['shopperReference'] = $customerId;
@@ -311,7 +311,7 @@ class Requests extends AbstractHelper
      * @param $storeId
      * @param $payment
      */
-    public function buildRecurringData($request = [], $areaCode, int $storeId, \Magento\Quote\Model\Quote\Payment $payment)
+    public function buildRecurringData($request = [], $areaCode, int $storeId, $payment)
     {
         // If the vault feature is on this logic is handled in the VaultDataBuilder
         if (!$this->adyenHelper->isCreditCardVaultEnabled()) {

Plugin/PaymentInformationManagement.php

@@ -109,6 +109,7 @@ class PaymentInformationManagement
         \Magento\Checkout\Model\PaymentInformationManagement $subject,
         $response
     ) {
+
         // Get payment and cart information from session
         $quote = $this->checkoutSession->getQuote();
         $payment = $quote->getPayment();
@@ -121,7 +122,10 @@ class PaymentInformationManagement
 
             return $this->adyenHelper->buildThreeDS2ProcessResponseJson();
         }
-
+        if (strpos($payment->getMethod(), "adyen_cc") !== 0 &&
+            strpos($payment->getMethod(), "adyen_oneclick") !== 0) {
+            return $response;
+        }
         // Init request array
         $request = [];