[AB,JLA] Upgrade to 11.0.1

Adyen · Apr 21, 2023 · 677d9f1 · 677d9f1
1 parent 22374eb
commit 677d9f1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/messages/base.properties
@@ -32,6 +32,7 @@ payment.method.last.name=Last name
 payment.method.issuer.selector=Please select issuer
 payment.method.terminal.selector=Select your terminal
 payment.method.telephonenumber=Phone Number
+payment.method.label.information=Bank Card
 
 checkout.summary.spinner.message=Please wait while your payment is processed. Do not click back or refresh the page.
 checkout.summary.component.mbway.payment=Provide your MB WAY account data to finalize your payment

diff --git a/...heckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag b/...heckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag
@@ -29,7 +29,7 @@
     <input type="hidden" name="txvariant" value="card">
     <div class="chckt-pm__header js-chckt-pm__header">
         <adyen:methodSelector name="adyen_cc"/>
-        <span class="chckt-pm__name js-chckt-pm__name">${creditCardLabel}</span>
+        <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>

diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java
@@ -31,7 +31,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants {
 	public static final String EXTENSIONNAME = "adyenv6core";
 
 	public static final String PLUGIN_NAME = "adyen-hybris";
-	public static final String PLUGIN_VERSION = "11.0.0";
+	public static final String PLUGIN_VERSION = "11.0.1";
 	public static final String PAYMENT_PROVIDER = "Adyen";
 	public static final String PAYMENT_METHOD ="paymentMethod";
 

diff --git a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java
@@ -80,6 +80,7 @@ public class AdyenRequestFactory {
     private static final String IS_3DS2_ALLOWED_PROPERTY = "is3DS2allowed";
     private static final String ALLOW_3DS2_PROPERTY = "allow3DS2";
     private static final String OVERWRITE_BRAND_PROPERTY = "overwriteBrand";
+    private static final String DUAL_BRANDED_NOT_SELECTED_FLOW_PAYMENT_TYPE = "scheme";
 
     protected final ConfigurationService configurationService;
     protected final AdyenPaymentMethodDetailsBuilderExecutor adyenPaymentMethodDetailsBuilderExecutor;
@@ -310,7 +311,7 @@ protected void updatePaymentRequestForCC(final PaymentsRequest paymentsRequest,
 
         // For Dual branded card set card brand as payment method type
         if (StringUtils.isNotEmpty(cartData.getAdyenCardBrand())) {
-            paymentsRequest.getPaymentMethod().setType(cartData.getAdyenCardBrand());
+            paymentsRequest.getPaymentMethod().setType(DUAL_BRANDED_NOT_SELECTED_FLOW_PAYMENT_TYPE);
         }
         if (cartData.getAdyenInstallments() != null) {
             Installments installmentObj = new Installments();