Changeset 3306839

multisafepay/tags/6.9.0/assets/public/js/multisafepay-apple-pay-wallet.js

-                      r3048898
+                      r3306839
         this._sessionActive = false;
+        /**
+         * Flag to track if a session has been aborted
+         *
+         * @type {boolean}
+         * @private
+         */
+        this._sessionAborted = false;
         this.init()
             .then(
 …
      * Event handler for Apple Pay button click
+     *
+     * @returns {Promise<void>}
+     */
+    onApplePaymentButtonClicked = async() => {
+     * @returns {void}
+     */
+    onApplePaymentButtonClicked = () => {
+        // Check if a session is already active
+        if ( this.isSessionActive() ) {
+            debugDirect( 'Apple Pay session was already activated', this.debug, 'log' );
+            // Force reset session status to allow retry
+            this.setSessionStatus( false );
+            this._sessionAborted = false;
+            return;
+        }
         try {
+            await this.beginApplePaySession();
+        } catch ( error ) {
+            console.error( 'Error starting Apple Pay session when button is clicked:', error );
+            this.setSessionStatus( false );
+        }
+    }
+    /**
+     * Create Apple Pay button
+     *
+     * @returns {Promise<void>}
+     */
+    async createApplePayButton()
+    {
+        // Check if previous buttons already exist and remove them
+        cleanUpDirectButtons();
+        const buttonContainer = document.getElementById( 'place_order' ).parentElement;
+        if ( ! buttonContainer ) {
+            debugDirect( 'Button container not found', this.debug );
+            return;
+        }
+        // Features of the button
+        const buttonTag        = document.createElement( 'button' );
+        buttonTag.className    = 'apple-pay-button apple-pay-button-black';
+        buttonTag.style.cursor = 'pointer';
+        buttonContainer.addEventListener(
+            'click',
+            (
+                event ) => {
+                    this.onApplePaymentButtonClicked();
+                    // Avoid that WordPress submits the form
+                    event.preventDefault();
+                }
+        );
+        // Append the button to the div
+        buttonContainer.appendChild( buttonTag );
+    }
+    /**
+     * Create the Apple Pay payment request object and session
+     *
+     * Some variables from the global scope are launched from
+     * the internal code of Prestashop
+     *
+     * @returns {Promise<void>}
+     */
+    async beginApplePaySession()
+    {
+        try {
+            const validatorInstance = new FieldsValidator();
+            const fieldsAreValid    = validatorInstance.checkFields();
+            if ( ! fieldsAreValid ) {
+                debugDirect( 'Not all mandatory fields were filled out', this.debug, 'warn' );
+                return;
+            }
+            if ( this.isSessionActive() ) {
+                debugDirect( 'Apple Pay session was already activated', this.debug, 'log' );
+                return;
+            }
+            // Create the payment request object
+            // Create the payment request object first
             const paymentRequest = {
                 countryCode: configApplePay.countryCode,
 …
             };
             // Create the session and handle the events
+            // Create the session immediately in the click handler
             const session = new ApplePaySession( this.config.applePayVersion, paymentRequest );
             if ( session ) {
+                // Reset the aborted flag
+                this._sessionAborted = false;
+                // Setup event handlers
                 session.onvalidatemerchant  = ( event ) => this.handleValidateMerchant( event, session );
                 session.onpaymentauthorized = ( event ) => this.handlePaymentAuthorized( event, session );
                 session.oncancel            = ( event ) => this.handleCancel( event, session );
+                session.begin();
+                // Set session as active
                 this.setSessionStatus( true );
+                // Validate fields before beginning the session
+                this.validateFieldsBeforeSession( session );
+            }
         } catch ( error ) {
             console.error( 'Error starting Apple Pay session:', error );
+            console.error( 'Error starting Apple Pay session when button is clicked:', error );
             this.setSessionStatus( false );
+        }
+    }
+    /**
+     * Fetch merchant session data from MultiSafepay
+     *
+     * @param {string} validationURL
+     * @param {string} originDomain
+     * @returns {Promise<object>}
+     */
+    async fetchMerchantSession(validationURL, originDomain)
+    {
+        const data = new URLSearchParams();
+        data.append( 'action', 'applepay_direct_validation' );
+        data.append( 'validation_url', validationURL );
+        data.append( 'origin_domain', originDomain );
+        const response = await fetch(
+            this.config.multiSafepayServerScript,
+            {
+                method: 'POST',
+                body: data,
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+            }
+        );
+        return JSON.parse( await response.json() );
+            this._sessionAborted = false;
+        }
+    }
+    /**
+     * Validate fields before beginning the Apple Pay session
+     *
+     * @param {object} session - The Apple Pay session
+     * @returns {void}
+     */
+    validateFieldsBeforeSession( session ) {
+        // Create a validator instance
+        const validatorInstance = new FieldsValidator();
+        // Clear any previous error messages
+        validatorInstance.clearAllErrors();
+        // Validate fields
+        validatorInstance.checkFields()
+            .then(
+                fieldsAreValid => {
+                    if ( fieldsAreValid ) {
+                        // Fields are valid, now begin the session
+                        session.begin();
+                    } else {
+                        // Fields are not valid, don't begin the session
+                        debugDirect( 'Not all mandatory fields were filled out', this.debug, 'warn' );
+                        this._sessionAborted = true;
+                        this.setSessionStatus( false );
+                    }
+                }
+            )
+            .catch(
+                error => {
+                    // Error during validation
+                    debugDirect( 'Error during field validation: ' + error, this.debug, 'error' );
+                    this._sessionAborted = true;
+                    this.setSessionStatus( false );
+                }
+            );
+    }
 …
     handleValidateMerchant = async( event, session ) => {
         try {
+            // Check if the session has been aborted
+            if ( this._sessionAborted ) {
+                debugDirect( 'Session was already aborted, skipping merchant validation', this.debug, 'log' );
+                return;
+            }
             const validationURL = event.validationURL;
             const originDomain  = window.location.hostname;
 …
             const merchantSession = await this.fetchMerchantSession( validationURL, originDomain );
             if ( merchantSession && ( typeof merchantSession === 'object' ) ) {
+                session.completeMerchantValidation( merchantSession );
+                // Only complete merchant validation if the session hasn't been aborted
+                if ( ! this._sessionAborted ) {
+                    session.completeMerchantValidation( merchantSession );
+                }
             } else {
                 debugDirect( 'Error validating merchant', this.debug );
+                this._sessionAborted = true;
                 session.abort();
+            }
         } catch ( error ) {
             console.error( 'Error validating merchant:', error );
+            this._sessionAborted = true;
             session.abort();
+        }
 …
     handlePaymentAuthorized = async( event, session ) => {
         try {
+            // Check if the session has been aborted
+            if ( this._sessionAborted ) {
+                debugDirect( 'Session was already aborted, skipping payment authorization', this.debug, 'log' );
+                return;
+            }
             const paymentToken = JSON.stringify( event.payment.token );
             const success      = await this.submitApplePayForm( paymentToken );
 …
             try {
                 debugDirect( 'Apple Pay Direct session successfully aborted.', this.debug, 'log' );
+                this._sessionAborted = true;
                 session.abort();
             } catch ( error ) {
 …
         return true;
+    }
+    /**
+     * Fetch merchant session data from MultiSafepay
+     *
+     * @param {string} validationURL
+     * @param {string} originDomain
+     * @returns {Promise<object>}
+     */
+    async fetchMerchantSession( validationURL, originDomain )
+    {
+        const data = new URLSearchParams();
+        data.append( 'action', 'applepay_direct_validation' );
+        data.append( 'validation_url', validationURL );
+        data.append( 'origin_domain', originDomain );
+        const response = await fetch(
+            this.config.multiSafepayServerScript,
+            {
+                method: 'POST',
+                body: data,
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+            }
+        );
+        return JSON.parse( await response.json() );
+    }
+    /**
+     * Create Apple Pay button
+     *
+     * @returns {Promise<void>}
+     */
+    async createApplePayButton()
+    {
+        // Check if previous buttons already exist and remove them
+        cleanUpDirectButtons();
+        const buttonContainer = document.getElementById( 'place_order' ).parentElement;
+        if ( ! buttonContainer ) {
+            debugDirect( 'Button container not found', this.debug );
+            return;
+        }
+        // Features of the button
+        const buttonTag        = document.createElement( 'button' );
+        buttonTag.className    = 'apple-pay-button apple-pay-button-black';
+        buttonTag.style.cursor = 'pointer';
+        // Add an event listener directly to the Apple Pay button, not the container
+        buttonTag.addEventListener(
+            'click',
+            ( event ) => {
+                this.onApplePaymentButtonClicked();
+                // Prevent that WordPress submits the form
+                event.preventDefault();
+                event.stopPropagation();
+            }
+        );
+        // Append the button to the div
+        buttonContainer.appendChild( buttonTag );
+    }
+}

multisafepay/tags/6.9.0/assets/public/js/multisafepay-google-pay-wallet.js

r3048898	r3306839
222	222	{
223	223	const validatorInstance = new FieldsValidator();
224		const fieldsAreValid = validatorInstance.checkFields();
	224	const fieldsAreValid = await validatorInstance.checkFields();
225	225	if ( fieldsAreValid ) {
226	226	if ( paymentsClient && paymentsClient.loadPaymentData ) {

multisafepay/tags/6.9.0/assets/public/js/multisafepay-jquery-wallets.js

-                      r3048898
+                      r3306839
                             function() {
                                 debugDirect( 'Select2 action initialized for field: ' + this.name, debugStatus, 'log' );
+                                const select2Container = $( this ).closest( '.validate-required' ).find( '.select2-selection' );
+                                const wrapper          = $( this ).closest( '.validate-required' );
+                                const select2Container = wrapper.find( '.select2-selection' );
                                 if ( select2Container.length ) {
+                                    select2Container.attr( 'style', '' );
+                                    // Remove the inline red border style
+                                    select2Container.removeAttr( 'style' );
+                                    // Alternative approach if removeAttr doesn't work
+                                    select2Container.css( 'border', '' );
+                                }
+                                // Get the field ID container
+                                const fieldId        = this.name + '_field';
+                                const fieldContainer = $( '#' + fieldId );
+                                if ( fieldContainer.length ) {
+                                    // Remove WooCommerce invalid class and add validated class
+                                    fieldContainer.removeClass( 'woocommerce-invalid' );
+                                    fieldContainer.addClass( 'woocommerce-validated' );
+                                }
                                 validatorInstance.removeErrorMessage( this.name );
 …
                                 // Remove the orphan error messages from the notice group
                                 validatorInstance.removeOrphanErrorMessages();
+                                // Re-initialize select2 validation after checkout is updated
+                                select2Validation();
+                            }
                         );

multisafepay/tags/6.9.0/assets/public/js/multisafepay-validator-wallets.js

-                      r3048898
+                      r3306839
  */
+// Check if the debugDirect function is available, if not define it
+if ( typeof debugDirect !== 'function' ) {
+    window.debugDirect = function( debugMessage, debugEnabled, loggingType = 'error' ) {
+        const allowedTypeArray = ['log', 'info', 'warn', 'error', 'debug'];
+        if ( ! allowedTypeArray.includes( loggingType ) ) {
+            loggingType = 'log';
+        }
+        if ( debugMessage && debugEnabled ) {
+            console[loggingType]( debugMessage );
+        }
+    };
+}
 /**
  * Class to validate the fields in the checkout form
 …
     /**
+     * Cache for field labels to avoid repeated DOM lookups
+     *
+     * @type {Object}
+     */
+    fieldLabelsCache = {};
+    /**
+     * Cache for validated postcodes to avoid redundant AJAX calls
+     * Format: { 'prefix[billing/shipping]:country:postcode': boolean }
+     *
+     * @type {Object}
+     */
+    validatedPostcodesCache = {};
+    /**
+     * Flag to indicate if validation is currently in progress
+     *
+     * @type {boolean}
+     */
+    validationInProgress = false;
+    /**
+     * Constructor - setup event listeners for form submission
+     */
+    constructor() {
+        // Set up a global event listener to prevent payment when validation is in progress
+        this.setupPaymentBlockingWhileValidating();
+    }
+    /**
+     * Check if an element is visible
+     *
+     * @param {HTMLElement} element - Element to check visibility
+     * @returns {boolean} - Whether the element is visible
+     */
+    isElementVisible( element ) {
+        if ( ! element ) {
+            return false;
+        }
+        const style = window.getComputedStyle( element );
+        return ( element.offsetParent !== null ) ||
+            (
+                ( style.position === 'fixed' ) &&
+                ( style.display !== 'none' ) &&
+                ( style.visibility !== 'hidden' )
+            );
+    }
+    /**
+     * Setup event listener to prevent payment when validation is in progress
+     *
+     * @returns {void}
+     */
+    setupPaymentBlockingWhileValidating() {
+        document.addEventListener(
+            'click',
+            ( event ) => {
+                // If validation is in progress
+                if ( this.validationInProgress ) {
+                    // Look for payment buttons or elements that may trigger payment
+                    const targetElement   = event.target;
+                    const paymentTriggers = [
+                        '.payment_method_multisafepay_applepay',
+                        '.payment_method_multisafepay_googlepay',
+                        '#place_order',
+                        '.apple-pay-button',
+                        '.google-pay-button'
+                    ];
+                    // Check if the clicked element matches any payment trigger selectors
+                    const isPaymentTrigger = paymentTriggers.some(
+                        selector =>
+                            targetElement.matches && (
+                                targetElement.matches( selector ) ||
+                                targetElement.closest( selector )
+                            )
+                    );
+                    if ( isPaymentTrigger ) {
+                        debugDirect( 'Payment blocked: Validation in progress', debugStatus, 'log' );
+                        event.preventDefault();
+                        event.stopPropagation();
+                        return false;
+                    }
+                }
+            },
+            true
+        );
+    }
+    /**
      * Get the label text for a field
+     *
 …
      */
     getLabelText( fieldName ) {
         // Skip if this field has already been processed
         if ( this.processedFields.indexOf( fieldName ) !== -1 ) {
             return '';
+        // If we already have the label cached, return it
+        if ( this.fieldLabelsCache[fieldName] ) {
+            return this.fieldLabelsCache[fieldName];
+        }
 …
         this.processedFields.push( fieldName );
+        // Return the label text including the prefix
+        return prefix + labelElement.firstChild.textContent.trim();
+        // Create the label text including the prefix
+        const labelText = prefix + labelElement.firstChild.textContent.trim();
+        // Cache the label text
+        this.fieldLabelsCache[fieldName] = labelText;
+        // Return the label text
+        return labelText;
+    }
+    /**
+     * Validate an email address format
+     *
+     * @param {string} email - The email to validate
+     * @returns {boolean} - Whether the email is valid
+     */
+    validateEmail( email ) {
+        // Using the same logic as WooCommerce:
+        // wp-content/plugins/woocommerce/assets/js/frontend/checkout.js
+        const pattern = new RegExp( /^([a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+(\.[a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)*|"((([ \t]*\r\n)?[ \t]+)?([\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*(([ \t]*\r\n)?[ \t]+)?")@(([a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.)+([a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.?$/i );
+        return pattern.test( email );
+    }
+    /**
+     * Validate a postcode format via AJAX using WooCommerce's validation
+     *
+     * @param {string} postcode - The postcode to validate
+     * @param {string} fieldName - The field name (to determine if billing or shipping)
+     * @returns {Promise<boolean>} - Promise resolving to whether the postcode is valid
+     */
+    async validatePostcode( postcode, fieldName ) {
+        // Signal that validation is in progress
+        this.validationInProgress = true;
+        // Extract country value based on whether this is billing or shipping
+        const prefix       = fieldName.startsWith( 'billing_' ) ? 'billing' : 'shipping';
+        const countryField = document.getElementById( prefix + '_country' );
+        if ( ! countryField ) {
+            debugDirect( 'Country field not found for ' + fieldName, debugStatus );
+            this.validationInProgress = false;
+            return true; // Default to valid if the country cannot be found
+        }
+        const country = countryField.value;
+        // Generate a cache key using an address type, country and postcode
+        const cacheKey = prefix + ':' + country + ':' + postcode;
+        // Check if this postcode has already been validated for this country and address type
+        if ( this.validatedPostcodesCache.hasOwnProperty( cacheKey ) ) {
+            debugDirect( 'Using cached validation result for postcode: ' + postcode + ' in country: ' + country + ' for ' + prefix + ' address', debugStatus, 'log' );
+            this.validationInProgress = false;
+            return this.validatedPostcodesCache[cacheKey];
+        }
+        try {
+            // Return a promise that resolves with a validation result
+            return await new Promise(
+                ( resolve ) => {
+                    // Create data for AJAX request similar to WooCommerce's update_order_review
+                    const data = {
+                        action: 'multisafepay_validate_postcode',
+                        security: multisafepayParams.nonce,
+                        postcode: postcode,
+                        country: country
+                    };
+                    debugDirect( 'Validating postcode via AJAX: ' + postcode + ' for country: ' + country + ' for ' + prefix + ' address', debugStatus, 'log' );
+                    // Send AJAX request to validate postcode
+                    jQuery.ajax(
+                    {
+                        type: 'POST',
+                        url: multisafepayParams.location,
+                        data: data,
+                        success: function ( response ) {
+                            let isValid = false;
+                            if ( response.success ) {
+                                isValid = true;
+                            }
+                            // Cache the validation result
+                            this.validatedPostcodesCache[cacheKey] = isValid;
+                            debugDirect( 'Postcode validation result via Ajax for ' + prefix + ' address: ' + postcode + ': ' + ( isValid ? 'valid' : 'invalid' ), debugStatus, 'log' );
+                            // Signal that validation is complete
+                            this.validationInProgress = false;
+                            resolve( isValid );
+                        }.bind( this ),
+                        error: function () {
+                            debugDirect( 'Error validating postcode via AJAX', debugStatus );
+                            this.validationInProgress = false;
+                            resolve( true ); // Default to valid on error
+                        }.bind( this )
+                    }
+                    );
+                }
+            );
+        } catch ( error ) {
+            debugDirect( 'Exception validating postcode: ' + error, debugStatus );
+            this.validationInProgress = false;
+            return true; // Default to valid on error
+        }
+    }
+    /**
+     * Validate special fields like email and postcodes
+     *
+     * @param {HTMLElement} element - The element to be validated
+     * @param labelText - The label text for the field
+     * @returns {Promise<boolean>} - Whether the field is valid or not
+     */
+    async validateSpecialFields( element, labelText ) {
+        const fieldName  = element.name.trim();
+        const fieldValue = element.value.trim();
+        // Get the field container element
+        const getFieldId = document.getElementById( fieldName + '_field' );
+        let isValid      = true;
+        let errorMessage = '';
+        // Check if this is one of the fields we need to specifically validate
+        if ( fieldName === 'billing_email' ) {
+            // Validate email format
+            if ( ! this.validateEmail( fieldValue ) ) {
+                isValid      = false;
+                errorMessage = labelText + ' is not a valid address and ';
+            }
+        } else if ( fieldName === 'billing_postcode' || fieldName === 'shipping_postcode' ) {
+            // Validate postcode via AJAX
+            isValid = await this.validatePostcode( fieldValue, fieldName );
+            if ( ! isValid ) {
+                // If labelText is empty, get it from the cache or fall back to default
+                if ( ! labelText || labelText.trim() === '' ) {
+                    labelText = this.getLabelText( fieldName );
+                    // If still empty, fallback to default
+                    if ( ! labelText || labelText.trim() === '' ) {
+                        const type = fieldName.startsWith( 'billing_' ) ? 'Billing' : 'Shipping';
+                        labelText  = type + ' Postcode / ZIP';
+                    }
+                }
+                errorMessage = labelText + ' is not valid for the selected country';
+            }
+        }
+        // Apply validation results
+        if ( isValid ) {
+            this.removeErrorMessage( fieldName, true );
+            this.removeInlineError( fieldName );
+            element.style.cssText = '';
+            ['aria-invalid', 'aria-describedby'].forEach( attr => element.removeAttribute( attr ) );
+            getFieldId.classList.remove( 'woocommerce-invalid', 'woocommerce-invalid-required-field', 'woocommerce-invalid-email' );
+            getFieldId.classList.add( 'woocommerce-validated' );
+        } else {
+            const errorId = fieldName + '_error';
+            // For the top error banner - use the same message format
+            this.appendErrorMessage( [{ field: fieldName, label: errorMessage }], true );
+            // For inline errors, add a period at the end for postcode errors
+            let inlineErrorMessage = errorMessage;
+            if ( fieldName === 'billing_postcode' || fieldName === 'shipping_postcode' ) {
+                inlineErrorMessage = errorMessage + '.';
+            }
+            this.addInlineError( fieldName, inlineErrorMessage, errorId );
+            element.setAttribute( 'aria-invalid', 'true' );
+            element.setAttribute( 'aria-describedby', errorId );
+            element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+            getFieldId.classList.remove( 'woocommerce-validated' );
+            getFieldId.classList.add( 'woocommerce-invalid' );
+            if ( fieldName.includes( 'email' ) ) {
+                getFieldId.classList.add( 'woocommerce-invalid-email' );
+            }
+        }
+        return isValid;
+    }
+    /**
+     * Add an inline error message below a field
+     *
+     * @param {string} fieldName - The name of the field
+     * @param {string} errorMessage - The error message
+     * @param {string} errorId - The ID for the error element (for aria-describedby)
+     * @returns {void}
+     */
+    addInlineError( fieldName, errorMessage, errorId ) {
+        // Get the field element
+        const fieldElement = document.querySelector(
+            'input[name="' + fieldName + '"],' +
+            'select[name="' + fieldName + '"],' +
+            'textarea[name="' + fieldName + '"]'
+        );
+        if ( ! fieldElement ) {
+            return;
+        }
+        // Remove any existing inline error
+        this.removeInlineError( fieldName );
+        // Create an inline error message
+        const errorElement = document.createElement( 'p' );
+        errorElement.setAttribute( 'id', errorId );
+        errorElement.className   = 'checkout-inline-error-message';
+        errorElement.textContent = errorMessage;
+        // Add to a parent element
+        const formRow = fieldElement.closest( '.form-row' );
+        if ( formRow ) {
+            formRow.appendChild( errorElement );
+        }
+    }
+    /**
+     * Remove inline error message
+     *
+     * @param {string} fieldName - The name of the field
+     * @returns {void}
+     */
+    removeInlineError( fieldName ) {
+        // Get the field element
+        const fieldElement = document.querySelector(
+            'input[name="' + fieldName + '"],' +
+            'select[name="' + fieldName + '"],' +
+            'textarea[name="' + fieldName + '"]'
+        );
+        if ( ! fieldElement ) {
+            return;
+        }
+        // Remove any existing inline error
+        const formRow = fieldElement.closest( '.form-row' );
+        if ( formRow ) {
+            const errorElement = formRow.querySelector( '.checkout-inline-error-message' );
+            if ( errorElement ) {
+                errorElement.remove();
+            }
+        }
+        // Remove aria attributes
+        ['aria-invalid', 'aria-describedby'].forEach( attr => fieldElement.removeAttribute( attr ) );
+    }
 …
+     *
      * @param element - The element to be validated
+     * @returns {void}
      */
     realtimeValidation( element ) {
+        const fieldName = element.name.trim();
+        const fieldName  = element.name.trim();
+        const fieldValue = element.value.trim();
         // Remove this field from processedFields if it's there
 …
+        }
+        if ( element.value.trim() !== '' ) {
+        // Get the field container element
+        const getFieldId = document.getElementById( fieldName + '_field' );
+        const labelText  = this.getLabelText( fieldName );
+        // If empty and required, show the required error
+        if ( fieldValue === '' ) {
+            if ( ( labelText !== '' ) && getFieldId && getFieldId.classList.contains( 'validate-required' ) ) {
+                const errorId      = fieldName + '_error';
+                const errorMessage = labelText + ' is a required field';
+                this.appendErrorMessage( [{ field: fieldName, label: labelText }], true );
+                this.addInlineError( fieldName, errorMessage, errorId );
+                // Using the same error style as WooCommerce
+                element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+                element.setAttribute( 'aria-invalid', 'true' );
+                element.setAttribute( 'aria-describedby', errorId );
+                getFieldId.classList.remove( 'woocommerce-validated' );
+                getFieldId.classList.add( 'woocommerce-invalid', 'woocommerce-invalid-required-field' );
+            }
+            return;
+        }
+        // For non-empty fields with specific validation needs, validate them
+        if ( fieldName === 'billing_email' ) {
+            this.validateSpecialFields( element, labelText ).catch(
+                error => {
+                    debugDirect( 'Error validating specific field: ' + error, debugStatus );
+                }
+            );
+        } else {
+            // For other fields that were filled in, remove any error messages
             this.removeErrorMessage( fieldName, true );
+            this.removeInlineError( fieldName );
             element.style.cssText = '';
+        } else {
+            const labelText = this.getLabelText( fieldName );
+            // Any field name has an associated ID with the suffix '_field'
+            const getFieldId = document.getElementById( fieldName + '_field' );
+            // If the label text is not empty and field is required
+            if ( (labelText !== '') && getFieldId.classList.contains( 'validate-required' ) ) {
+                this.appendErrorMessage( [{ field: fieldName, label: labelText }], true );
+            }
+            // Using the same error style as WooCommerce
+            element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+        }
+    }
+    /**
+     * Validate all the fields with the class 'validate-required'
+     * inside the element with the id 'customer_details'
+     *
+     * @returns {boolean}
+     */
+    checkFields() {
+        // Clear the processedFields array at the start of validation
+        this.processedFields.length = 0;
+            getFieldId.classList.remove( 'woocommerce-invalid', 'woocommerce-invalid-required-field' );
+            getFieldId.classList.add( 'woocommerce-validated' );
+        }
+    }
+    /**
+     * Setup validation listeners for postcode fields
+     *
+     * @param element - The element to setup listeners for
+     * @returns {void}
+     */
+    setupPostcodeValidation( element ) {
+        const fieldName = element.name.trim();
+        // Get the label text for the field from our cache
+        const labelText = this.getLabelText( fieldName );
+        // Setup change event handler for postcodes
+        element._changeHandler = () => {
+            debugDirect( 'Validating postcode on change: ' + fieldName, debugStatus, 'log' );
+            this.validateSpecialFields( element, labelText )
+                .catch(
+                    error => {
+                        debugDirect( 'Error validating postcode: ' + error, debugStatus, 'error' );
+                    }
+                );
+        };
+        element.addEventListener( 'change', element._changeHandler );
+        // Remove any previous focusout handler
+        if ( element._focusoutHandler ) {
+            element.removeEventListener( 'focusout', element._focusoutHandler );
+            element._focusoutHandler = null;
+        }
+    }
+    /**
+     * Add event listeners to all required fields
+     *
+     * @returns {void}
+     */
+    setupValidationListeners() {
         // Getting the customer details element which includes all the user fields
         const customerDetails = document.getElementById( 'customer_details' );
+        // Getting all the fields with the class 'validate-required' so we can loop through them
+        if ( ! customerDetails ) {
+            return;
+        }
+        // Getting all the fields with the class 'validate-required'
         const selectWrappers = customerDetails.querySelectorAll( '.validate-required' );
+        // Check if the element is visible
+        const isElementVisible = element => element && element.offsetParent !== null;
+        // Are all fields valid? For now, yes
+        let allFieldsValid = true;
+        // Loop through all the fields with the class 'validate-required'
         selectWrappers.forEach(
             wrapper => {
+                // Getting all the fields inside the wrapper including input, text-areas and selects
+                const elements = wrapper.querySelectorAll( 'input, textarea, select' );
+                // Loop through all the fields inside the wrapper
+                // Getting all the fields inside the wrapper
+                const elements          = wrapper.querySelectorAll( 'input, textarea, select' );
                 elements.forEach(
                     element => {
-                        // Remove existing listener and add a new one
-                        element.removeEventListener( 'input', event => this.realtimeValidation( event.target ) );
-                        element.addEventListener( 'input', event => this.realtimeValidation( event.target ) );
                         const fieldName = element.name.trim();
+                        // Initial validation logic: if the field is empty and visible
+                        if ( ! element.value.trim() && ( isElementVisible( element ) || element.type === 'hidden' ) ) {
+                            const labelText = this.getLabelText( fieldName );
+                            if ( labelText !== '' ) {
+                                this.appendErrorMessage( [{ field: fieldName, label: labelText }] );
+                            }
+                            // Not all fields are valid
+                            allFieldsValid = false;
+                            // Add a different error style to the field if it's a Select2 or input,
+                            // using the same error style as WooCommerce
+                            const select2Container = element.tagName.toLowerCase() === 'select' ? wrapper.querySelector( '.select2-selection' ) : null;
+                            if ( select2Container ) {
+                                select2Container.style.cssText = 'border: 2px solid #e2401c !important;';
+                            } else {
+                                element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+                            }
+                        // Remove any existing listeners first
+                        element.removeEventListener( 'input', element._inputHandler );
+                        element.removeEventListener( 'change', element._changeHandler );
+                        element.removeEventListener( 'focusout', element._focusoutHandler );
+                        // For postcodes, use only change event instead of input
+                        if ( fieldName === 'billing_postcode' || fieldName === 'shipping_postcode' ) {
+                            this.setupPostcodeValidation( element );
                         } else {
+                            this.removeErrorMessage( fieldName );
+                            element.style.cssText = '';
+                            // For all other fields, use the input event for real-time validation
+                            element._inputHandler = event => this.realtimeValidation( event.target );
+                            element.addEventListener( 'input', element._inputHandler );
+                            // Add focusout handler for all fields
+                            element._focusoutHandler = event => this.realtimeValidation( event.target );
+                            element.addEventListener( 'focusout', element._focusoutHandler );
+                        }
+                    }
 …
+            }
         );
+    }
+    /**
+     * Validate a specific postcode field
+     *
+     * @param {HTMLElement} postcodeElement - The postcode input element
+     * @param {string} labelText - The label text for the field
+     * @returns {Promise<boolean>} - Promise resolving to whether validation pass
+     */
+    async sharedPostcodeValidation( postcodeElement, labelText ) {
+        const fieldName = postcodeElement.name.trim();
+        // Start validation
+        this.validationInProgress = true;
+        // Validate the field
+        const isValid = await this.validateSpecialFields( postcodeElement, labelText );
+        // Update field styling if invalid
+        if ( ! isValid ) {
+            const postcodeField = document.getElementById( fieldName + '_field' );
+            if ( postcodeField ) {
+                postcodeField.classList.remove( 'woocommerce-validated' );
+                postcodeField.classList.add( 'woocommerce-invalid' );
+            }
+        }
+        return isValid;
+    }
+    /**
+     * Validate all the fields with the class 'validate-required'
+     * inside the element with the id 'customer_details'
+     *
+     * @returns {Promise<boolean>}
+     */
+    async checkFields() {
+        // Early check - if validation is in progress, block payment
+        if ( this.validationInProgress ) {
+            debugDirect( 'Blocking payment: Validation in progress', debugStatus, 'log' );
+            return false;
+        }
+        // Clear any existing errors from previous validations
+        this.clearAllErrors();
+        // Clear the processedFields array at the start of validation
+        this.processedFields.length = 0;
+        // Getting the customer details element which includes all the user fields
+        const customerDetails = document.getElementById( 'customer_details' );
+        if ( ! customerDetails ) {
+            debugDirect( 'Customer details element not found', debugStatus, 'error' );
+            return false;
+        }
+        // Are all fields valid? For now, yes
+        let allFieldsValid = true;
+        // STEP 1: Check all empty required fields first
+        // Getting all the fields with the class 'validate-required'
+        const requiredFields = customerDetails.querySelectorAll( '.validate-required' );
+        debugDirect( 'Found ' + requiredFields.length + ' required fields', debugStatus, 'log' );
+        // First pass: Validate empty required fields
+        requiredFields.forEach(
+            wrapper => {
+                // Getting all the input elements inside the wrapper
+                const elements      = wrapper.querySelectorAll( 'input, textarea, select' );
+                elements.forEach(
+                element => {
+                    const fieldName = element.name.trim();
+                    if ( ! fieldName ) {
+                        return; // Skip elements without a name
+                    }
+                    // If the field is visible (or hidden) and is empty
+                    if ( this.isElementVisible( element ) || element.type === 'hidden' ) {
+                        if ( ! element.value.trim()) {
+                            const labelText = this.getLabelText( fieldName );
+                            if ( labelText ) {
+                                const errorId      = fieldName + '_error';
+                                const errorMessage = labelText + ' is a required field';
+                                // Add an error message to the top of the page
+                                this.appendErrorMessage( [{ field: fieldName, label: labelText }], true );
+                                // Add inline error
+                                this.addInlineError( fieldName, errorMessage, errorId );
+                                // Invalid field styling
+                                element.setAttribute( 'aria-invalid', 'true' );
+                                element.setAttribute( 'aria-describedby', errorId );
+                                // Add different error style depending on an element type
+                                const select2Container = element.tagName.toLowerCase() === 'select' ?
+                                wrapper.querySelector( '.select2-selection' ) : null;
+                                if ( select2Container ) {
+                                    select2Container.style.cssText = 'border: 2px solid #e2401c !important;';
+                                } else {
+                                    element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+                                }
+                                // Update wrapper classes
+                                wrapper.classList.remove( 'woocommerce-validated' );
+                                wrapper.classList.add( 'woocommerce-invalid', 'woocommerce-invalid-required-field' );
+                                // Not all fields are valid
+                                allFieldsValid = false;
+                                debugDirect( 'Field is required but empty: ' + fieldName, debugStatus, 'log' );
+                            }
+                        }
+                    }
+                }
+                );
+            }
+        );
+        // STEP 2: Special validation for email and postcode
+        // Setup validation listeners
+        this.setupValidationListeners();
+        // Explicitly check special fields (email and postcodes)
+        const billingEmail     = document.querySelector( '[name="billing_email"]' );
+        const billingPostcode  = document.querySelector( '[name="billing_postcode"]' );
+        const shippingPostcode = document.querySelector( '[name="shipping_postcode"]' );
+        // Flag to track if we need to wait for validations
+        let pendingValidation = false;
+        // Array to track validation promises
+        const validationPromises = [];
+        // Validate billing_email
+        if ( billingEmail && this.isElementVisible( billingEmail ) && billingEmail.value.trim() !== '' ) {
+            const labelText = this.getLabelText( 'billing_email' );
+            // Check the email format synchronously
+            if ( ! this.validateEmail( billingEmail.value.trim() )) {
+                allFieldsValid          = false;
+                const billingEmailField = document.getElementById( 'billing_email_field' );
+                const errorId           = 'billing_email_error';
+                const errorMessage      = labelText + ' is not a valid email address';
+                // Add an error message to the top of the page
+                this.appendErrorMessage( [{ field: 'billing_email', label: labelText + ' is not a valid email address and ' }], true );
+                // Add inline error
+                this.addInlineError( 'billing_email', errorMessage, errorId );
+                billingEmail.setAttribute( 'aria-invalid', 'true' );
+                billingEmail.setAttribute( 'aria-describedby', errorId );
+                billingEmail.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+                if ( billingEmailField ) {
+                    billingEmailField.classList.remove( 'woocommerce-validated' );
+                    billingEmailField.classList.add( 'woocommerce-invalid', 'woocommerce-invalid-email' );
+                }
+            } else {
+                // Email is valid, remove any error messages
+                const billingEmailField = document.getElementById( 'billing_email_field' );
+                this.removeErrorMessage( 'billing_email', true );
+                this.removeInlineError( 'billing_email' );
+                billingEmail.style.cssText = '';
+                ['aria-invalid', 'aria-describedby'].forEach( attr => billingEmail.removeAttribute( attr ) );
+                if ( billingEmailField ) {
+                    billingEmailField.classList.remove( 'woocommerce-invalid', 'woocommerce-invalid-required-field', 'woocommerce-invalid-email' );
+                    billingEmailField.classList.add( 'woocommerce-validated' );
+                }
+            }
+        }
+        // Check billing postcode
+        if ( billingPostcode && this.isElementVisible( billingPostcode ) && billingPostcode.value.trim() !== '' ) {
+            pendingValidation    = true;
+            const labelText      = this.getLabelText( 'billing_postcode' );
+            const billingPromise = this.sharedPostcodeValidation( billingPostcode, labelText )
+                .then(
+                    isValid => {
+                        if ( ! isValid ) {
+                            allFieldsValid = false;
+                        }
+                        return isValid;
+                    }
+                );
+            validationPromises.push( billingPromise );
+        }
+        // Check shipping postcode
+        if ( shippingPostcode && this.isElementVisible( shippingPostcode ) && shippingPostcode.value.trim() !== '' ) {
+            pendingValidation     = true;
+            const labelText       = this.getLabelText( 'shipping_postcode' );
+            const shippingPromise = this.sharedPostcodeValidation( shippingPostcode, labelText )
+                .then(
+                    isValid => {
+                        if ( ! isValid ) {
+                            allFieldsValid = false;
+                        }
+                        return isValid;
+                    }
+                );
+            validationPromises.push( shippingPromise );
+        }
+        // If there are pending validations, wait for them to complete
+        if ( pendingValidation ) {
+            debugDirect(
+                'Waiting for ' + validationPromises.length + ' pending validation' +
+                ( validationPromises.length === 1 ? '' : 's' ) + ' to complete',
+                debugStatus,
+                'log'
+            );
+            try {
+                await Promise.all( validationPromises );
+                debugDirect( 'All validations for special fields were completed', debugStatus, 'log' );
+            } catch ( error ) {
+                debugDirect( 'Error during special fields validation: ' + error, debugStatus, 'error' );
+                allFieldsValid = false;
+            } finally {
+                this.validationInProgress = false;
+            }
+        }
+        // Final check - ensure no validation is in progress
+        if ( this.validationInProgress ) {
+            debugDirect( 'Blocking payment: Validation still in progress at the end of checks', debugStatus, 'log' );
+            return false;
+        }
         // Scroll to the previously added notice group area if there are any errors
 …
             this.scrollToElement( '.entry-content' );
+        }
+        debugDirect( 'Final validation result: ' + ( allFieldsValid ? 'Valid' : 'Invalid' ), debugStatus, 'log' );
         return allFieldsValid;
+    }
     /**
+     * Clear all error messages and validation states
+     *
+     * @returns {void}
+     */
+    clearAllErrors() {
+        // Remove the entire notice group
+        const noticeGroup = document.querySelector( '.woocommerce-NoticeGroup-checkout' );
+        if ( noticeGroup ) {
+            noticeGroup.remove();
+            debugDirect( 'Cleared all error messages', debugStatus, 'log' );
+        }
+        // Remove all inline errors
+        const inlineErrors = document.querySelectorAll( '.checkout-inline-error-message' );
+        inlineErrors.forEach( error => error.remove() );
+    }
+    /**
      * Scroll to a specific class element in the document.
+     *
      * @param {string} className - The class name of the element to scroll to.
+     * @returns {void}
      */
     scrollToElement( className ) {
 …
+        }
+        // Make sure we have a valid error object
+        if ( ! error || ! error[0] || ! error[0].field ) {
+            debugDirect( 'Invalid error object passed to appendErrorMessage', debugStatus );
+            return;
+        }
         // Create the notice group using the WooCommerce style, where the errors will be built using JS vanilla,
         // so PHPCS doesn't complain if HTML code is used because the opening and closing of tags <>
+        // so PHPCS doesn't complain if HTML code is used because of the opening and closing of tags <>
         let noticeGroup = document.querySelector( '.woocommerce-NoticeGroup-checkout' );
         if ( ! noticeGroup ) {
 …
             noticeBanner.className = 'woocommerce-error';
             noticeBanner.setAttribute( 'role', 'alert' );
-            const contentDiv     = document.createElement( 'div' );
-            contentDiv.className = 'wc-block-components-notice-banner__content';
-            const summaryParagraph       = document.createElement( 'p' );
-            summaryParagraph.className   = 'wc-block-components-notice-banner__summary';
-            summaryParagraph.textContent = 'The following problems were found:';
-            contentDiv.appendChild( summaryParagraph );
-            const ulElement = document.createElement( 'ul' );
-            contentDiv.appendChild( ulElement );
-            noticeBanner.appendChild( contentDiv );
             noticeGroup.appendChild( noticeBanner );
+        }
         const ulList = noticeGroup.querySelector( 'ul' );
+        // Check if an error message for this field already exists, therefore, is not added again
+        if ( ! ulList ) {
+            debugDirect( 'Error banner not found', debugStatus );
+            return;
+        }
+        // Check if an error message for this field already exists
         const existingErrorItem = ulList.querySelector( 'li[data-id="' + error[0].field + '"]' );
         if ( existingErrorItem ) {
+            return;
+            // If we're in real-time validation, update the existing error message
+            if ( isRealtimeValidation ) {
+                debugDirect( 'Updating existing error message for field: ' + error[0].field, debugStatus, 'log' );
+                // Remove the existing error so we can add an updated one
+                existingErrorItem.remove();
+            } else {
+                // If not in real-time validation, just leave the existing error
+                return;
+            }
+        }
 …
         const errorItem = document.createElement( 'li' );
         errorItem.setAttribute( 'data-id', error[0].field );
+        errorItem.style.display = 'block'; // Ensure it's visible
+        // Create the complete error message with formatting
+        const errorLink                = document.createElement( 'a' );
+        errorLink.href                 = '#' + error[0].field;
+        errorLink.style.textDecoration = 'none'; // Don't show underline on the text
+        // Create a strong element for the field name/error
         const strongElement = document.createElement( 'strong' );
+        // Add the label text to the error message
+        strongElement.textContent = error[0].label;
+        errorItem.appendChild( strongElement );
+        errorItem.append( ' is a required field.' );
+        // Set the text for the strong element based on the error
+        let errorText = error[0].label;
+        // Make sure we end with "and" if the error is about invalid format
+        if ( errorText.includes( 'is not valid' ) && ! errorText.endsWith( ' and' ) ) {
+            errorText += ' and';
+        }
+        strongElement.textContent = errorText;
+        // Determine the complete error message text
+        let fullErrorText;
+        if ( errorText.includes( 'is not valid' ) || errorText.includes( 'is not a valid' ) ) {
+            fullErrorText = ' is a required field.';
+        } else {
+            fullErrorText = ' is a required field.';
+        }
+        // Add the complete message to the link
+        errorLink.appendChild( strongElement );
+        errorLink.appendChild( document.createTextNode( fullErrorText ) );
+        // Add the link containing the full message to the error item
+        errorItem.appendChild( errorLink );
         // Add the error message to the notice group
         ulList.appendChild( errorItem );
+        // Add a click handler to focus the field when the error is clicked
+        errorLink.addEventListener(
+            'click',
+            ( event ) => {
+                event.preventDefault();
+                const fieldToFocus = document.querySelector( '[name="' + error[0].field + '"]' );
+                if ( fieldToFocus ) {
+                    fieldToFocus.focus();
+                }
+            }
+        );
+        // Make sure the notice group is visible and properly positioned
+        noticeGroup.style.display = 'block';
+        noticeGroup.style.margin  = '0 0 2em';
         debugDirect( ( isRealtimeValidation ? '"Interactively" a' : 'A' ) + 'dding error message in the notice group for field: ' + error[0].field, debugStatus, 'log' );
 …
                 // Getting the field name associated with the error message
                 const fieldElement = document.querySelector( '[name="' + fieldName + '"]' );
                 // Check if the fieldElement exists and is not hidden using CSS
                 const isFieldVisible = fieldElement && ( window.getComputedStyle( fieldElement ).display !== 'none' );
+                // Check if the fieldElement exists and is not hidden
+                const isFieldVisible = fieldElement && this.isElementVisible( fieldElement );
                 if ( ! isFieldVisible ) {
                     errorItem.remove();
 …
     removeEntireNoticeGroup() {
         // Check if there are no more error messages left
+        const errorList = document.querySelector( '.woocommerce-NoticeGroup-checkout ul' );
+        if ( errorList && ( errorList.children.length === 0 ) ) {
+            const noticeGroup = document.querySelector( '.woocommerce-NoticeGroup-checkout' );
+            if ( noticeGroup ) {
+        const noticeGroup = document.querySelector( '.woocommerce-NoticeGroup-checkout' );
+        if ( noticeGroup ) {
+            // Count elements with data-id attribute within the group
+            const errorItems = noticeGroup.querySelectorAll( 'li[data-id]' );
+            if ( errorItems.length === 0 ) {
                 noticeGroup.remove();
                 debugDirect( 'Removing the entire notice group as there are no more error messages left', debugStatus, 'log' );

multisafepay/tags/6.9.0/multisafepay.php

-                      r3269746
+                      r3306839
  * Plugin URI:              https://docs.multisafepay.com/docs/woocommerce
  * Description:             MultiSafepay Payment Plugin
  * Version:                 6.8.3
+ * Version:                 6.9.0
  * Author:                  MultiSafepay
  * Author URI:              https://www.multisafepay.com
 …
  * License URI:             http://www.gnu.org/licenses/gpl-3.0.html
  * Requires at least:       6.0
  * Tested up to:            6.7.2
+ * Tested up to:            6.8.1
  * WC requires at least:    6.0.0
  * WC tested up to:         9.7.1
+ * WC tested up to:         9.8.5
  * Requires PHP:            7.3
  * Text Domain:             multisafepay
 …
  * Plugin version
  */
 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.8.3' );
+define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.9.0' );
 /**

multisafepay/tags/6.9.0/readme.txt

-                      r3269746
+                      r3306839
 Tags: multisafepay, payment gateway, credit cards, ideal, bnpl
 Requires at least: 6.0
 Tested up to: 6.7.2
+Tested up to: 6.8.1
 Requires PHP: 7.3
 Stable tag: 6.8.3
+Stable tag: 6.9.0
 License: MIT
 …
 == Changelog ==
+= Release Notes - WooCommerce 6.9.0 (Jun 5th, 2025) =
+### Added
++ PLGWOOS-1003: Add zip code and email format validation to QR code implementation
++ PLGWOOS-1001: Improvement over QR code implementation validating checkout when"ship to a different address" is checked.
+### Fixed
++ PLGWOOS-1009: Fix Bancontact QR showing up even when it hasn’t been explicitly enabled
++ PLGWOOS-1007: Refund request based on amount is including the checkout data, even when it's not needed.
++ PLGWOOS-997: Validate zip code checkout fields to prevent payments via Wallets
++ PLGWOOS-1002: Payment Component shows "Store my details for future visits" field, when user is not logged in
++ PLGWOOS-999: Fix URL Parameter Concatenation in QR Payment Redirect Flow
++ PLGWOOS-1000: Remove unneeded get_customer_ip_address() and get_user_agent() methods in QrCustomerService
+### Changed
++ PLGWOOS-1005: Adjusting the minimum discrepancy allowed to filter Billink tax rates
++ PLGWOOS-1004: Adding shipping method name in the Order Request, instead of generic label "Shipping"
 = Release Notes - WooCommerce 6.8.3 (Apr 9th, 2025) =

multisafepay/tags/6.9.0/src/Main.php

-                      r3264984
+                      r3306839
 use MultiSafepay\WooCommerce\Services\Qr\QrPaymentComponentService;
 use MultiSafepay\WooCommerce\Services\Qr\QrPaymentWebhook;
+use MultiSafepay\WooCommerce\Services\ValidationService;
 use MultiSafepay\WooCommerce\Settings\SettingsController;
 use MultiSafepay\WooCommerce\Settings\ThirdPartyCompatibility;
 …
         $this->payment_components_qr_hooks();
         $this->callback_hooks();
+        $this->validation_hooks();
+    }
 …
     /**
+     * Register the hooks related to field validation
+     *
+     * @return void
+     */
+    public function validation_hooks(): void {
+        $validation_service = new ValidationService();
+        // Register AJAX action for zip code validation
+        $this->loader->add_action( 'wp_ajax_multisafepay_validate_postcode', $validation_service, 'validate_postcode' );
+        $this->loader->add_action( 'wp_ajax_nopriv_multisafepay_validate_postcode', $validation_service, 'validate_postcode' );
+    }
+    /**
      * Run the loader to execute the hooks with WordPress.
+     *

multisafepay/tags/6.9.0/src/PaymentMethods/Base/BasePaymentMethod.php

-                      r3264984
+                      r3306839
+        }
         $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'qr' ) );
+        $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'yes' ) );
         if ( ! isset( $settings['payment_component'] ) ) {
             return true;
+            return false;
+        }
         return 'qr' === $settings['payment_component'];
 …
+        }
         $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'qr_only' ) );
+        $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'yes' ) );
         if ( ! isset( $settings['payment_component'] ) ) {
             return true;
+            return false;
+        }
         return 'qr_only' === $settings['payment_component'];
 …
                 wp_enqueue_script( 'multisafepay-validator-wallets', MULTISAFEPAY_PLUGIN_URL . '/assets/public/js/multisafepay-validator-wallets.js', array( 'jquery' ), MULTISAFEPAY_PLUGIN_VERSION, true );
                 wp_enqueue_script( 'multisafepay-common-wallets', MULTISAFEPAY_PLUGIN_URL . '/assets/public/js/multisafepay-common-wallets.js', array( 'jquery' ), MULTISAFEPAY_PLUGIN_VERSION, true );
+                // Add parameters for validator wallets
+                wp_localize_script(
+                    'multisafepay-validator-wallets',
+                    'multisafepayParams',
+                    array(
+                        'location' => admin_url( 'admin-ajax.php' ),
+                        'nonce'    => wp_create_nonce( 'multisafepay_validator_nonce' ),
+                    )
+                );
                 $admin_url_array = array(
                     'location' => admin_url( 'admin-ajax.php' ),

multisafepay/tags/6.9.0/src/PaymentMethods/Base/BaseRefunds.php

-                      r3264984
+                      r3306839
         );
+        /** @var RefundRequest $refund_request */
+        $refund_request = $transaction_manager->createRefundRequest( $multisafepay_transaction );
+        if ( $multisafepay_transaction->requiresShoppingCart() ) {
+            /** @var RefundRequest $refund_request */
+            $refund_request = $transaction_manager->createRefundRequest( $multisafepay_transaction );
-        $refund_request->addDescriptionText( $reason );
-        if ( $multisafepay_transaction->requiresShoppingCart() ) {
             $refunds                 = $order->get_refunds();
             $refund_merchant_item_id = reset( $refunds )->id;
 …
         if ( ! $multisafepay_transaction->requiresShoppingCart() ) {
+            $refund_request = new RefundRequest();
+            $refund_request->addDescriptionText( $reason );
             $refund_request->addMoney( MoneyUtil::create_money( (float) $amount, $order->get_currency() ) );
+        }
 …
         } catch ( Exception | ClientExceptionInterface | ApiException $exception ) {
             $error = __( 'Error:', 'multisafepay' ) . htmlspecialchars( $exception->getMessage() );
+            $this->logger->log_error( $error );
+            wc_add_notice( $error, 'error' );
+            $this->logger->log_error( 'Error during refund: ' . $error . ' Refund request : ' . wp_json_encode( $refund_request->getData() ) );
+        }

multisafepay/tags/6.9.0/src/Services/PaymentComponentService.php

r3264984	r3306839
83	83
84	84	// Tokenization and recurring model
85		if ( $woocommerce_payment_gateway->is_tokenization_enabled() ) {
	85	if ( $woocommerce_payment_gateway->is_tokenization_enabled() && is_user_logged_in() ) {
86	86	$payment_component_arguments['recurring'] = array(
87	87	'model' => 'cardOnFile',

multisafepay/tags/6.9.0/src/Services/Qr/QrCustomerService.php

-                      r3264984
+                      r3306839
         );
+    }
-    /**
-     * Get the customer IP address.
+     *
-     * @return string
-     */
-    public function get_customer_ip_address(): string {
-        $possible_ip_sources = array(
-            'HTTP_CLIENT_IP',
-            'HTTP_X_FORWARDED_FOR',
-            'REMOTE_ADDR',
-        );
-        foreach ( $possible_ip_sources as $source ) {
-            if ( ! empty( $_SERVER[ $source ] ) ) {
-                return sanitize_text_field( wp_unslash( $_SERVER[ $source ] ) );
+            }
+        }
-        return '';
+    }
-    /**
-     * Get the user agent.
+     *
-     * @return string
-     */
-    public function get_user_agent(): string {
-        return sanitize_text_field( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ?? '' ) );
+    }
+}

multisafepay/tags/6.9.0/src/Services/Qr/QrOrderService.php

r3269746	r3306839
122	122	*/
123	123	public function create_payment_options( string $token ): PaymentOptions {
124		$redirect_cancel_url = ~~get_rest_url( get_current_blog_id(), 'multisafepay/v1/qr-balancer' ) . '?token=' . rawurlencode( $token~~ );
	124	$redirect_cancel_url = add_query_arg( 'token', $token, get_rest_url( get_current_blog_id(), 'multisafepay/v1/qr-balancer' ) );
125	125	$payment_options = new PaymentOptions();
126	126	$payment_options->addNotificationUrl( get_rest_url( get_current_blog_id(), 'multisafepay/v1/qr-notification' ) );

multisafepay/tags/6.9.0/src/Services/ShoppingCartService.php

-                      r3264984
+                      r3306839
 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\ShoppingCart\Item as CartItem;
 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\ShoppingCart\ShippingItem;
+use MultiSafepay\Exception\InvalidArgumentException;
 use MultiSafepay\WooCommerce\Utils\Hpos;
 use MultiSafepay\WooCommerce\Utils\Logger;
 …
      * @param string|null $gateway_code
      * @return ShoppingCart
+     * @throws InvalidArgumentException
      */
     public function create_shopping_cart( WC_Order $order, string $currency, ?string $gateway_code = '' ): ShoppingCart {
 …
      * @param string                 $gateway_code
      * @return ShippingItem
+     * @throws InvalidArgumentException
      */
     private function create_shipping_cart_item( WC_Order_Item_Shipping $item, string $currency, string $gateway_code ): ShippingItem {
+        $cart_item = new ShippingItem();
+        return $cart_item->addName( __( 'Shipping', 'multisafepay' ) )
+        $cart_item            = new ShippingItem();
+        $shipping_method_name = $item->get_method_title();
+        if ( empty( $shipping_method_name ) ) {
+            $shipping_method_name = __( 'Shipping', 'multisafepay' );
+        }
+        return $cart_item->addName( $shipping_method_name )
             ->addQuantity( 1 )
             ->addUnitPrice( MoneyUtil::create_money( (float) $item->get_total(), $currency ) )
 …
         foreach ( $allowed_rates as $rate ) {
             if ( abs( $tax_rate - $rate ) <= 0.15 ) {
+            if ( abs( $tax_rate - $rate ) <= 0.05 ) {
                 return round( $tax_rate );
+            }

multisafepay/tags/6.9.0/src/Utils/QrCheckoutManager.php

-                      r3264984
+                      r3306839
 use WC_Cart;
 use WC_Shipping_Rate;
+use WC_Validation;
 /**
 …
     /**
      * Check if all mandatory fields are filled in the checkout in order to submit a MultiSafepay transaction
+     * Check if all mandatory fields are filled in the checkout to submit a MultiSafepay transaction
      * using Payment Component with QR code.
+     *
 …
         // Get required and extra fields
         $required_fields = $this->get_required_fields();
         $extra_fields    = $this->get_extra_fields();
+        $billing_required_fields = $this->get_required_fields();
+        $billing_extra_fields    = $this->get_extra_fields();
         // Determine if shipping to a different address
 …
         // Get shipping fields if necessary
+        $shipping_fields = $ship_to_different_address ?
+            $this->get_shipping_fields( $required_fields, $extra_fields ) :
+            array();
+        $shipping_fields          = array();
+        $shipping_required_fields = array();
+        if ( $ship_to_different_address ) {
+            $shipping_fields          = $this->get_shipping_fields( $billing_required_fields, $billing_extra_fields );
+            $shipping_required_fields = $this->get_shipping_fields( $billing_required_fields, array() );
+        }
         // Combine all fields
+        $all_fields = array_merge( $required_fields, $extra_fields, $shipping_fields );
+        $all_fields = array_merge( $billing_required_fields, $billing_extra_fields, $shipping_fields );
+        // Combine all required fields
+        $all_required_fields = array_merge( $billing_required_fields, $shipping_required_fields );
         // Get order fields
 …
         // Process and validate fields
         $this->process_checkout_data( $all_fields, $required_fields, $order_fields );
+        $this->process_checkout_data( $all_fields, $all_required_fields, $order_fields );
         return $this->is_validated;
 …
      * Get the shipping fields based on required and extra fields.
+     *
      * @param array $required_fields The required fields.
      * @param array $extra_fields The extra fields.
      * @return array
      */
     public function get_shipping_fields( array $required_fields, array $extra_fields ): array {
+     * @param array $billing_required_fields The required fields.
+     * @param array $billing_extra_fields The extra fields.
+     * @return array
+     */
+    public function get_shipping_fields( array $billing_required_fields, array $billing_extra_fields ): array {
         return array_map(
             static function( $field ) {
 …
             },
             array_filter(
                 array_merge( $required_fields, $extra_fields ),
+                array_merge( $billing_required_fields, $billing_extra_fields ),
                 static function( $field ) {
                     // Exclude email and phone fields to be created as shipping fields.
 …
+     *
      * @param array $all_fields All fields to check.
      * @param array $required_fields The required fields.
+     * @param array $all_required_fields The required fields.
      * @param array $order_fields The order fields.
      */
     public function process_checkout_data( array $all_fields, array $required_fields, array $order_fields ): void {
+    public function process_checkout_data( array $all_fields, array $all_required_fields, array $order_fields ): void {
         $this->is_validated = true;
 …
             if ( 'billing_email' === $field ) {
                 $field_value = isset( $this->posted_data[ $field ] ) ? sanitize_email( wp_unslash( $this->posted_data[ $field ] ) ) : '';
+                // Verify the email format using PHP's built-in filter validation
+                if ( ! empty( $field_value ) && ! $this->validate_email( $field_value ) ) {
+                    $this->is_validated = false;
+                }
+            } elseif ( strpos( $field, '_postcode' ) !== false ) {
+                $field_value = isset( $this->posted_data[ $field ] ) ? wp_unslash( $this->posted_data[ $field ] ) : '';
+                $field_value = trim( wp_strip_all_tags( $field_value ) );
+                // Validate a postcode format if not empty
+                if ( ! empty( $field_value ) ) {
+                    $prefix  = strpos( $field, 'billing_' ) === 0 ? 'billing' : 'shipping';
+                    $country = isset( $this->posted_data[ $prefix . '_country' ] ) ? wp_unslash( $this->posted_data[ $prefix . '_country' ] ) : '';
+                    $country = trim( wp_strip_all_tags( $country ) );
+                    if ( ! $this->validate_postcode( $field_value, $country ) ) {
+                        $this->is_validated = false;
+                    }
+                }
             } else {
                 $field_value = isset( $this->posted_data[ $field ] ) ? wp_unslash( $this->posted_data[ $field ] ) : '';
 …
+            }
             // Check if required field is empty
             if ( empty( $field_value ) && in_array( $field, $required_fields, true ) ) {
+            // Check if the required field is empty
+            if ( empty( $field_value ) && in_array( $field, $all_required_fields, true ) ) {
                 $this->is_validated = false;
+            }
 …
+        }
+    }
+    /**
+     * Validate the email address format
+     *
+     * @param string $email The email to validate
+     * @return bool Whether the email is valid
+     */
+    private function validate_email( string $email ): bool {
+        return (bool) filter_var( $email, FILTER_VALIDATE_EMAIL );
+    }
+    /**
+     * Validate a postcode format using WooCommerce's validation
+     *
+     * @param string $postcode The postcode to validate
+     * @param string $country The country code
+     * @return bool Whether the postcode is valid
+     */
+    private function validate_postcode( string $postcode, string $country ): bool {
+        if ( ! WC_Validation::is_postcode( $postcode, $country ) ) {
+            return false;
+        }
+        return true;
+    }
+}

multisafepay/tags/6.9.0/vendor/autoload.php

r3269746	r3306839
15	15	}
16	16	}
17		trigger_error(
18		$err,
19		E_USER_ERROR
20		);
	17	throw new RuntimeException($err);
21	18	}
22	19
23	20	require_once __DIR__ . '/composer/autoload_real.php';
24	21
25		return ComposerAutoloaderInit~~4c82aacc71005aae20a63510a82d5e07~~::getLoader();
	22	return ComposerAutoloaderIniteb5be672a765e05cf872148d946d1d0b::getLoader();

multisafepay/tags/6.9.0/vendor/composer/InstalledVersions.php

-                      r3230524
+                      r3306839
 class InstalledVersions
+{
+    /**
+     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+     * @internal
+     */
+    private static $selfDir = null;
     /**
      * @var mixed[]|null
 …
     /**
+     * @return string
+     */
+    private static function getSelfDir()
+    {
+        if (self::$selfDir === null) {
+            self::$selfDir = strtr(__DIR__, '\\', '/');
+        }
+        return self::$selfDir;
+    }
+    /**
      * @return array[]
      * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
 …
         if (self::$canGetVendors) {
             $selfDir = strtr(__DIR__, '\\', '/');
+            $selfDir = self::getSelfDir();
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
                 $vendorDir = strtr($vendorDir, '\\', '/');

multisafepay/tags/6.9.0/vendor/composer/autoload_real.php

-                      r3269746
+                      r3306839
 // autoload_real.php @generated by Composer
 class ComposerAutoloaderInit4c82aacc71005aae20a63510a82d5e07
+class ComposerAutoloaderIniteb5be672a765e05cf872148d946d1d0b
+{
     private static $loader;
 …
         require __DIR__ . '/platform_check.php';
         spl_autoload_register(array('ComposerAutoloaderInit4c82aacc71005aae20a63510a82d5e07', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderIniteb5be672a765e05cf872148d946d1d0b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit4c82aacc71005aae20a63510a82d5e07', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderIniteb5be672a765e05cf872148d946d1d0b', 'loadClassLoader'));
         require __DIR__ . '/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInit4c82aacc71005aae20a63510a82d5e07::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticIniteb5be672a765e05cf872148d946d1d0b::getInitializer($loader));
         $loader->register(true);

multisafepay/tags/6.9.0/vendor/composer/autoload_static.php

-                      r3269746
+                      r3306839
 namespace Composer\Autoload;
 class ComposerStaticInit4c82aacc71005aae20a63510a82d5e07
+class ComposerStaticIniteb5be672a765e05cf872148d946d1d0b
+{
     public static $prefixLengthsPsr4 = array (
 …
+    {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit4c82aacc71005aae20a63510a82d5e07::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit4c82aacc71005aae20a63510a82d5e07::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit4c82aacc71005aae20a63510a82d5e07::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticIniteb5be672a765e05cf872148d946d1d0b::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticIniteb5be672a765e05cf872148d946d1d0b::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticIniteb5be672a765e05cf872148d946d1d0b::$classMap;
         }, null, ClassLoader::class);

multisafepay/tags/6.9.0/vendor/composer/installed.json

-                      r3264984
+                      r3306839
+        {
             "name": "multisafepay/php-sdk",
             "version": "5.16.0",
             "version_normalized": "5.16.0.0",
+            "version": "5.17.0",
+            "version_normalized": "5.17.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MultiSafepay/php-sdk.git",
                 "reference": "849f1cf0c5ae23819422db4f78db948fd590c4ec"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/849f1cf0c5ae23819422db4f78db948fd590c4ec",
                 "reference": "849f1cf0c5ae23819422db4f78db948fd590c4ec",
+                "reference": "4c46227cf3139d76ff08bc4191f06445c867798b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/4c46227cf3139d76ff08bc4191f06445c867798b",
+                "reference": "4c46227cf3139d76ff08bc4191f06445c867798b",
                 "shasum": ""
             },
 …
                 "jschaedl/iban-validation": "Adds additional IBAN validation for \\MultiSafepay\\ValueObject\\IbanNumber"
             },
             "time": "2025-03-19T15:29:14+00:00",
+            "time": "2025-06-04T13:12:21+00:00",
             "type": "library",
             "installation-source": "dist",
 …
             "support": {
                 "issues": "https://github.com/MultiSafepay/php-sdk/issues",
                 "source": "https://github.com/MultiSafepay/php-sdk/tree/5.16.0"
+                "source": "https://github.com/MultiSafepay/php-sdk/tree/5.17.0"
             },
             "install-path": "../multisafepay/php-sdk"

multisafepay/tags/6.9.0/vendor/composer/installed.php

-                      r3269746
+                      r3306839
     'root' => array(
         'name' => 'multisafepay/woocommerce',
         'pretty_version' => '6.8.3',
         'version' => '6.8.3.0',
+        'pretty_version' => '6.9.0',
+        'version' => '6.9.0.0',
         'reference' => null,
         'type' => 'wordpress-plugin',
 …
     'versions' => array(
         'multisafepay/php-sdk' => array(
             'pretty_version' => '5.16.0',
             'version' => '5.16.0.0',
             'reference' => '849f1cf0c5ae23819422db4f78db948fd590c4ec',
+            'pretty_version' => '5.17.0',
+            'version' => '5.17.0.0',
+            'reference' => '4c46227cf3139d76ff08bc4191f06445c867798b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../multisafepay/php-sdk',
 …
         ),
         'multisafepay/woocommerce' => array(
             'pretty_version' => '6.8.3',
             'version' => '6.8.3.0',
+            'pretty_version' => '6.9.0',
+            'version' => '6.9.0.0',
             'reference' => null,
             'type' => 'wordpress-plugin',

multisafepay/tags/6.9.0/vendor/multisafepay/php-sdk/CHANGELOG.md

-                      r3264984
+                      r3306839
 ## [Unreleased]
+## [5.17.0] - 2025-06-04
+### Added
+- PHPSDK-172: Add BILLINK to SHOPPING_CART_REQUIRED_GATEWAYS constant
+### Fixed
+- PHPSDK-173: Fix typo in \MultiSafepay\Api\Transactions\OrderRequest\Arguments\GatewayInfo\Creditcard object
+- PHPSDK-174: Fix UnitPrice sometimes having more than 10 decimals
 ## [5.16.0] - 2025-03-19

multisafepay/tags/6.9.0/vendor/multisafepay/php-sdk/composer.json

r3264984	r3306839
4	4	"type": "library",
5	5	"license": "MIT",
6		"version": "5.16.0",
	6	"version": "5.17.0",
7	7	"require": {
8	8	"php": "^7.2\|^8.0",

multisafepay/tags/6.9.0/vendor/multisafepay/php-sdk/src/Api/Transactions/Gateways.php

r3072171	r3306839
27	27	'BNPL_OB',
28	28	'BNPL_MF',
	29	'BILLINK',
29	30	);
30	31	}

multisafepay/tags/6.9.0/vendor/multisafepay/php-sdk/src/Api/Transactions/OrderRequest/Arguments/GatewayInfo/Creditcard.php

-                      r3050467
+                      r3306839
         return [
             'card_number' => $this->cardNumber ? $this->cardNumber->get() : null,
             'cart_holder_name' => $this->cardHolderName,
             'cart_expiry_date' => $this->cardExpiryDate ? $this->cardExpiryDate->get('my') : null,
+            'card_holder_name' => $this->cardHolderName,
+            'card_expiry_date' => $this->cardExpiryDate ? $this->cardExpiryDate->get('ym') : null,
             'cvc' => $this->cvc ? $this->cvc->get() : null,
             'card_cvc' => $this->cvc ? $this->cvc->get() : null,

multisafepay/tags/6.9.0/vendor/multisafepay/php-sdk/src/Util/Version.php

r3264984	r3306839
18	18	class Version
19	19	{
20		public const SDK_VERSION = '5.16.0';
	20	public const SDK_VERSION = '5.17.0';
21	21
22	22	/**

multisafepay/tags/6.9.0/vendor/multisafepay/php-sdk/src/ValueObject/CartItem.php

-                      r3264984
+                      r3306839
+    {
         if ($this->unitPrice) {
             return $this->unitPrice->getAmount() / 100;
+        }
         return $this->unitPriceValue->get() ?? 0.0;
+            return round($this->unitPrice->getAmount() / 100, 10);
+        }
+        return round(($this->unitPriceValue->get() ?? 0.0), 10);
+    }

multisafepay/tags/6.9.0/vendor/multisafepay/php-sdk/src/ValueObject/UnitPrice.php

r3230524	r3306839
15	15
16	16	/**
17		* Should be given in full units excluding tax, preferably including ~~all decimal places~~, e.g. 3.305785124
	17	* Should be given in full units excluding tax, preferably including 10 decimal at most, e.g. 3.305785124
18	18	*
19	19	* @param float $unitPrice

multisafepay/trunk/assets/public/js/multisafepay-apple-pay-wallet.js

-                      r3048898
+                      r3306839
         this._sessionActive = false;
+        /**
+         * Flag to track if a session has been aborted
+         *
+         * @type {boolean}
+         * @private
+         */
+        this._sessionAborted = false;
         this.init()
             .then(
 …
      * Event handler for Apple Pay button click
+     *
+     * @returns {Promise<void>}
+     */
+    onApplePaymentButtonClicked = async() => {
+     * @returns {void}
+     */
+    onApplePaymentButtonClicked = () => {
+        // Check if a session is already active
+        if ( this.isSessionActive() ) {
+            debugDirect( 'Apple Pay session was already activated', this.debug, 'log' );
+            // Force reset session status to allow retry
+            this.setSessionStatus( false );
+            this._sessionAborted = false;
+            return;
+        }
         try {
+            await this.beginApplePaySession();
+        } catch ( error ) {
+            console.error( 'Error starting Apple Pay session when button is clicked:', error );
+            this.setSessionStatus( false );
+        }
+    }
+    /**
+     * Create Apple Pay button
+     *
+     * @returns {Promise<void>}
+     */
+    async createApplePayButton()
+    {
+        // Check if previous buttons already exist and remove them
+        cleanUpDirectButtons();
+        const buttonContainer = document.getElementById( 'place_order' ).parentElement;
+        if ( ! buttonContainer ) {
+            debugDirect( 'Button container not found', this.debug );
+            return;
+        }
+        // Features of the button
+        const buttonTag        = document.createElement( 'button' );
+        buttonTag.className    = 'apple-pay-button apple-pay-button-black';
+        buttonTag.style.cursor = 'pointer';
+        buttonContainer.addEventListener(
+            'click',
+            (
+                event ) => {
+                    this.onApplePaymentButtonClicked();
+                    // Avoid that WordPress submits the form
+                    event.preventDefault();
+                }
+        );
+        // Append the button to the div
+        buttonContainer.appendChild( buttonTag );
+    }
+    /**
+     * Create the Apple Pay payment request object and session
+     *
+     * Some variables from the global scope are launched from
+     * the internal code of Prestashop
+     *
+     * @returns {Promise<void>}
+     */
+    async beginApplePaySession()
+    {
+        try {
+            const validatorInstance = new FieldsValidator();
+            const fieldsAreValid    = validatorInstance.checkFields();
+            if ( ! fieldsAreValid ) {
+                debugDirect( 'Not all mandatory fields were filled out', this.debug, 'warn' );
+                return;
+            }
+            if ( this.isSessionActive() ) {
+                debugDirect( 'Apple Pay session was already activated', this.debug, 'log' );
+                return;
+            }
+            // Create the payment request object
+            // Create the payment request object first
             const paymentRequest = {
                 countryCode: configApplePay.countryCode,
 …
             };
             // Create the session and handle the events
+            // Create the session immediately in the click handler
             const session = new ApplePaySession( this.config.applePayVersion, paymentRequest );
             if ( session ) {
+                // Reset the aborted flag
+                this._sessionAborted = false;
+                // Setup event handlers
                 session.onvalidatemerchant  = ( event ) => this.handleValidateMerchant( event, session );
                 session.onpaymentauthorized = ( event ) => this.handlePaymentAuthorized( event, session );
                 session.oncancel            = ( event ) => this.handleCancel( event, session );
+                session.begin();
+                // Set session as active
                 this.setSessionStatus( true );
+                // Validate fields before beginning the session
+                this.validateFieldsBeforeSession( session );
+            }
         } catch ( error ) {
             console.error( 'Error starting Apple Pay session:', error );
+            console.error( 'Error starting Apple Pay session when button is clicked:', error );
             this.setSessionStatus( false );
+        }
+    }
+    /**
+     * Fetch merchant session data from MultiSafepay
+     *
+     * @param {string} validationURL
+     * @param {string} originDomain
+     * @returns {Promise<object>}
+     */
+    async fetchMerchantSession(validationURL, originDomain)
+    {
+        const data = new URLSearchParams();
+        data.append( 'action', 'applepay_direct_validation' );
+        data.append( 'validation_url', validationURL );
+        data.append( 'origin_domain', originDomain );
+        const response = await fetch(
+            this.config.multiSafepayServerScript,
+            {
+                method: 'POST',
+                body: data,
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+            }
+        );
+        return JSON.parse( await response.json() );
+            this._sessionAborted = false;
+        }
+    }
+    /**
+     * Validate fields before beginning the Apple Pay session
+     *
+     * @param {object} session - The Apple Pay session
+     * @returns {void}
+     */
+    validateFieldsBeforeSession( session ) {
+        // Create a validator instance
+        const validatorInstance = new FieldsValidator();
+        // Clear any previous error messages
+        validatorInstance.clearAllErrors();
+        // Validate fields
+        validatorInstance.checkFields()
+            .then(
+                fieldsAreValid => {
+                    if ( fieldsAreValid ) {
+                        // Fields are valid, now begin the session
+                        session.begin();
+                    } else {
+                        // Fields are not valid, don't begin the session
+                        debugDirect( 'Not all mandatory fields were filled out', this.debug, 'warn' );
+                        this._sessionAborted = true;
+                        this.setSessionStatus( false );
+                    }
+                }
+            )
+            .catch(
+                error => {
+                    // Error during validation
+                    debugDirect( 'Error during field validation: ' + error, this.debug, 'error' );
+                    this._sessionAborted = true;
+                    this.setSessionStatus( false );
+                }
+            );
+    }
 …
     handleValidateMerchant = async( event, session ) => {
         try {
+            // Check if the session has been aborted
+            if ( this._sessionAborted ) {
+                debugDirect( 'Session was already aborted, skipping merchant validation', this.debug, 'log' );
+                return;
+            }
             const validationURL = event.validationURL;
             const originDomain  = window.location.hostname;
 …
             const merchantSession = await this.fetchMerchantSession( validationURL, originDomain );
             if ( merchantSession && ( typeof merchantSession === 'object' ) ) {
+                session.completeMerchantValidation( merchantSession );
+                // Only complete merchant validation if the session hasn't been aborted
+                if ( ! this._sessionAborted ) {
+                    session.completeMerchantValidation( merchantSession );
+                }
             } else {
                 debugDirect( 'Error validating merchant', this.debug );
+                this._sessionAborted = true;
                 session.abort();
+            }
         } catch ( error ) {
             console.error( 'Error validating merchant:', error );
+            this._sessionAborted = true;
             session.abort();
+        }
 …
     handlePaymentAuthorized = async( event, session ) => {
         try {
+            // Check if the session has been aborted
+            if ( this._sessionAborted ) {
+                debugDirect( 'Session was already aborted, skipping payment authorization', this.debug, 'log' );
+                return;
+            }
             const paymentToken = JSON.stringify( event.payment.token );
             const success      = await this.submitApplePayForm( paymentToken );
 …
             try {
                 debugDirect( 'Apple Pay Direct session successfully aborted.', this.debug, 'log' );
+                this._sessionAborted = true;
                 session.abort();
             } catch ( error ) {
 …
         return true;
+    }
+    /**
+     * Fetch merchant session data from MultiSafepay
+     *
+     * @param {string} validationURL
+     * @param {string} originDomain
+     * @returns {Promise<object>}
+     */
+    async fetchMerchantSession( validationURL, originDomain )
+    {
+        const data = new URLSearchParams();
+        data.append( 'action', 'applepay_direct_validation' );
+        data.append( 'validation_url', validationURL );
+        data.append( 'origin_domain', originDomain );
+        const response = await fetch(
+            this.config.multiSafepayServerScript,
+            {
+                method: 'POST',
+                body: data,
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+            }
+        );
+        return JSON.parse( await response.json() );
+    }
+    /**
+     * Create Apple Pay button
+     *
+     * @returns {Promise<void>}
+     */
+    async createApplePayButton()
+    {
+        // Check if previous buttons already exist and remove them
+        cleanUpDirectButtons();
+        const buttonContainer = document.getElementById( 'place_order' ).parentElement;
+        if ( ! buttonContainer ) {
+            debugDirect( 'Button container not found', this.debug );
+            return;
+        }
+        // Features of the button
+        const buttonTag        = document.createElement( 'button' );
+        buttonTag.className    = 'apple-pay-button apple-pay-button-black';
+        buttonTag.style.cursor = 'pointer';
+        // Add an event listener directly to the Apple Pay button, not the container
+        buttonTag.addEventListener(
+            'click',
+            ( event ) => {
+                this.onApplePaymentButtonClicked();
+                // Prevent that WordPress submits the form
+                event.preventDefault();
+                event.stopPropagation();
+            }
+        );
+        // Append the button to the div
+        buttonContainer.appendChild( buttonTag );
+    }
+}

multisafepay/trunk/assets/public/js/multisafepay-google-pay-wallet.js

r3048898	r3306839
222	222	{
223	223	const validatorInstance = new FieldsValidator();
224		const fieldsAreValid = validatorInstance.checkFields();
	224	const fieldsAreValid = await validatorInstance.checkFields();
225	225	if ( fieldsAreValid ) {
226	226	if ( paymentsClient && paymentsClient.loadPaymentData ) {

multisafepay/trunk/assets/public/js/multisafepay-jquery-wallets.js

-                      r3048898
+                      r3306839
                             function() {
                                 debugDirect( 'Select2 action initialized for field: ' + this.name, debugStatus, 'log' );
+                                const select2Container = $( this ).closest( '.validate-required' ).find( '.select2-selection' );
+                                const wrapper          = $( this ).closest( '.validate-required' );
+                                const select2Container = wrapper.find( '.select2-selection' );
                                 if ( select2Container.length ) {
+                                    select2Container.attr( 'style', '' );
+                                    // Remove the inline red border style
+                                    select2Container.removeAttr( 'style' );
+                                    // Alternative approach if removeAttr doesn't work
+                                    select2Container.css( 'border', '' );
+                                }
+                                // Get the field ID container
+                                const fieldId        = this.name + '_field';
+                                const fieldContainer = $( '#' + fieldId );
+                                if ( fieldContainer.length ) {
+                                    // Remove WooCommerce invalid class and add validated class
+                                    fieldContainer.removeClass( 'woocommerce-invalid' );
+                                    fieldContainer.addClass( 'woocommerce-validated' );
+                                }
                                 validatorInstance.removeErrorMessage( this.name );
 …
                                 // Remove the orphan error messages from the notice group
                                 validatorInstance.removeOrphanErrorMessages();
+                                // Re-initialize select2 validation after checkout is updated
+                                select2Validation();
+                            }
                         );

multisafepay/trunk/assets/public/js/multisafepay-validator-wallets.js

-                      r3048898
+                      r3306839
  */
+// Check if the debugDirect function is available, if not define it
+if ( typeof debugDirect !== 'function' ) {
+    window.debugDirect = function( debugMessage, debugEnabled, loggingType = 'error' ) {
+        const allowedTypeArray = ['log', 'info', 'warn', 'error', 'debug'];
+        if ( ! allowedTypeArray.includes( loggingType ) ) {
+            loggingType = 'log';
+        }
+        if ( debugMessage && debugEnabled ) {
+            console[loggingType]( debugMessage );
+        }
+    };
+}
 /**
  * Class to validate the fields in the checkout form
 …
     /**
+     * Cache for field labels to avoid repeated DOM lookups
+     *
+     * @type {Object}
+     */
+    fieldLabelsCache = {};
+    /**
+     * Cache for validated postcodes to avoid redundant AJAX calls
+     * Format: { 'prefix[billing/shipping]:country:postcode': boolean }
+     *
+     * @type {Object}
+     */
+    validatedPostcodesCache = {};
+    /**
+     * Flag to indicate if validation is currently in progress
+     *
+     * @type {boolean}
+     */
+    validationInProgress = false;
+    /**
+     * Constructor - setup event listeners for form submission
+     */
+    constructor() {
+        // Set up a global event listener to prevent payment when validation is in progress
+        this.setupPaymentBlockingWhileValidating();
+    }
+    /**
+     * Check if an element is visible
+     *
+     * @param {HTMLElement} element - Element to check visibility
+     * @returns {boolean} - Whether the element is visible
+     */
+    isElementVisible( element ) {
+        if ( ! element ) {
+            return false;
+        }
+        const style = window.getComputedStyle( element );
+        return ( element.offsetParent !== null ) ||
+            (
+                ( style.position === 'fixed' ) &&
+                ( style.display !== 'none' ) &&
+                ( style.visibility !== 'hidden' )
+            );
+    }
+    /**
+     * Setup event listener to prevent payment when validation is in progress
+     *
+     * @returns {void}
+     */
+    setupPaymentBlockingWhileValidating() {
+        document.addEventListener(
+            'click',
+            ( event ) => {
+                // If validation is in progress
+                if ( this.validationInProgress ) {
+                    // Look for payment buttons or elements that may trigger payment
+                    const targetElement   = event.target;
+                    const paymentTriggers = [
+                        '.payment_method_multisafepay_applepay',
+                        '.payment_method_multisafepay_googlepay',
+                        '#place_order',
+                        '.apple-pay-button',
+                        '.google-pay-button'
+                    ];
+                    // Check if the clicked element matches any payment trigger selectors
+                    const isPaymentTrigger = paymentTriggers.some(
+                        selector =>
+                            targetElement.matches && (
+                                targetElement.matches( selector ) ||
+                                targetElement.closest( selector )
+                            )
+                    );
+                    if ( isPaymentTrigger ) {
+                        debugDirect( 'Payment blocked: Validation in progress', debugStatus, 'log' );
+                        event.preventDefault();
+                        event.stopPropagation();
+                        return false;
+                    }
+                }
+            },
+            true
+        );
+    }
+    /**
      * Get the label text for a field
+     *
 …
      */
     getLabelText( fieldName ) {
         // Skip if this field has already been processed
         if ( this.processedFields.indexOf( fieldName ) !== -1 ) {
             return '';
+        // If we already have the label cached, return it
+        if ( this.fieldLabelsCache[fieldName] ) {
+            return this.fieldLabelsCache[fieldName];
+        }
 …
         this.processedFields.push( fieldName );
+        // Return the label text including the prefix
+        return prefix + labelElement.firstChild.textContent.trim();
+        // Create the label text including the prefix
+        const labelText = prefix + labelElement.firstChild.textContent.trim();
+        // Cache the label text
+        this.fieldLabelsCache[fieldName] = labelText;
+        // Return the label text
+        return labelText;
+    }
+    /**
+     * Validate an email address format
+     *
+     * @param {string} email - The email to validate
+     * @returns {boolean} - Whether the email is valid
+     */
+    validateEmail( email ) {
+        // Using the same logic as WooCommerce:
+        // wp-content/plugins/woocommerce/assets/js/frontend/checkout.js
+        const pattern = new RegExp( /^([a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+(\.[a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)*|"((([ \t]*\r\n)?[ \t]+)?([\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*(([ \t]*\r\n)?[ \t]+)?")@(([a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.)+([a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.?$/i );
+        return pattern.test( email );
+    }
+    /**
+     * Validate a postcode format via AJAX using WooCommerce's validation
+     *
+     * @param {string} postcode - The postcode to validate
+     * @param {string} fieldName - The field name (to determine if billing or shipping)
+     * @returns {Promise<boolean>} - Promise resolving to whether the postcode is valid
+     */
+    async validatePostcode( postcode, fieldName ) {
+        // Signal that validation is in progress
+        this.validationInProgress = true;
+        // Extract country value based on whether this is billing or shipping
+        const prefix       = fieldName.startsWith( 'billing_' ) ? 'billing' : 'shipping';
+        const countryField = document.getElementById( prefix + '_country' );
+        if ( ! countryField ) {
+            debugDirect( 'Country field not found for ' + fieldName, debugStatus );
+            this.validationInProgress = false;
+            return true; // Default to valid if the country cannot be found
+        }
+        const country = countryField.value;
+        // Generate a cache key using an address type, country and postcode
+        const cacheKey = prefix + ':' + country + ':' + postcode;
+        // Check if this postcode has already been validated for this country and address type
+        if ( this.validatedPostcodesCache.hasOwnProperty( cacheKey ) ) {
+            debugDirect( 'Using cached validation result for postcode: ' + postcode + ' in country: ' + country + ' for ' + prefix + ' address', debugStatus, 'log' );
+            this.validationInProgress = false;
+            return this.validatedPostcodesCache[cacheKey];
+        }
+        try {
+            // Return a promise that resolves with a validation result
+            return await new Promise(
+                ( resolve ) => {
+                    // Create data for AJAX request similar to WooCommerce's update_order_review
+                    const data = {
+                        action: 'multisafepay_validate_postcode',
+                        security: multisafepayParams.nonce,
+                        postcode: postcode,
+                        country: country
+                    };
+                    debugDirect( 'Validating postcode via AJAX: ' + postcode + ' for country: ' + country + ' for ' + prefix + ' address', debugStatus, 'log' );
+                    // Send AJAX request to validate postcode
+                    jQuery.ajax(
+                    {
+                        type: 'POST',
+                        url: multisafepayParams.location,
+                        data: data,
+                        success: function ( response ) {
+                            let isValid = false;
+                            if ( response.success ) {
+                                isValid = true;
+                            }
+                            // Cache the validation result
+                            this.validatedPostcodesCache[cacheKey] = isValid;
+                            debugDirect( 'Postcode validation result via Ajax for ' + prefix + ' address: ' + postcode + ': ' + ( isValid ? 'valid' : 'invalid' ), debugStatus, 'log' );
+                            // Signal that validation is complete
+                            this.validationInProgress = false;
+                            resolve( isValid );
+                        }.bind( this ),
+                        error: function () {
+                            debugDirect( 'Error validating postcode via AJAX', debugStatus );
+                            this.validationInProgress = false;
+                            resolve( true ); // Default to valid on error
+                        }.bind( this )
+                    }
+                    );
+                }
+            );
+        } catch ( error ) {
+            debugDirect( 'Exception validating postcode: ' + error, debugStatus );
+            this.validationInProgress = false;
+            return true; // Default to valid on error
+        }
+    }
+    /**
+     * Validate special fields like email and postcodes
+     *
+     * @param {HTMLElement} element - The element to be validated
+     * @param labelText - The label text for the field
+     * @returns {Promise<boolean>} - Whether the field is valid or not
+     */
+    async validateSpecialFields( element, labelText ) {
+        const fieldName  = element.name.trim();
+        const fieldValue = element.value.trim();
+        // Get the field container element
+        const getFieldId = document.getElementById( fieldName + '_field' );
+        let isValid      = true;
+        let errorMessage = '';
+        // Check if this is one of the fields we need to specifically validate
+        if ( fieldName === 'billing_email' ) {
+            // Validate email format
+            if ( ! this.validateEmail( fieldValue ) ) {
+                isValid      = false;
+                errorMessage = labelText + ' is not a valid address and ';
+            }
+        } else if ( fieldName === 'billing_postcode' || fieldName === 'shipping_postcode' ) {
+            // Validate postcode via AJAX
+            isValid = await this.validatePostcode( fieldValue, fieldName );
+            if ( ! isValid ) {
+                // If labelText is empty, get it from the cache or fall back to default
+                if ( ! labelText || labelText.trim() === '' ) {
+                    labelText = this.getLabelText( fieldName );
+                    // If still empty, fallback to default
+                    if ( ! labelText || labelText.trim() === '' ) {
+                        const type = fieldName.startsWith( 'billing_' ) ? 'Billing' : 'Shipping';
+                        labelText  = type + ' Postcode / ZIP';
+                    }
+                }
+                errorMessage = labelText + ' is not valid for the selected country';
+            }
+        }
+        // Apply validation results
+        if ( isValid ) {
+            this.removeErrorMessage( fieldName, true );
+            this.removeInlineError( fieldName );
+            element.style.cssText = '';
+            ['aria-invalid', 'aria-describedby'].forEach( attr => element.removeAttribute( attr ) );
+            getFieldId.classList.remove( 'woocommerce-invalid', 'woocommerce-invalid-required-field', 'woocommerce-invalid-email' );
+            getFieldId.classList.add( 'woocommerce-validated' );
+        } else {
+            const errorId = fieldName + '_error';
+            // For the top error banner - use the same message format
+            this.appendErrorMessage( [{ field: fieldName, label: errorMessage }], true );
+            // For inline errors, add a period at the end for postcode errors
+            let inlineErrorMessage = errorMessage;
+            if ( fieldName === 'billing_postcode' || fieldName === 'shipping_postcode' ) {
+                inlineErrorMessage = errorMessage + '.';
+            }
+            this.addInlineError( fieldName, inlineErrorMessage, errorId );
+            element.setAttribute( 'aria-invalid', 'true' );
+            element.setAttribute( 'aria-describedby', errorId );
+            element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+            getFieldId.classList.remove( 'woocommerce-validated' );
+            getFieldId.classList.add( 'woocommerce-invalid' );
+            if ( fieldName.includes( 'email' ) ) {
+                getFieldId.classList.add( 'woocommerce-invalid-email' );
+            }
+        }
+        return isValid;
+    }
+    /**
+     * Add an inline error message below a field
+     *
+     * @param {string} fieldName - The name of the field
+     * @param {string} errorMessage - The error message
+     * @param {string} errorId - The ID for the error element (for aria-describedby)
+     * @returns {void}
+     */
+    addInlineError( fieldName, errorMessage, errorId ) {
+        // Get the field element
+        const fieldElement = document.querySelector(
+            'input[name="' + fieldName + '"],' +
+            'select[name="' + fieldName + '"],' +
+            'textarea[name="' + fieldName + '"]'
+        );
+        if ( ! fieldElement ) {
+            return;
+        }
+        // Remove any existing inline error
+        this.removeInlineError( fieldName );
+        // Create an inline error message
+        const errorElement = document.createElement( 'p' );
+        errorElement.setAttribute( 'id', errorId );
+        errorElement.className   = 'checkout-inline-error-message';
+        errorElement.textContent = errorMessage;
+        // Add to a parent element
+        const formRow = fieldElement.closest( '.form-row' );
+        if ( formRow ) {
+            formRow.appendChild( errorElement );
+        }
+    }
+    /**
+     * Remove inline error message
+     *
+     * @param {string} fieldName - The name of the field
+     * @returns {void}
+     */
+    removeInlineError( fieldName ) {
+        // Get the field element
+        const fieldElement = document.querySelector(
+            'input[name="' + fieldName + '"],' +
+            'select[name="' + fieldName + '"],' +
+            'textarea[name="' + fieldName + '"]'
+        );
+        if ( ! fieldElement ) {
+            return;
+        }
+        // Remove any existing inline error
+        const formRow = fieldElement.closest( '.form-row' );
+        if ( formRow ) {
+            const errorElement = formRow.querySelector( '.checkout-inline-error-message' );
+            if ( errorElement ) {
+                errorElement.remove();
+            }
+        }
+        // Remove aria attributes
+        ['aria-invalid', 'aria-describedby'].forEach( attr => fieldElement.removeAttribute( attr ) );
+    }
 …
+     *
      * @param element - The element to be validated
+     * @returns {void}
      */
     realtimeValidation( element ) {
+        const fieldName = element.name.trim();
+        const fieldName  = element.name.trim();
+        const fieldValue = element.value.trim();
         // Remove this field from processedFields if it's there
 …
+        }
+        if ( element.value.trim() !== '' ) {
+        // Get the field container element
+        const getFieldId = document.getElementById( fieldName + '_field' );
+        const labelText  = this.getLabelText( fieldName );
+        // If empty and required, show the required error
+        if ( fieldValue === '' ) {
+            if ( ( labelText !== '' ) && getFieldId && getFieldId.classList.contains( 'validate-required' ) ) {
+                const errorId      = fieldName + '_error';
+                const errorMessage = labelText + ' is a required field';
+                this.appendErrorMessage( [{ field: fieldName, label: labelText }], true );
+                this.addInlineError( fieldName, errorMessage, errorId );
+                // Using the same error style as WooCommerce
+                element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+                element.setAttribute( 'aria-invalid', 'true' );
+                element.setAttribute( 'aria-describedby', errorId );
+                getFieldId.classList.remove( 'woocommerce-validated' );
+                getFieldId.classList.add( 'woocommerce-invalid', 'woocommerce-invalid-required-field' );
+            }
+            return;
+        }
+        // For non-empty fields with specific validation needs, validate them
+        if ( fieldName === 'billing_email' ) {
+            this.validateSpecialFields( element, labelText ).catch(
+                error => {
+                    debugDirect( 'Error validating specific field: ' + error, debugStatus );
+                }
+            );
+        } else {
+            // For other fields that were filled in, remove any error messages
             this.removeErrorMessage( fieldName, true );
+            this.removeInlineError( fieldName );
             element.style.cssText = '';
+        } else {
+            const labelText = this.getLabelText( fieldName );
+            // Any field name has an associated ID with the suffix '_field'
+            const getFieldId = document.getElementById( fieldName + '_field' );
+            // If the label text is not empty and field is required
+            if ( (labelText !== '') && getFieldId.classList.contains( 'validate-required' ) ) {
+                this.appendErrorMessage( [{ field: fieldName, label: labelText }], true );
+            }
+            // Using the same error style as WooCommerce
+            element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+        }
+    }
+    /**
+     * Validate all the fields with the class 'validate-required'
+     * inside the element with the id 'customer_details'
+     *
+     * @returns {boolean}
+     */
+    checkFields() {
+        // Clear the processedFields array at the start of validation
+        this.processedFields.length = 0;
+            getFieldId.classList.remove( 'woocommerce-invalid', 'woocommerce-invalid-required-field' );
+            getFieldId.classList.add( 'woocommerce-validated' );
+        }
+    }
+    /**
+     * Setup validation listeners for postcode fields
+     *
+     * @param element - The element to setup listeners for
+     * @returns {void}
+     */
+    setupPostcodeValidation( element ) {
+        const fieldName = element.name.trim();
+        // Get the label text for the field from our cache
+        const labelText = this.getLabelText( fieldName );
+        // Setup change event handler for postcodes
+        element._changeHandler = () => {
+            debugDirect( 'Validating postcode on change: ' + fieldName, debugStatus, 'log' );
+            this.validateSpecialFields( element, labelText )
+                .catch(
+                    error => {
+                        debugDirect( 'Error validating postcode: ' + error, debugStatus, 'error' );
+                    }
+                );
+        };
+        element.addEventListener( 'change', element._changeHandler );
+        // Remove any previous focusout handler
+        if ( element._focusoutHandler ) {
+            element.removeEventListener( 'focusout', element._focusoutHandler );
+            element._focusoutHandler = null;
+        }
+    }
+    /**
+     * Add event listeners to all required fields
+     *
+     * @returns {void}
+     */
+    setupValidationListeners() {
         // Getting the customer details element which includes all the user fields
         const customerDetails = document.getElementById( 'customer_details' );
+        // Getting all the fields with the class 'validate-required' so we can loop through them
+        if ( ! customerDetails ) {
+            return;
+        }
+        // Getting all the fields with the class 'validate-required'
         const selectWrappers = customerDetails.querySelectorAll( '.validate-required' );
+        // Check if the element is visible
+        const isElementVisible = element => element && element.offsetParent !== null;
+        // Are all fields valid? For now, yes
+        let allFieldsValid = true;
+        // Loop through all the fields with the class 'validate-required'
         selectWrappers.forEach(
             wrapper => {
+                // Getting all the fields inside the wrapper including input, text-areas and selects
+                const elements = wrapper.querySelectorAll( 'input, textarea, select' );
+                // Loop through all the fields inside the wrapper
+                // Getting all the fields inside the wrapper
+                const elements          = wrapper.querySelectorAll( 'input, textarea, select' );
                 elements.forEach(
                     element => {
-                        // Remove existing listener and add a new one
-                        element.removeEventListener( 'input', event => this.realtimeValidation( event.target ) );
-                        element.addEventListener( 'input', event => this.realtimeValidation( event.target ) );
                         const fieldName = element.name.trim();
+                        // Initial validation logic: if the field is empty and visible
+                        if ( ! element.value.trim() && ( isElementVisible( element ) || element.type === 'hidden' ) ) {
+                            const labelText = this.getLabelText( fieldName );
+                            if ( labelText !== '' ) {
+                                this.appendErrorMessage( [{ field: fieldName, label: labelText }] );
+                            }
+                            // Not all fields are valid
+                            allFieldsValid = false;
+                            // Add a different error style to the field if it's a Select2 or input,
+                            // using the same error style as WooCommerce
+                            const select2Container = element.tagName.toLowerCase() === 'select' ? wrapper.querySelector( '.select2-selection' ) : null;
+                            if ( select2Container ) {
+                                select2Container.style.cssText = 'border: 2px solid #e2401c !important;';
+                            } else {
+                                element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+                            }
+                        // Remove any existing listeners first
+                        element.removeEventListener( 'input', element._inputHandler );
+                        element.removeEventListener( 'change', element._changeHandler );
+                        element.removeEventListener( 'focusout', element._focusoutHandler );
+                        // For postcodes, use only change event instead of input
+                        if ( fieldName === 'billing_postcode' || fieldName === 'shipping_postcode' ) {
+                            this.setupPostcodeValidation( element );
                         } else {
+                            this.removeErrorMessage( fieldName );
+                            element.style.cssText = '';
+                            // For all other fields, use the input event for real-time validation
+                            element._inputHandler = event => this.realtimeValidation( event.target );
+                            element.addEventListener( 'input', element._inputHandler );
+                            // Add focusout handler for all fields
+                            element._focusoutHandler = event => this.realtimeValidation( event.target );
+                            element.addEventListener( 'focusout', element._focusoutHandler );
+                        }
+                    }
 …
+            }
         );
+    }
+    /**
+     * Validate a specific postcode field
+     *
+     * @param {HTMLElement} postcodeElement - The postcode input element
+     * @param {string} labelText - The label text for the field
+     * @returns {Promise<boolean>} - Promise resolving to whether validation pass
+     */
+    async sharedPostcodeValidation( postcodeElement, labelText ) {
+        const fieldName = postcodeElement.name.trim();
+        // Start validation
+        this.validationInProgress = true;
+        // Validate the field
+        const isValid = await this.validateSpecialFields( postcodeElement, labelText );
+        // Update field styling if invalid
+        if ( ! isValid ) {
+            const postcodeField = document.getElementById( fieldName + '_field' );
+            if ( postcodeField ) {
+                postcodeField.classList.remove( 'woocommerce-validated' );
+                postcodeField.classList.add( 'woocommerce-invalid' );
+            }
+        }
+        return isValid;
+    }
+    /**
+     * Validate all the fields with the class 'validate-required'
+     * inside the element with the id 'customer_details'
+     *
+     * @returns {Promise<boolean>}
+     */
+    async checkFields() {
+        // Early check - if validation is in progress, block payment
+        if ( this.validationInProgress ) {
+            debugDirect( 'Blocking payment: Validation in progress', debugStatus, 'log' );
+            return false;
+        }
+        // Clear any existing errors from previous validations
+        this.clearAllErrors();
+        // Clear the processedFields array at the start of validation
+        this.processedFields.length = 0;
+        // Getting the customer details element which includes all the user fields
+        const customerDetails = document.getElementById( 'customer_details' );
+        if ( ! customerDetails ) {
+            debugDirect( 'Customer details element not found', debugStatus, 'error' );
+            return false;
+        }
+        // Are all fields valid? For now, yes
+        let allFieldsValid = true;
+        // STEP 1: Check all empty required fields first
+        // Getting all the fields with the class 'validate-required'
+        const requiredFields = customerDetails.querySelectorAll( '.validate-required' );
+        debugDirect( 'Found ' + requiredFields.length + ' required fields', debugStatus, 'log' );
+        // First pass: Validate empty required fields
+        requiredFields.forEach(
+            wrapper => {
+                // Getting all the input elements inside the wrapper
+                const elements      = wrapper.querySelectorAll( 'input, textarea, select' );
+                elements.forEach(
+                element => {
+                    const fieldName = element.name.trim();
+                    if ( ! fieldName ) {
+                        return; // Skip elements without a name
+                    }
+                    // If the field is visible (or hidden) and is empty
+                    if ( this.isElementVisible( element ) || element.type === 'hidden' ) {
+                        if ( ! element.value.trim()) {
+                            const labelText = this.getLabelText( fieldName );
+                            if ( labelText ) {
+                                const errorId      = fieldName + '_error';
+                                const errorMessage = labelText + ' is a required field';
+                                // Add an error message to the top of the page
+                                this.appendErrorMessage( [{ field: fieldName, label: labelText }], true );
+                                // Add inline error
+                                this.addInlineError( fieldName, errorMessage, errorId );
+                                // Invalid field styling
+                                element.setAttribute( 'aria-invalid', 'true' );
+                                element.setAttribute( 'aria-describedby', errorId );
+                                // Add different error style depending on an element type
+                                const select2Container = element.tagName.toLowerCase() === 'select' ?
+                                wrapper.querySelector( '.select2-selection' ) : null;
+                                if ( select2Container ) {
+                                    select2Container.style.cssText = 'border: 2px solid #e2401c !important;';
+                                } else {
+                                    element.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+                                }
+                                // Update wrapper classes
+                                wrapper.classList.remove( 'woocommerce-validated' );
+                                wrapper.classList.add( 'woocommerce-invalid', 'woocommerce-invalid-required-field' );
+                                // Not all fields are valid
+                                allFieldsValid = false;
+                                debugDirect( 'Field is required but empty: ' + fieldName, debugStatus, 'log' );
+                            }
+                        }
+                    }
+                }
+                );
+            }
+        );
+        // STEP 2: Special validation for email and postcode
+        // Setup validation listeners
+        this.setupValidationListeners();
+        // Explicitly check special fields (email and postcodes)
+        const billingEmail     = document.querySelector( '[name="billing_email"]' );
+        const billingPostcode  = document.querySelector( '[name="billing_postcode"]' );
+        const shippingPostcode = document.querySelector( '[name="shipping_postcode"]' );
+        // Flag to track if we need to wait for validations
+        let pendingValidation = false;
+        // Array to track validation promises
+        const validationPromises = [];
+        // Validate billing_email
+        if ( billingEmail && this.isElementVisible( billingEmail ) && billingEmail.value.trim() !== '' ) {
+            const labelText = this.getLabelText( 'billing_email' );
+            // Check the email format synchronously
+            if ( ! this.validateEmail( billingEmail.value.trim() )) {
+                allFieldsValid          = false;
+                const billingEmailField = document.getElementById( 'billing_email_field' );
+                const errorId           = 'billing_email_error';
+                const errorMessage      = labelText + ' is not a valid email address';
+                // Add an error message to the top of the page
+                this.appendErrorMessage( [{ field: 'billing_email', label: labelText + ' is not a valid email address and ' }], true );
+                // Add inline error
+                this.addInlineError( 'billing_email', errorMessage, errorId );
+                billingEmail.setAttribute( 'aria-invalid', 'true' );
+                billingEmail.setAttribute( 'aria-describedby', errorId );
+                billingEmail.style.cssText = 'box-shadow: inset 2px 0 0 #e2401c !important;';
+                if ( billingEmailField ) {
+                    billingEmailField.classList.remove( 'woocommerce-validated' );
+                    billingEmailField.classList.add( 'woocommerce-invalid', 'woocommerce-invalid-email' );
+                }
+            } else {
+                // Email is valid, remove any error messages
+                const billingEmailField = document.getElementById( 'billing_email_field' );
+                this.removeErrorMessage( 'billing_email', true );
+                this.removeInlineError( 'billing_email' );
+                billingEmail.style.cssText = '';
+                ['aria-invalid', 'aria-describedby'].forEach( attr => billingEmail.removeAttribute( attr ) );
+                if ( billingEmailField ) {
+                    billingEmailField.classList.remove( 'woocommerce-invalid', 'woocommerce-invalid-required-field', 'woocommerce-invalid-email' );
+                    billingEmailField.classList.add( 'woocommerce-validated' );
+                }
+            }
+        }
+        // Check billing postcode
+        if ( billingPostcode && this.isElementVisible( billingPostcode ) && billingPostcode.value.trim() !== '' ) {
+            pendingValidation    = true;
+            const labelText      = this.getLabelText( 'billing_postcode' );
+            const billingPromise = this.sharedPostcodeValidation( billingPostcode, labelText )
+                .then(
+                    isValid => {
+                        if ( ! isValid ) {
+                            allFieldsValid = false;
+                        }
+                        return isValid;
+                    }
+                );
+            validationPromises.push( billingPromise );
+        }
+        // Check shipping postcode
+        if ( shippingPostcode && this.isElementVisible( shippingPostcode ) && shippingPostcode.value.trim() !== '' ) {
+            pendingValidation     = true;
+            const labelText       = this.getLabelText( 'shipping_postcode' );
+            const shippingPromise = this.sharedPostcodeValidation( shippingPostcode, labelText )
+                .then(
+                    isValid => {
+                        if ( ! isValid ) {
+                            allFieldsValid = false;
+                        }
+                        return isValid;
+                    }
+                );
+            validationPromises.push( shippingPromise );
+        }
+        // If there are pending validations, wait for them to complete
+        if ( pendingValidation ) {
+            debugDirect(
+                'Waiting for ' + validationPromises.length + ' pending validation' +
+                ( validationPromises.length === 1 ? '' : 's' ) + ' to complete',
+                debugStatus,
+                'log'
+            );
+            try {
+                await Promise.all( validationPromises );
+                debugDirect( 'All validations for special fields were completed', debugStatus, 'log' );
+            } catch ( error ) {
+                debugDirect( 'Error during special fields validation: ' + error, debugStatus, 'error' );
+                allFieldsValid = false;
+            } finally {
+                this.validationInProgress = false;
+            }
+        }
+        // Final check - ensure no validation is in progress
+        if ( this.validationInProgress ) {
+            debugDirect( 'Blocking payment: Validation still in progress at the end of checks', debugStatus, 'log' );
+            return false;
+        }
         // Scroll to the previously added notice group area if there are any errors
 …
             this.scrollToElement( '.entry-content' );
+        }
+        debugDirect( 'Final validation result: ' + ( allFieldsValid ? 'Valid' : 'Invalid' ), debugStatus, 'log' );
         return allFieldsValid;
+    }
     /**
+     * Clear all error messages and validation states
+     *
+     * @returns {void}
+     */
+    clearAllErrors() {
+        // Remove the entire notice group
+        const noticeGroup = document.querySelector( '.woocommerce-NoticeGroup-checkout' );
+        if ( noticeGroup ) {
+            noticeGroup.remove();
+            debugDirect( 'Cleared all error messages', debugStatus, 'log' );
+        }
+        // Remove all inline errors
+        const inlineErrors = document.querySelectorAll( '.checkout-inline-error-message' );
+        inlineErrors.forEach( error => error.remove() );
+    }
+    /**
      * Scroll to a specific class element in the document.
+     *
      * @param {string} className - The class name of the element to scroll to.
+     * @returns {void}
      */
     scrollToElement( className ) {
 …
+        }
+        // Make sure we have a valid error object
+        if ( ! error || ! error[0] || ! error[0].field ) {
+            debugDirect( 'Invalid error object passed to appendErrorMessage', debugStatus );
+            return;
+        }
         // Create the notice group using the WooCommerce style, where the errors will be built using JS vanilla,
         // so PHPCS doesn't complain if HTML code is used because the opening and closing of tags <>
+        // so PHPCS doesn't complain if HTML code is used because of the opening and closing of tags <>
         let noticeGroup = document.querySelector( '.woocommerce-NoticeGroup-checkout' );
         if ( ! noticeGroup ) {
 …
             noticeBanner.className = 'woocommerce-error';
             noticeBanner.setAttribute( 'role', 'alert' );
-            const contentDiv     = document.createElement( 'div' );
-            contentDiv.className = 'wc-block-components-notice-banner__content';
-            const summaryParagraph       = document.createElement( 'p' );
-            summaryParagraph.className   = 'wc-block-components-notice-banner__summary';
-            summaryParagraph.textContent = 'The following problems were found:';
-            contentDiv.appendChild( summaryParagraph );
-            const ulElement = document.createElement( 'ul' );
-            contentDiv.appendChild( ulElement );
-            noticeBanner.appendChild( contentDiv );
             noticeGroup.appendChild( noticeBanner );
+        }
         const ulList = noticeGroup.querySelector( 'ul' );
+        // Check if an error message for this field already exists, therefore, is not added again
+        if ( ! ulList ) {
+            debugDirect( 'Error banner not found', debugStatus );
+            return;
+        }
+        // Check if an error message for this field already exists
         const existingErrorItem = ulList.querySelector( 'li[data-id="' + error[0].field + '"]' );
         if ( existingErrorItem ) {
+            return;
+            // If we're in real-time validation, update the existing error message
+            if ( isRealtimeValidation ) {
+                debugDirect( 'Updating existing error message for field: ' + error[0].field, debugStatus, 'log' );
+                // Remove the existing error so we can add an updated one
+                existingErrorItem.remove();
+            } else {
+                // If not in real-time validation, just leave the existing error
+                return;
+            }
+        }
 …
         const errorItem = document.createElement( 'li' );
         errorItem.setAttribute( 'data-id', error[0].field );
+        errorItem.style.display = 'block'; // Ensure it's visible
+        // Create the complete error message with formatting
+        const errorLink                = document.createElement( 'a' );
+        errorLink.href                 = '#' + error[0].field;
+        errorLink.style.textDecoration = 'none'; // Don't show underline on the text
+        // Create a strong element for the field name/error
         const strongElement = document.createElement( 'strong' );
+        // Add the label text to the error message
+        strongElement.textContent = error[0].label;
+        errorItem.appendChild( strongElement );
+        errorItem.append( ' is a required field.' );
+        // Set the text for the strong element based on the error
+        let errorText = error[0].label;
+        // Make sure we end with "and" if the error is about invalid format
+        if ( errorText.includes( 'is not valid' ) && ! errorText.endsWith( ' and' ) ) {
+            errorText += ' and';
+        }
+        strongElement.textContent = errorText;
+        // Determine the complete error message text
+        let fullErrorText;
+        if ( errorText.includes( 'is not valid' ) || errorText.includes( 'is not a valid' ) ) {
+            fullErrorText = ' is a required field.';
+        } else {
+            fullErrorText = ' is a required field.';
+        }
+        // Add the complete message to the link
+        errorLink.appendChild( strongElement );
+        errorLink.appendChild( document.createTextNode( fullErrorText ) );
+        // Add the link containing the full message to the error item
+        errorItem.appendChild( errorLink );
         // Add the error message to the notice group
         ulList.appendChild( errorItem );
+        // Add a click handler to focus the field when the error is clicked
+        errorLink.addEventListener(
+            'click',
+            ( event ) => {
+                event.preventDefault();
+                const fieldToFocus = document.querySelector( '[name="' + error[0].field + '"]' );
+                if ( fieldToFocus ) {
+                    fieldToFocus.focus();
+                }
+            }
+        );
+        // Make sure the notice group is visible and properly positioned
+        noticeGroup.style.display = 'block';
+        noticeGroup.style.margin  = '0 0 2em';
         debugDirect( ( isRealtimeValidation ? '"Interactively" a' : 'A' ) + 'dding error message in the notice group for field: ' + error[0].field, debugStatus, 'log' );
 …
                 // Getting the field name associated with the error message
                 const fieldElement = document.querySelector( '[name="' + fieldName + '"]' );
                 // Check if the fieldElement exists and is not hidden using CSS
                 const isFieldVisible = fieldElement && ( window.getComputedStyle( fieldElement ).display !== 'none' );
+                // Check if the fieldElement exists and is not hidden
+                const isFieldVisible = fieldElement && this.isElementVisible( fieldElement );
                 if ( ! isFieldVisible ) {
                     errorItem.remove();
 …
     removeEntireNoticeGroup() {
         // Check if there are no more error messages left
+        const errorList = document.querySelector( '.woocommerce-NoticeGroup-checkout ul' );
+        if ( errorList && ( errorList.children.length === 0 ) ) {
+            const noticeGroup = document.querySelector( '.woocommerce-NoticeGroup-checkout' );
+            if ( noticeGroup ) {
+        const noticeGroup = document.querySelector( '.woocommerce-NoticeGroup-checkout' );
+        if ( noticeGroup ) {
+            // Count elements with data-id attribute within the group
+            const errorItems = noticeGroup.querySelectorAll( 'li[data-id]' );
+            if ( errorItems.length === 0 ) {
                 noticeGroup.remove();
                 debugDirect( 'Removing the entire notice group as there are no more error messages left', debugStatus, 'log' );

multisafepay/trunk/multisafepay.php

-                      r3269746
+                      r3306839
  * Plugin URI:              https://docs.multisafepay.com/docs/woocommerce
  * Description:             MultiSafepay Payment Plugin
  * Version:                 6.8.3
+ * Version:                 6.9.0
  * Author:                  MultiSafepay
  * Author URI:              https://www.multisafepay.com
 …
  * License URI:             http://www.gnu.org/licenses/gpl-3.0.html
  * Requires at least:       6.0
  * Tested up to:            6.7.2
+ * Tested up to:            6.8.1
  * WC requires at least:    6.0.0
  * WC tested up to:         9.7.1
+ * WC tested up to:         9.8.5
  * Requires PHP:            7.3
  * Text Domain:             multisafepay
 …
  * Plugin version
  */
 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.8.3' );
+define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.9.0' );
 /**

multisafepay/trunk/readme.txt

-                      r3269746
+                      r3306839
 Tags: multisafepay, payment gateway, credit cards, ideal, bnpl
 Requires at least: 6.0
 Tested up to: 6.7.2
+Tested up to: 6.8.1
 Requires PHP: 7.3
 Stable tag: 6.8.3
+Stable tag: 6.9.0
 License: MIT
 …
 == Changelog ==
+= Release Notes - WooCommerce 6.9.0 (Jun 5th, 2025) =
+### Added
++ PLGWOOS-1003: Add zip code and email format validation to QR code implementation
++ PLGWOOS-1001: Improvement over QR code implementation validating checkout when"ship to a different address" is checked.
+### Fixed
++ PLGWOOS-1009: Fix Bancontact QR showing up even when it hasn’t been explicitly enabled
++ PLGWOOS-1007: Refund request based on amount is including the checkout data, even when it's not needed.
++ PLGWOOS-997: Validate zip code checkout fields to prevent payments via Wallets
++ PLGWOOS-1002: Payment Component shows "Store my details for future visits" field, when user is not logged in
++ PLGWOOS-999: Fix URL Parameter Concatenation in QR Payment Redirect Flow
++ PLGWOOS-1000: Remove unneeded get_customer_ip_address() and get_user_agent() methods in QrCustomerService
+### Changed
++ PLGWOOS-1005: Adjusting the minimum discrepancy allowed to filter Billink tax rates
++ PLGWOOS-1004: Adding shipping method name in the Order Request, instead of generic label "Shipping"
 = Release Notes - WooCommerce 6.8.3 (Apr 9th, 2025) =

multisafepay/trunk/src/Main.php

-                      r3264984
+                      r3306839
 use MultiSafepay\WooCommerce\Services\Qr\QrPaymentComponentService;
 use MultiSafepay\WooCommerce\Services\Qr\QrPaymentWebhook;
+use MultiSafepay\WooCommerce\Services\ValidationService;
 use MultiSafepay\WooCommerce\Settings\SettingsController;
 use MultiSafepay\WooCommerce\Settings\ThirdPartyCompatibility;
 …
         $this->payment_components_qr_hooks();
         $this->callback_hooks();
+        $this->validation_hooks();
+    }
 …
     /**
+     * Register the hooks related to field validation
+     *
+     * @return void
+     */
+    public function validation_hooks(): void {
+        $validation_service = new ValidationService();
+        // Register AJAX action for zip code validation
+        $this->loader->add_action( 'wp_ajax_multisafepay_validate_postcode', $validation_service, 'validate_postcode' );
+        $this->loader->add_action( 'wp_ajax_nopriv_multisafepay_validate_postcode', $validation_service, 'validate_postcode' );
+    }
+    /**
      * Run the loader to execute the hooks with WordPress.
+     *

multisafepay/trunk/src/PaymentMethods/Base/BasePaymentMethod.php

-                      r3264984
+                      r3306839
+        }
         $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'qr' ) );
+        $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'yes' ) );
         if ( ! isset( $settings['payment_component'] ) ) {
             return true;
+            return false;
+        }
         return 'qr' === $settings['payment_component'];
 …
+        }
         $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'qr_only' ) );
+        $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'yes' ) );
         if ( ! isset( $settings['payment_component'] ) ) {
             return true;
+            return false;
+        }
         return 'qr_only' === $settings['payment_component'];
 …
                 wp_enqueue_script( 'multisafepay-validator-wallets', MULTISAFEPAY_PLUGIN_URL . '/assets/public/js/multisafepay-validator-wallets.js', array( 'jquery' ), MULTISAFEPAY_PLUGIN_VERSION, true );
                 wp_enqueue_script( 'multisafepay-common-wallets', MULTISAFEPAY_PLUGIN_URL . '/assets/public/js/multisafepay-common-wallets.js', array( 'jquery' ), MULTISAFEPAY_PLUGIN_VERSION, true );
+                // Add parameters for validator wallets
+                wp_localize_script(
+                    'multisafepay-validator-wallets',
+                    'multisafepayParams',
+                    array(
+                        'location' => admin_url( 'admin-ajax.php' ),
+                        'nonce'    => wp_create_nonce( 'multisafepay_validator_nonce' ),
+                    )
+                );
                 $admin_url_array = array(
                     'location' => admin_url( 'admin-ajax.php' ),

multisafepay/trunk/src/PaymentMethods/Base/BaseRefunds.php

-                      r3264984
+                      r3306839
         );
+        /** @var RefundRequest $refund_request */
+        $refund_request = $transaction_manager->createRefundRequest( $multisafepay_transaction );
+        if ( $multisafepay_transaction->requiresShoppingCart() ) {
+            /** @var RefundRequest $refund_request */
+            $refund_request = $transaction_manager->createRefundRequest( $multisafepay_transaction );
-        $refund_request->addDescriptionText( $reason );
-        if ( $multisafepay_transaction->requiresShoppingCart() ) {
             $refunds                 = $order->get_refunds();
             $refund_merchant_item_id = reset( $refunds )->id;
 …
         if ( ! $multisafepay_transaction->requiresShoppingCart() ) {
+            $refund_request = new RefundRequest();
+            $refund_request->addDescriptionText( $reason );
             $refund_request->addMoney( MoneyUtil::create_money( (float) $amount, $order->get_currency() ) );
+        }
 …
         } catch ( Exception | ClientExceptionInterface | ApiException $exception ) {
             $error = __( 'Error:', 'multisafepay' ) . htmlspecialchars( $exception->getMessage() );
+            $this->logger->log_error( $error );
+            wc_add_notice( $error, 'error' );
+            $this->logger->log_error( 'Error during refund: ' . $error . ' Refund request : ' . wp_json_encode( $refund_request->getData() ) );
+        }

multisafepay/trunk/src/Services/PaymentComponentService.php

r3264984	r3306839
83	83
84	84	// Tokenization and recurring model
85		if ( $woocommerce_payment_gateway->is_tokenization_enabled() ) {
	85	if ( $woocommerce_payment_gateway->is_tokenization_enabled() && is_user_logged_in() ) {
86	86	$payment_component_arguments['recurring'] = array(
87	87	'model' => 'cardOnFile',

multisafepay/trunk/src/Services/Qr/QrCustomerService.php

-                      r3264984
+                      r3306839
         );
+    }
-    /**
-     * Get the customer IP address.
+     *
-     * @return string
-     */
-    public function get_customer_ip_address(): string {
-        $possible_ip_sources = array(
-            'HTTP_CLIENT_IP',
-            'HTTP_X_FORWARDED_FOR',
-            'REMOTE_ADDR',
-        );
-        foreach ( $possible_ip_sources as $source ) {
-            if ( ! empty( $_SERVER[ $source ] ) ) {
-                return sanitize_text_field( wp_unslash( $_SERVER[ $source ] ) );
+            }
+        }
-        return '';
+    }
-    /**
-     * Get the user agent.
+     *
-     * @return string
-     */
-    public function get_user_agent(): string {
-        return sanitize_text_field( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ?? '' ) );
+    }
+}

multisafepay/trunk/src/Services/Qr/QrOrderService.php

r3269746	r3306839
122	122	*/
123	123	public function create_payment_options( string $token ): PaymentOptions {
124		$redirect_cancel_url = ~~get_rest_url( get_current_blog_id(), 'multisafepay/v1/qr-balancer' ) . '?token=' . rawurlencode( $token~~ );
	124	$redirect_cancel_url = add_query_arg( 'token', $token, get_rest_url( get_current_blog_id(), 'multisafepay/v1/qr-balancer' ) );
125	125	$payment_options = new PaymentOptions();
126	126	$payment_options->addNotificationUrl( get_rest_url( get_current_blog_id(), 'multisafepay/v1/qr-notification' ) );

multisafepay/trunk/src/Services/ShoppingCartService.php

-                      r3264984
+                      r3306839
 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\ShoppingCart\Item as CartItem;
 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\ShoppingCart\ShippingItem;
+use MultiSafepay\Exception\InvalidArgumentException;
 use MultiSafepay\WooCommerce\Utils\Hpos;
 use MultiSafepay\WooCommerce\Utils\Logger;
 …
      * @param string|null $gateway_code
      * @return ShoppingCart
+     * @throws InvalidArgumentException
      */
     public function create_shopping_cart( WC_Order $order, string $currency, ?string $gateway_code = '' ): ShoppingCart {
 …
      * @param string                 $gateway_code
      * @return ShippingItem
+     * @throws InvalidArgumentException
      */
     private function create_shipping_cart_item( WC_Order_Item_Shipping $item, string $currency, string $gateway_code ): ShippingItem {
+        $cart_item = new ShippingItem();
+        return $cart_item->addName( __( 'Shipping', 'multisafepay' ) )
+        $cart_item            = new ShippingItem();
+        $shipping_method_name = $item->get_method_title();
+        if ( empty( $shipping_method_name ) ) {
+            $shipping_method_name = __( 'Shipping', 'multisafepay' );
+        }
+        return $cart_item->addName( $shipping_method_name )
             ->addQuantity( 1 )
             ->addUnitPrice( MoneyUtil::create_money( (float) $item->get_total(), $currency ) )
 …
         foreach ( $allowed_rates as $rate ) {
             if ( abs( $tax_rate - $rate ) <= 0.15 ) {
+            if ( abs( $tax_rate - $rate ) <= 0.05 ) {
                 return round( $tax_rate );
+            }

multisafepay/trunk/src/Utils/QrCheckoutManager.php

-                      r3264984
+                      r3306839
 use WC_Cart;
 use WC_Shipping_Rate;
+use WC_Validation;
 /**
 …
     /**
      * Check if all mandatory fields are filled in the checkout in order to submit a MultiSafepay transaction
+     * Check if all mandatory fields are filled in the checkout to submit a MultiSafepay transaction
      * using Payment Component with QR code.
+     *
 …
         // Get required and extra fields
         $required_fields = $this->get_required_fields();
         $extra_fields    = $this->get_extra_fields();
+        $billing_required_fields = $this->get_required_fields();
+        $billing_extra_fields    = $this->get_extra_fields();
         // Determine if shipping to a different address
 …
         // Get shipping fields if necessary
+        $shipping_fields = $ship_to_different_address ?
+            $this->get_shipping_fields( $required_fields, $extra_fields ) :
+            array();
+        $shipping_fields          = array();
+        $shipping_required_fields = array();
+        if ( $ship_to_different_address ) {
+            $shipping_fields          = $this->get_shipping_fields( $billing_required_fields, $billing_extra_fields );
+            $shipping_required_fields = $this->get_shipping_fields( $billing_required_fields, array() );
+        }
         // Combine all fields
+        $all_fields = array_merge( $required_fields, $extra_fields, $shipping_fields );
+        $all_fields = array_merge( $billing_required_fields, $billing_extra_fields, $shipping_fields );
+        // Combine all required fields
+        $all_required_fields = array_merge( $billing_required_fields, $shipping_required_fields );
         // Get order fields
 …
         // Process and validate fields
         $this->process_checkout_data( $all_fields, $required_fields, $order_fields );
+        $this->process_checkout_data( $all_fields, $all_required_fields, $order_fields );
         return $this->is_validated;
 …
      * Get the shipping fields based on required and extra fields.
+     *
      * @param array $required_fields The required fields.
      * @param array $extra_fields The extra fields.
      * @return array
      */
     public function get_shipping_fields( array $required_fields, array $extra_fields ): array {
+     * @param array $billing_required_fields The required fields.
+     * @param array $billing_extra_fields The extra fields.
+     * @return array
+     */
+    public function get_shipping_fields( array $billing_required_fields, array $billing_extra_fields ): array {
         return array_map(
             static function( $field ) {
 …
             },
             array_filter(
                 array_merge( $required_fields, $extra_fields ),
+                array_merge( $billing_required_fields, $billing_extra_fields ),
                 static function( $field ) {
                     // Exclude email and phone fields to be created as shipping fields.
 …
+     *
      * @param array $all_fields All fields to check.
      * @param array $required_fields The required fields.
+     * @param array $all_required_fields The required fields.
      * @param array $order_fields The order fields.
      */
     public function process_checkout_data( array $all_fields, array $required_fields, array $order_fields ): void {
+    public function process_checkout_data( array $all_fields, array $all_required_fields, array $order_fields ): void {
         $this->is_validated = true;
 …
             if ( 'billing_email' === $field ) {
                 $field_value = isset( $this->posted_data[ $field ] ) ? sanitize_email( wp_unslash( $this->posted_data[ $field ] ) ) : '';
+                // Verify the email format using PHP's built-in filter validation
+                if ( ! empty( $field_value ) && ! $this->validate_email( $field_value ) ) {
+                    $this->is_validated = false;
+                }
+            } elseif ( strpos( $field, '_postcode' ) !== false ) {
+                $field_value = isset( $this->posted_data[ $field ] ) ? wp_unslash( $this->posted_data[ $field ] ) : '';
+                $field_value = trim( wp_strip_all_tags( $field_value ) );
+                // Validate a postcode format if not empty
+                if ( ! empty( $field_value ) ) {
+                    $prefix  = strpos( $field, 'billing_' ) === 0 ? 'billing' : 'shipping';
+                    $country = isset( $this->posted_data[ $prefix . '_country' ] ) ? wp_unslash( $this->posted_data[ $prefix . '_country' ] ) : '';
+                    $country = trim( wp_strip_all_tags( $country ) );
+                    if ( ! $this->validate_postcode( $field_value, $country ) ) {
+                        $this->is_validated = false;
+                    }
+                }
             } else {
                 $field_value = isset( $this->posted_data[ $field ] ) ? wp_unslash( $this->posted_data[ $field ] ) : '';
 …
+            }
             // Check if required field is empty
             if ( empty( $field_value ) && in_array( $field, $required_fields, true ) ) {
+            // Check if the required field is empty
+            if ( empty( $field_value ) && in_array( $field, $all_required_fields, true ) ) {
                 $this->is_validated = false;
+            }
 …
+        }
+    }
+    /**
+     * Validate the email address format
+     *
+     * @param string $email The email to validate
+     * @return bool Whether the email is valid
+     */
+    private function validate_email( string $email ): bool {
+        return (bool) filter_var( $email, FILTER_VALIDATE_EMAIL );
+    }
+    /**
+     * Validate a postcode format using WooCommerce's validation
+     *
+     * @param string $postcode The postcode to validate
+     * @param string $country The country code
+     * @return bool Whether the postcode is valid
+     */
+    private function validate_postcode( string $postcode, string $country ): bool {
+        if ( ! WC_Validation::is_postcode( $postcode, $country ) ) {
+            return false;
+        }
+        return true;
+    }
+}

multisafepay/trunk/vendor/autoload.php

r3269746	r3306839
15	15	}
16	16	}
17		trigger_error(
18		$err,
19		E_USER_ERROR
20		);
	17	throw new RuntimeException($err);
21	18	}
22	19
23	20	require_once __DIR__ . '/composer/autoload_real.php';
24	21
25		return ComposerAutoloaderInit~~4c82aacc71005aae20a63510a82d5e07~~::getLoader();
	22	return ComposerAutoloaderIniteb5be672a765e05cf872148d946d1d0b::getLoader();

multisafepay/trunk/vendor/composer/InstalledVersions.php

-                      r3230524
+                      r3306839
 class InstalledVersions
+{
+    /**
+     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+     * @internal
+     */
+    private static $selfDir = null;
     /**
      * @var mixed[]|null
 …
     /**
+     * @return string
+     */
+    private static function getSelfDir()
+    {
+        if (self::$selfDir === null) {
+            self::$selfDir = strtr(__DIR__, '\\', '/');
+        }
+        return self::$selfDir;
+    }
+    /**
      * @return array[]
      * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
 …
         if (self::$canGetVendors) {
             $selfDir = strtr(__DIR__, '\\', '/');
+            $selfDir = self::getSelfDir();
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
                 $vendorDir = strtr($vendorDir, '\\', '/');

multisafepay/trunk/vendor/composer/autoload_real.php

-                      r3269746
+                      r3306839
 // autoload_real.php @generated by Composer
 class ComposerAutoloaderInit4c82aacc71005aae20a63510a82d5e07
+class ComposerAutoloaderIniteb5be672a765e05cf872148d946d1d0b
+{
     private static $loader;
 …
         require __DIR__ . '/platform_check.php';
         spl_autoload_register(array('ComposerAutoloaderInit4c82aacc71005aae20a63510a82d5e07', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderIniteb5be672a765e05cf872148d946d1d0b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit4c82aacc71005aae20a63510a82d5e07', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderIniteb5be672a765e05cf872148d946d1d0b', 'loadClassLoader'));
         require __DIR__ . '/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInit4c82aacc71005aae20a63510a82d5e07::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticIniteb5be672a765e05cf872148d946d1d0b::getInitializer($loader));
         $loader->register(true);

multisafepay/trunk/vendor/composer/autoload_static.php

-                      r3269746
+                      r3306839
 namespace Composer\Autoload;
 class ComposerStaticInit4c82aacc71005aae20a63510a82d5e07
+class ComposerStaticIniteb5be672a765e05cf872148d946d1d0b
+{
     public static $prefixLengthsPsr4 = array (
 …
+    {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit4c82aacc71005aae20a63510a82d5e07::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit4c82aacc71005aae20a63510a82d5e07::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit4c82aacc71005aae20a63510a82d5e07::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticIniteb5be672a765e05cf872148d946d1d0b::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticIniteb5be672a765e05cf872148d946d1d0b::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticIniteb5be672a765e05cf872148d946d1d0b::$classMap;
         }, null, ClassLoader::class);

multisafepay/trunk/vendor/composer/installed.json

-                      r3264984
+                      r3306839
+        {
             "name": "multisafepay/php-sdk",
             "version": "5.16.0",
             "version_normalized": "5.16.0.0",
+            "version": "5.17.0",
+            "version_normalized": "5.17.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MultiSafepay/php-sdk.git",
                 "reference": "849f1cf0c5ae23819422db4f78db948fd590c4ec"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/849f1cf0c5ae23819422db4f78db948fd590c4ec",
                 "reference": "849f1cf0c5ae23819422db4f78db948fd590c4ec",
+                "reference": "4c46227cf3139d76ff08bc4191f06445c867798b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/4c46227cf3139d76ff08bc4191f06445c867798b",
+                "reference": "4c46227cf3139d76ff08bc4191f06445c867798b",
                 "shasum": ""
             },
 …
                 "jschaedl/iban-validation": "Adds additional IBAN validation for \\MultiSafepay\\ValueObject\\IbanNumber"
             },
             "time": "2025-03-19T15:29:14+00:00",
+            "time": "2025-06-04T13:12:21+00:00",
             "type": "library",
             "installation-source": "dist",
 …
             "support": {
                 "issues": "https://github.com/MultiSafepay/php-sdk/issues",
                 "source": "https://github.com/MultiSafepay/php-sdk/tree/5.16.0"
+                "source": "https://github.com/MultiSafepay/php-sdk/tree/5.17.0"
             },
             "install-path": "../multisafepay/php-sdk"

multisafepay/trunk/vendor/composer/installed.php

-                      r3269746
+                      r3306839
     'root' => array(
         'name' => 'multisafepay/woocommerce',
         'pretty_version' => '6.8.3',
         'version' => '6.8.3.0',
+        'pretty_version' => '6.9.0',
+        'version' => '6.9.0.0',
         'reference' => null,
         'type' => 'wordpress-plugin',
 …
     'versions' => array(
         'multisafepay/php-sdk' => array(
             'pretty_version' => '5.16.0',
             'version' => '5.16.0.0',
             'reference' => '849f1cf0c5ae23819422db4f78db948fd590c4ec',
+            'pretty_version' => '5.17.0',
+            'version' => '5.17.0.0',
+            'reference' => '4c46227cf3139d76ff08bc4191f06445c867798b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../multisafepay/php-sdk',
 …
         ),
         'multisafepay/woocommerce' => array(
             'pretty_version' => '6.8.3',
             'version' => '6.8.3.0',
+            'pretty_version' => '6.9.0',
+            'version' => '6.9.0.0',
             'reference' => null,
             'type' => 'wordpress-plugin',

multisafepay/trunk/vendor/multisafepay/php-sdk/CHANGELOG.md

-                      r3264984
+                      r3306839
 ## [Unreleased]
+## [5.17.0] - 2025-06-04
+### Added
+- PHPSDK-172: Add BILLINK to SHOPPING_CART_REQUIRED_GATEWAYS constant
+### Fixed
+- PHPSDK-173: Fix typo in \MultiSafepay\Api\Transactions\OrderRequest\Arguments\GatewayInfo\Creditcard object
+- PHPSDK-174: Fix UnitPrice sometimes having more than 10 decimals
 ## [5.16.0] - 2025-03-19

multisafepay/trunk/vendor/multisafepay/php-sdk/composer.json

r3264984	r3306839
4	4	"type": "library",
5	5	"license": "MIT",
6		"version": "5.16.0",
	6	"version": "5.17.0",
7	7	"require": {
8	8	"php": "^7.2\|^8.0",

multisafepay/trunk/vendor/multisafepay/php-sdk/src/Api/Transactions/Gateways.php

r3072171	r3306839
27	27	'BNPL_OB',
28	28	'BNPL_MF',
	29	'BILLINK',
29	30	);
30	31	}

multisafepay/trunk/vendor/multisafepay/php-sdk/src/Api/Transactions/OrderRequest/Arguments/GatewayInfo/Creditcard.php

-                      r3050467
+                      r3306839
         return [
             'card_number' => $this->cardNumber ? $this->cardNumber->get() : null,
             'cart_holder_name' => $this->cardHolderName,
             'cart_expiry_date' => $this->cardExpiryDate ? $this->cardExpiryDate->get('my') : null,
+            'card_holder_name' => $this->cardHolderName,
+            'card_expiry_date' => $this->cardExpiryDate ? $this->cardExpiryDate->get('ym') : null,
             'cvc' => $this->cvc ? $this->cvc->get() : null,
             'card_cvc' => $this->cvc ? $this->cvc->get() : null,

multisafepay/trunk/vendor/multisafepay/php-sdk/src/Util/Version.php

r3264984	r3306839
18	18	class Version
19	19	{
20		public const SDK_VERSION = '5.16.0';
	20	public const SDK_VERSION = '5.17.0';
21	21
22	22	/**

multisafepay/trunk/vendor/multisafepay/php-sdk/src/ValueObject/CartItem.php

-                      r3264984
+                      r3306839
+    {
         if ($this->unitPrice) {
             return $this->unitPrice->getAmount() / 100;
+        }
         return $this->unitPriceValue->get() ?? 0.0;
+            return round($this->unitPrice->getAmount() / 100, 10);
+        }
+        return round(($this->unitPriceValue->get() ?? 0.0), 10);
+    }

multisafepay/trunk/vendor/multisafepay/php-sdk/src/ValueObject/UnitPrice.php

r3230524	r3306839
15	15
16	16	/**
17		* Should be given in full units excluding tax, preferably including ~~all decimal places~~, e.g. 3.305785124
	17	* Should be given in full units excluding tax, preferably including 10 decimal at most, e.g. 3.305785124
18	18	*
19	19	* @param float $unitPrice

Context Navigation

Legend:

Download in other formats: