Fix maestro oneclick to allow order button and fix to keep the cc and oneclick...

Fix maestro oneclick to allow order button and fix to keep the cc and oneclick authorisation seperate to provide better structure what is used for what purpose

Gateway/Request/CcAuthorizationDataBuilder.php

@@ -67,9 +67,6 @@ class CcAuthorizationDataBuilder implements BuilderInterface
 
         // If ccType is set use this. For bcmc you need bcmc otherwise it will fail
         $request['paymentMethod']['type'] = "scheme";
-        if ($variant = $payment->getAdditionalInformation(AdyenCcDataAssignObserver::VARIANT)) {
-            $request['paymentMethod']['type'] = $variant;
-        }
 
         if ($cardNumber = $payment->getAdditionalInformation(AdyenCcDataAssignObserver::ENCRYPTED_CREDIT_CARD_NUMBER)) {
             $request['paymentMethod']['encryptedCardNumber'] = $cardNumber;

Gateway/Request/OneclickAuthorizationDataBuilder.php

@@ -55,6 +55,18 @@ class OneclickAuthorizationDataBuilder implements BuilderInterface
         $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($buildSubject);
         $payment = $paymentDataObject->getPayment();
 
+        // If ccType is set use this. For bcmc you need bcmc otherwise it will fail
+        $request['paymentMethod']['type'] = "scheme";
+        if ($variant = $payment->getAdditionalInformation(AdyenOneclickDataAssignObserver::VARIANT)) {
+            $request['paymentMethod']['type'] = $variant;
+        }
+
+        if ($securityCode = $payment->getAdditionalInformation(AdyenOneclickDataAssignObserver::ENCRYPTED_SECURITY_CODE)) {
+            $request['paymentMethod']['encryptedSecurityCode'] = $securityCode;
+        }
+
+        $payment->unsAdditionalInformation(AdyenOneclickDataAssignObserver::ENCRYPTED_SECURITY_CODE);
+
         if ($payment->getAdditionalInformation('customer_interaction')) {
             $shopperInteraction = "Ecommerce";
         } else {
@@ -79,6 +91,13 @@ class OneclickAuthorizationDataBuilder implements BuilderInterface
             }
         }
 
+        // if installments is set add it into the request
+        if ($payment->getAdditionalInformation(AdyenOneclickDataAssignObserver::NUMBER_OF_INSTALLMENTS) &&
+            $payment->getAdditionalInformation(AdyenOneclickDataAssignObserver::NUMBER_OF_INSTALLMENTS) > 0
+        ) {
+            $request['installments']['value'] = $payment->getAdditionalInformation(AdyenOneclickDataAssignObserver::NUMBER_OF_INSTALLMENTS);
+        }
+
         return $request;
     }
 }

etc/di.xml

@@ -498,7 +498,6 @@
                 <item name="payment" xsi:type="string">Adyen\Payment\Gateway\Request\PaymentDataBuilder</item>
                 <item name="browserinfo" xsi:type="string">Adyen\Payment\Gateway\Request\BrowserInfoDataBuilder</item>
                 <item name="recurring" xsi:type="string">Adyen\Payment\Gateway\Request\RecurringDataBuilder</item>
-                <item name="transaction" xsi:type="string">Adyen\Payment\Gateway\Request\CcAuthorizationDataBuilder</item>
                 <item name="oneclick" xsi:type="string">Adyen\Payment\Gateway\Request\OneclickAuthorizationDataBuilder</item>
             </argument>
         </arguments>

view/frontend/web/js/view/payment/method-renderer/adyen-oneclick-method.js

@@ -261,9 +261,12 @@ define(
                                             }
                                         } else {
                                             self.encryptedCreditCardVerificationNumber = '';
+                                            // onChange is called on the startup so make sure maestro has always optional cvc field
+                                            if (self.agreement_data.variant != "maestro") {
                                                 self.placeOrderAllowed(false);
                                                 isValid(false);
                                             }
+                                        }
                                     },
                                     onValid: function (state) {
                                         if (state.isValid) {