Merge pull request #748 from Adyen/develop

Release version 5.0.9

Author: AleksandarBoljanovic

composer.json

@@ -6,7 +6,7 @@
         }
     ],
     "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
-    "version": "5.0.8",
+    "version": "5.0.9",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "require": {

src/Resources/app/storefront/dist/storefront/js/adyen-payment-shopware6/adyen-payment-shopware6.js

@@ -19,12 +19,16 @@
  * See the LICENSE file for more info.
  *
  */
-function validateTOS(self) {
-    const tosCheckbox = document.querySelector('#tos');
-    if(adyenCheckoutOptions?.accessibilityTweaks === '1' && tosCheckbox && !tosCheckbox.checked) {
-        tosCheckbox.scrollIntoView({ behavior: 'smooth', block: 'center' });
-        tosCheckbox.focus();
-        return false;
+
+function validateRequired(self) {
+    const requiredFields = document.querySelectorAll("input[required]");
+    for (const field of requiredFields) {
+        if (!field.checkValidity()) {
+            field.scrollIntoView({behavior: 'smooth', block: 'center'});
+            field.focus();
+
+            return false;
+        }
     }
 
     return self.confirmOrderForm.checkValidity();
@@ -41,7 +45,7 @@ export default {
         'applepay': {
             extra: {},
             onClick(resolve, reject, self) {
-                if(!validateTOS(self)) {
+                if (!validateRequired(self)) {
                     reject();
                     return false;
                 }
@@ -59,7 +63,7 @@ export default {
                 buttonSizeMode: 'fill',
             },
             onClick: function (resolve, reject, self) {
-                if(!validateTOS(self)) {
+                if (!validateRequired(self)) {
                     reject();
                     return false;
                 }
@@ -71,7 +75,7 @@ export default {
                     return true;
                 }
             },
-            onError: function(error, component, self) {
+            onError: function (error, component, self) {
                 if (error.statusCode !== 'CANCELED') {
                     if ('statusMessage' in error) {
                         console.log(error.statusMessage);
@@ -84,9 +88,9 @@ export default {
         'paypal': {
             extra: {},
             onClick: function (source, event, self) {
-                return validateTOS(self);
+                return validateRequired(self);
             },
-            onError: function(error, component, self) {
+            onError: function (error, component, self) {
                 component.setStatus('ready');
                 window.location.href = self.errorUrl.toString();
             },
@@ -134,7 +138,7 @@ export default {
             prePayRedirect: true,
             sessionKey: 'amazonCheckoutSessionId',
             onClick: function (resolve, reject, self) {
-                if(!validateTOS(self)) {
+                if (!validateRequired(self)) {
                     reject();
                     return false;
                 }
@@ -199,4 +203,4 @@ export default {
         'ebanking_FI': 'handler_adyen_onlinebankingfinlandpaymentmethodhandler',
         'onlineBanking_PL': 'handler_adyen_onlinebankingpolandpaymentmethodhandler'
     }
-}
+}

src/Resources/app/storefront/src/configuration/adyen.js

@@ -68,7 +68,6 @@
                  data-translation-adyen-giftcard-remaining-amount="{{ "adyen.giftcard.remainingAmount" | trans }}"
                  data-google-merchant-id="{{ adyenFrontendData.googleMerchantId }}"
                  data-gateway-merchant-id="{{ adyenFrontendData.gatewayMerchantId }}"
-                 data-accessibility-tweaks="{{ feature('ACCESSIBILITY_TWEAKS') ? 1 : 0 }}"
             >
             </div>
             <script>