Merge pull request #594 from Adyen/feature/AD-476

AD-476 Refactor card payment method name in accelerator

Author: pjaneta

adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag

@@ -28,15 +28,15 @@
 <div class="chckt-pm chckt-pm-card js-chckt-pm js-chckt-pm__pm-holder" data-additional-required="" data-pm="card">
     <input type="hidden" name="txvariant" value="card">
     <div class="chckt-pm__header js-chckt-pm__header">
-        <adyen:methodSelector name="adyen_cc"/>
+        <adyen:methodSelector name="card"/>
         <span class="chckt-pm__name js-chckt-pm__name"><spring:theme code="payment.method.label.information"/></span>
         <span class="chckt-pm__image">
             <span id="cardLogos"></span>
             <span class="chckt-pm__image-border"></span>
         </span>
     </div>
 
-    <div class="chckt-pm__details js-chckt-pm__details payment_method_details" id="dd_method_adyen_cc">
+    <div class="chckt-pm__details js-chckt-pm__details payment_method_details" id="dd_method_card">
         <div class="chckt-form chckt-form--max-width">
             <c:if test="${showComboCard}">
                 <div class="adyen-checkout__dropdown adyen-checkout__field adyen-checkout__input--large">

adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp

@@ -110,7 +110,7 @@
         paymentMethodConfigs['createBlik'] = callbackConfig
         </c:when>
 
-        <c:when test="${selectedPaymentMethod eq 'adyen_cc' ||
+        <c:when test="${selectedPaymentMethod eq 'card' ||
                     fn:startsWith(selectedPaymentMethod, 'adyen_oneclick_')}">
         adyenCheckout.configureButton($("#placeOrderForm-hidden-xs"), true, "hidden-xs");
         adyenCheckout.configureButton($("#placeOrderForm-visible-xs"), true, "visible-xs");

adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_form_validator.js

@@ -19,7 +19,7 @@ class AdyenFormValidator {
             return false;
         }
 
-        if (paymentMethod === "adyen_cc") {
+        if (paymentMethod === "card") {
             if (!this.isValidCard(this.adyenCheckoutHybris.card, this.adyenCheckoutHybris.isDebitCard(), this.adyenCheckoutHybris.isValidBrandType())) {
                 this.showAlert('Please check your card details.');
                 this.adyenCheckoutHybris.card.showValidation();

adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java

@@ -40,7 +40,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	public static final String TEST_ENV = "test";
 	public static final String LIVE_ENV = "live";
 
-	public static final String PAYMENT_METHOD_CC = "adyen_cc";
+	public static final String PAYMENT_METHOD_CC = "card";
 	public static final String PAYMENT_METHOD_EPS = "eps";
 	public static final String PAYMENT_METHOD_IDEAL = "ideal";
 	public static final String PAYMENT_METHOD_ONECLICK = "adyen_oneclick_";

adyenv6core/testsrc/com/adyen/v6/commands/AdyenCaptureCommandTest.java

@@ -157,7 +157,7 @@ public void testManualNotSupportedCaptureSuccess() {
     public void shouldReturnTrueForSupportedMethods() {
         // All supported payment methods
         String[] supportedMethods = {
-                "card", "adyen_cc", "scheme", "paypal", "klarna", "klarna_account", "klarna_paynow", "afterpay_default",
+                "card", "scheme", "paypal", "klarna", "klarna_account", "klarna_paynow", "afterpay_default",
                 "afterpaytouch", "clearpay", "ratepay", "afterpay_default", "sepadirectdebit", "applepay",
                 "paywithgoogle", "googlepay", "amazonpay", "twint"
         };