WordPress.org
Get WordPress

Plugin Directory

Changeset 3262577


Ignore:
Timestamp:
03/27/2025 07:46:57 AM (12 months ago)
Author:
danielhuesken
Message:

Update develop branch for release 8.0.0

Location:
mollie-payments-for-woocommerce/trunk
Files:
98 added
13 deleted
66 edited

Legend:

Unmodified
Added
Removed

  • mollie-payments-for-woocommerce/trunk/inc/utils.php

    r3191126 r3262577  
    166166function mollieWooCommerceIsMollieGateway($gateway)
    167167{
    168     if (strpos($gateway, 'mollie_wc_gateway_') !== false) {
     168    if (
     169        (is_string($gateway) && strpos($gateway, 'mollie_wc_gateway_') !== false)
     170        || (is_object($gateway) && strpos($gateway->id, 'mollie_wc_gateway_') !== false)
     171    ) {
    169172        return true;
    170173    }

  • mollie-payments-for-woocommerce/trunk/mollie-payments-for-woocommerce.php

    r3242448 r3262577  
    55 * Plugin URI: https://www.mollie.com
    66 * Description: Accept payments in WooCommerce with the official Mollie plugin
    7  * Version: 7.10.0
     7 * Version: 8.0.0
    88 * Author: Mollie
    99 * Author URI: https://www.mollie.com
    … …  
    1414 * License: GPLv2 or later
    1515 * WC requires at least: 3.9
    16  * WC tested up to: 9.5
     16 * WC tested up to: 9.7
    1717 * Requires PHP: 7.4
    1818 * Requires Plugins: woocommerce
    … …  
    9797function initialize()
    9898{
    99     try {
    100         require_once __DIR__ . '/inc/functions.php';
    101         if (!mollie_wc_plugin_autoload()) {
    102             return;
     99    static $package;
     100    if (!$package) {
     101        try {
     102            require_once __DIR__ . '/inc/functions.php';
     103            if (!mollie_wc_plugin_autoload()) {
     104                return;
     105            }
     106            $checker = new ConstraintsChecker();
     107            $meetRequirements = $checker->handleActivation();
     108            if (!$meetRequirements) {
     109                $nextScheduledTime = wp_next_scheduled('pending_payment_confirmation_check');
     110                if ($nextScheduledTime) {
     111                    wp_unschedule_event($nextScheduledTime, 'pending_payment_confirmation_check');
     112                }
     113                return;
     114            }
     115            // Initialize plugin.
     116            $properties = PluginProperties::new(__FILE__);
     117            $package = Package::new($properties);
     118            $modules = (require __DIR__ . '/inc/modules.php')();
     119            $modules = apply_filters('mollie_wc_plugin_modules', $modules);
     120            foreach ($modules as $module) {
     121                $package->addModule($module);
     122            }
     123            $package->boot();
     124        } catch (Throwable $throwable) {
     125            handleException($throwable);
    103126        }
    104         $checker = new ConstraintsChecker();
    105         $meetRequirements = $checker->handleActivation();
    106         if (!$meetRequirements) {
    107             $nextScheduledTime = wp_next_scheduled('pending_payment_confirmation_check');
    108             if ($nextScheduledTime) {
    109                 wp_unschedule_event($nextScheduledTime, 'pending_payment_confirmation_check');
    110             }
    111             return;
    112         }
    113         // Initialize plugin.
    114         $properties = PluginProperties::new(__FILE__);
    115         $bootstrap = Package::new($properties);
    116         $modules = [new ActivationModule(__FILE__, $properties->get('version')), new NoticeModule(), new SharedModule(), new SDKModule(), new SettingsModule(), new LogModule('mollie-payments-for-woocommerce-'), new AssetsModule(), new GatewayModule(), new VoucherModule(), new PaymentModule(), new MerchantCaptureModule(), new UninstallModule()];
    117         $modules = apply_filters('mollie_wc_plugin_modules', $modules);
    118         foreach ($modules as $module) {
    119             $bootstrap->addModule($module);
    120         }
    121         $bootstrap->boot();
    122     } catch (Throwable $throwable) {
    123         handleException($throwable);
    124127    }
     128    /** @var Package $package */
     129    return $package;
    125130}
    126 add_action('plugins_loaded', __NAMESPACE__ . '\initialize');
     131add_action(
     132    /**
     133     * @throws Throwable
     134     */
     135    'plugins_loaded',
     136    static function () {
     137        initialize();
     138    }
     139);

  • mollie-payments-for-woocommerce/trunk/public/js/mollieBlockIndex.min.js

    r3242448 r3262577  
    338338  return wcSettings.currency.priceFormat.replace('%1$s', wcSettings.currency.symbol).replace('%2$s', price.toFixed(wcSettings.currency.precision).replace('.', wcSettings.currency.decimalSeparator));
    339339}
    340 function loadCachedAvailableGateways() {
    341   var storedData = localStorage.getItem('cachedAvailableGateways');
    342   if (storedData) {
    343     try {
    344       cachedAvailableGateways = JSON.parse(storedData);
    345     } catch (e) {
    346       console.warn('Error parsing cachedAvailableGateways from localStorage:', e);
    347       cachedAvailableGateways = {};
    348     }
    349   }
    350 }
    351 function saveCachedAvailableGateways() {
    352   localStorage.setItem('cachedAvailableGateways', JSON.stringify(cachedAvailableGateways));
    353 }
    354 loadCachedAvailableGateways();
    355340function setAvailableGateways(country, currencyCode, data) {
    356341  cachedAvailableGateways = _objectSpread(_objectSpread({}, cachedAvailableGateways), data);
    357   saveCachedAvailableGateways();
    358342}
    359 function useMollieAvailableGateways(billing, currencyCode, cartTotal, filters, ajaxUrl, jQuery, item) {
     343function useMollieAvailableGateways(billing, currencyCode, cartTotal, filters, ajaxUrl) {
    360344  var country = billing.country;
    361345  var code = currencyCode;
    … …  
    366350  }
    367351  wp.element.useEffect(function () {
    368     if (!country || !item) return;
     352    if (!country) return;
    369353    var currencyCode = code;
    370354    var cartTotal = value;
    … …  
    373357      return;
    374358    }
    375     jQuery.ajax({
    376       url: ajaxUrl,
     359    fetch(ajaxUrl, {
    377360      method: 'POST',
    378       data: {
     361      headers: {
     362        "Content-Type": "application/x-www-form-urlencoded"
     363      },
     364      body: new URLSearchParams({
    379365        action: 'mollie_checkout_blocks_canmakepayment',
    380         currentGateway: item,
    381366        currency: currencyCode,
    382367        billingCountry: country,
    383368        cartTotal: cartTotal,
    384369        paymentLocale: filters.paymentLocale
    385       },
    386       success: function success(response) {
    387         setAvailableGateways(country, currencyCode, response.data);
    388         var cartTotals = wp.data.select('wc/store/cart').getCartTotals();
    389         // Dispatch them again to trigger a re-render:
    390         wp.data.dispatch('wc/store/cart').setCartData(_objectSpread({}, cartTotals));
    391       },
    392       error: function error(jqXHR, textStatus, errorThrown) {
    393         console.warn('Failed to fetch available gateways:', textStatus, errorThrown);
    394       }
     370      })
     371    }).then(function (response) {
     372      return response.json();
     373    }).then(function (data) {
     374      setAvailableGateways(country, currencyCode, data.data);
     375      var cartTotals = wp.data.select('wc/store/cart').getCartTotals();
     376      // Dispatch them again to trigger a re-render:
     377      wp.data.dispatch('wc/store/cart').setCartData(_objectSpread({}, cartTotals));
    395378    });
    396   }, [billing, currencyCode, filters.paymentLocale, ajaxUrl, jQuery, item]);
     379  }, [billing, currencyCode, filters.paymentLocale]);
    397380  return cachedAvailableGateways;
    398381}
    … …  
    404387    cartTotal = _ref.cartTotal,
    405388    filters = _ref.filters,
    406     ajaxUrl = _ref.ajaxUrl,
    407     jQuery = _ref.jQuery,
    408     item = _ref.item;
    409   useMollieAvailableGateways(billing, currencyCode, cartTotal, filters, ajaxUrl, jQuery, item);
     389    ajaxUrl = _ref.ajaxUrl;
     390  useMollieAvailableGateways(billing, currencyCode, cartTotal, filters, ajaxUrl);
    410391  return null;
    411392}
    … …  
    523504  useEffect(function () {
    524505    var onProcessingPayment = function onProcessingPayment() {
     506      var data = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     507        payment_method: activePaymentMethod,
     508        payment_method_title: item.title
     509      }, issuerKey, selectedIssuer), "billing_phone", inputPhone), "billing_company_billie", inputCompany), "billing_birthdate", inputBirthdate), "cardToken", '');
    525510      var tokenVal = jQuery('.mollie-components > input').val();
     511      if (tokenVal) {
     512        data.cardToken = tokenVal;
     513      }
    526514      return {
    527515        type: responseTypes.SUCCESS,
    528516        meta: {
    529           paymentMethodData: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
    530             payment_method: activePaymentMethod,
    531             payment_method_title: item.title
    532           }, issuerKey, selectedIssuer), "billing_phone", inputPhone), "billing_company_billie", inputCompany), "billing_birthdate", inputBirthdate), "cardToken", tokenVal)
     517          paymentMethodData: data
    533518        }
    534519      };
    … …  
    682667  var item = _ref2.item,
    683668    filters = _ref2.filters,
    684     ajaxUrl = _ref2.ajaxUrl,
    685     jQuery = _ref2.jQuery;
     669    ajaxUrl = _ref2.ajaxUrl;
    686670  var cartData = wp.data.useSelect(function (select) {
    687671    return select('wc/store/cart').getCartData();
    … …  
    700684    filters: filters,
    701685    ajaxUrl: ajaxUrl,
    702     jQuery: jQuery,
    703     item: item,
    704686    cartTotal: cartTotal
    705687  }));
    706688};
    707689var molliePaymentMethod = function molliePaymentMethod(useEffect, ajaxUrl, filters, gatewayData, availableGateways, item, jQuery, requiredFields, isCompanyFieldVisible, isPhoneFieldVisible) {
    708   document.addEventListener('mollie_components_ready_to_submit', function () {
    709     onSubmitLocal();
    710   });
     690  if (item.name === "mollie_wc_gateway_creditcard") {
     691    document.addEventListener('mollie_components_ready_to_submit', function () {
     692      onSubmitLocal();
     693    });
     694  }
    711695  function creditcardSelectedEvent() {
    712696    if (item.name === "mollie_wc_gateway_creditcard") {
    713697      document.documentElement.dispatchEvent(creditCardSelected);
    714698    }
    715   }
    716 
    717   // On first load, if availableGateways is not empty, store it
    718   if (_.isEmpty(cachedAvailableGateways) && !_.isEmpty(availableGateways)) {
    719     cachedAvailableGateways = availableGateways;
    720     saveCachedAvailableGateways();
    721699  }
    722700  return {
    … …  
    725703      item: item,
    726704      ajaxUrl: ajaxUrl,
    727       jQuery: jQuery,
    728705      filters: filters
    729706    }),
    … …  
    747724        return true;
    748725      }
    749       loadCachedAvailableGateways();
    750726      var currencyCode = cartTotals === null || cartTotals === void 0 ? void 0 : cartTotals.currency_code;
    751727      var country = billingData === null || billingData === void 0 ? void 0 : billingData.country;
    … …  
    757733      creditcardSelectedEvent();
    758734      if (!cachedAvailableGateways.hasOwnProperty(currentFilterKey)) {
    759         return false;
    760       }
    761       return cachedAvailableGateways[currentFilterKey].hasOwnProperty(item.name);
     735        cachedAvailableGateways = _objectSpread(_objectSpread({}, cachedAvailableGateways), availableGateways);
     736      }
     737      if (availableGateways.hasOwnProperty(currentFilterKey) && availableGateways[currentFilterKey].hasOwnProperty(item.name)) {
     738        return true;
     739      }
     740      if (cachedAvailableGateways.hasOwnProperty(currentFilterKey) && cachedAvailableGateways[currentFilterKey].hasOwnProperty(item.name)) {
     741        return true;
     742      }
     743      return false;
    762744    },
    763745    ariaLabel: item.ariaLabel,
    … …  
    857839  var useEffect = wp.element.useEffect;
    858840  var isAppleSession = typeof window.ApplePaySession === "function";
    859   localStorage.removeItem('cachedAvailableGateways');
    860841  function getPhoneField() {
    861842    var phoneFieldDataset = document.querySelector('[data-show-phone-field]');
    … …  
    911892/******/ })()
    912893;
    913 //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"mollieBlockIndex.min.js","mappings":"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","sources":["webpack://mollie-payments-for-woocommerce/./resources/js/applePayError.js","webpack://mollie-payments-for-woocommerce/./resources/js/applePayRequest.js","webpack://mollie-payments-for-woocommerce/./resources/js/blocks/ApplePayButtonComponent.js","webpack://mollie-payments-for-woocommerce/./resources/js/blocks/ApplePayButtonEditorComponent.js","webpack://mollie-payments-for-woocommerce/./resources/js/blocks/molliePaymentMethod.js","webpack://mollie-payments-for-woocommerce/webpack/bootstrap","webpack://mollie-payments-for-woocommerce/webpack/runtime/define property getters","webpack://mollie-payments-for-woocommerce/webpack/runtime/hasOwnProperty shorthand","webpack://mollie-payments-for-woocommerce/webpack/runtime/make namespace object","webpack://mollie-payments-for-woocommerce/./resources/js/mollieBlockIndex.js"],"sourcesContent":["export function createAppleErrors(errors) {\n    const errorList = []\n    for (const error of errors) {\n        const {contactField = null, code = null, message = null} = error\n        const appleError = contactField ? new ApplePayError(code, contactField, message) : new ApplePayError(code)\n        errorList.push(appleError)\n    }\n\n    return errorList\n}\n","export const request = (countryCode, currencyCode, totalLabel, subtotal) => {\n    return {\n        countryCode: countryCode,\n        currencyCode: currencyCode,\n        supportedNetworks: ['amex', 'maestro', 'masterCard', 'visa', 'vPay'],\n        merchantCapabilities: ['supports3DS'],\n        shippingType: 'shipping',\n        requiredBillingContactFields: [\n            'postalAddress',\n            'email'\n        ],\n        requiredShippingContactFields: [\n            'postalAddress',\n            'email'\n        ],\n        total: {\n            label: totalLabel,\n            amount: subtotal,\n            type: 'final'\n        }\n    }\n}\n","import {request} from \"../applePayRequest\";\nimport {createAppleErrors} from \"../applePayError\";\n\nexport const ApplePayButtonComponent = ({ buttonAttributes = {} }) => {\n    const mollieApplePayBlockDataCart = window.mollieApplePayBlockDataCart || window.mollieBlockData.mollieApplePayBlockDataCart\n    const nonce = document.getElementById(\"woocommerce-process-checkout-nonce\").value\n    let updatedContactInfo = []\n    let redirectionUrl = ''\n    const {\n        product: {needShipping = true, subtotal},\n        shop: {countryCode, currencyCode = 'EUR', totalLabel = ''},\n        ajaxUrl,\n    } = mollieApplePayBlockDataCart\n    const style = {\n        height: `${buttonAttributes.height || 48}px`,\n        borderRadius: `${buttonAttributes.borderRadius || 4}px`\n    }\n\n    const findSelectedShippingMethod = (shippingRates) => {\n        let shippingRate = shippingRates.find((shippingMethod) => shippingMethod.selected === true)\n        const appleFormattedRate = {\n            amount: '',\n            detail: '',\n            label: shippingRate.name,\n            identifier: shippingRate.rate_id,\n            selected: shippingRate.selected,\n        }\n        return shippingRate ? appleFormattedRate : ''\n    }\n\n    let applePaySession = () => {\n        const session = new ApplePaySession(3, request(countryCode, currencyCode, totalLabel, subtotal))\n        const store = wp.data.select('wc/store/cart')\n        const shippingRates = store.getShippingRates()?.[0]?.shipping_rates;\n        let selectedShippingMethod = '';\n        if (shippingRates && shippingRates.length > 0) {\n            selectedShippingMethod = findSelectedShippingMethod(shippingRates, selectedShippingMethod);\n        }\n            session.onshippingmethodselected = function (event) {\n            jQuery.ajax({\n                url: ajaxUrl,\n                method: 'POST',\n                data: {\n                    action: 'mollie_apple_pay_update_shipping_method',\n                    shippingMethod: event.shippingMethod,\n                    callerPage: 'cart',\n                    simplifiedContact: updatedContactInfo,\n                    'woocommerce-process-checkout-nonce': nonce,\n                },\n                success: (applePayShippingMethodUpdate, textStatus, jqXHR) => {\n                    let response = applePayShippingMethodUpdate.data\n                    selectedShippingMethod = event.shippingMethod\n                    if (applePayShippingMethodUpdate.success === false) {\n                        response.errors = createAppleErrors(response.errors)\n                    }\n                    this.completeShippingMethodSelection(response)\n                },\n                error: (jqXHR, textStatus, errorThrown) => {\n                    console.warn(textStatus, errorThrown)\n                    session.abort()\n                },\n            })\n        }\n        session.onshippingcontactselected = function (event) {\n            jQuery.ajax({\n                url: ajaxUrl,\n                method: 'POST',\n                data: {\n                    action: 'mollie_apple_pay_update_shipping_contact',\n                    simplifiedContact: event.shippingContact,\n                    callerPage: 'cart',\n                    needShipping: needShipping,\n                    'woocommerce-process-checkout-nonce': nonce,\n                    shippingMethod: selectedShippingMethod,\n                },\n                success: (applePayShippingContactUpdate, textStatus, jqXHR) => {\n                    let response = applePayShippingContactUpdate.data\n                    updatedContactInfo = event.shippingContact\n                    if (applePayShippingContactUpdate.success === false) {\n                        response.errors = createAppleErrors(response.errors)\n                    }\n                    if (response.newShippingMethods) {\n                        selectedShippingMethod = response.newShippingMethods[0]\n                    }\n                    this.completeShippingContactSelection(response)\n                },\n                error: (jqXHR, textStatus, errorThrown) => {\n                    console.warn(textStatus, errorThrown)\n                    session.abort()\n                },\n            })\n        }\n        session.onvalidatemerchant = (applePayValidateMerchantEvent) => {\n            jQuery.ajax({\n                url: ajaxUrl,\n                method: 'POST',\n                data: {\n                    action: 'mollie_apple_pay_validation',\n                    validationUrl: applePayValidateMerchantEvent.validationURL,\n                    'woocommerce-process-checkout-nonce': nonce,\n                },\n                success: (merchantSession, textStatus, jqXHR) => {\n                    if (merchantSession.success === true) {\n                        session.completeMerchantValidation(JSON.parse(merchantSession.data))\n                    } else {\n                        console.warn(merchantSession.data)\n                        session.abort()\n                    }\n                },\n                error: (jqXHR, textStatus, errorThrown) => {\n                    console.warn(textStatus, errorThrown)\n                    session.abort()\n                },\n            })\n        }\n        session.onpaymentauthorized = (ApplePayPayment) => {\n            const {billingContact, shippingContact} = ApplePayPayment.payment\n\n            jQuery.ajax({\n                url: ajaxUrl,\n                method: 'POST',\n                data: {\n                    action: 'mollie_apple_pay_create_order_cart',\n                    shippingContact: ApplePayPayment.payment.shippingContact,\n                    billingContact: ApplePayPayment.payment.billingContact,\n                    token: ApplePayPayment.payment.token,\n                    shippingMethod: selectedShippingMethod,\n                    'mollie-payments-for-woocommerce_issuer_applepay': 'applepay',\n                    'woocommerce-process-checkout-nonce': nonce,\n                    'billing_first_name': billingContact.givenName || '',\n                    'billing_last_name': billingContact.familyName || '',\n                    'billing_company': '',\n                    'billing_country': billingContact.countryCode || '',\n                    'billing_address_1': billingContact.addressLines[0] || '',\n                    'billing_address_2': billingContact.addressLines[1] || '',\n                    'billing_postcode': billingContact.postalCode || '',\n                    'billing_city': billingContact.locality || '',\n                    'billing_state': billingContact.administrativeArea || '',\n                    'billing_phone': billingContact.phoneNumber || '000000000000',\n                    'billing_email': shippingContact.emailAddress || '',\n                    'shipping_first_name': shippingContact.givenName || '',\n                    'shipping_last_name': shippingContact.familyName || '',\n                    'shipping_company': '',\n                    'shipping_country': shippingContact.countryCode || '',\n                    'shipping_address_1': shippingContact.addressLines[0] || '',\n                    'shipping_address_2': shippingContact.addressLines[1] || '',\n                    'shipping_postcode': shippingContact.postalCode || '',\n                    'shipping_city': shippingContact.locality || '',\n                    'shipping_state': shippingContact.administrativeArea || '',\n                    'shipping_phone': shippingContact.phoneNumber || '000000000000',\n                    'shipping_email': shippingContact.emailAddress || '',\n                    'order_comments': '',\n                    'payment_method': 'mollie_wc_gateway_applepay',\n                    '_wp_http_referer': '/?wc-ajax=update_order_review'\n                },\n                success: (authorizationResult, textStatus, jqXHR) => {\n                    let result = authorizationResult.data\n                    if (authorizationResult.success === true) {\n                        redirectionUrl = result['returnUrl'];\n                        session.completePayment(result['responseToApple'])\n                        window.location.href = redirectionUrl\n                    } else {\n                        result.errors = createAppleErrors(result.errors)\n                        session.completePayment(result)\n                    }\n                },\n                error: (jqXHR, textStatus, errorThrown) => {\n                    console.warn(textStatus, errorThrown)\n                    session.abort()\n                },\n            })\n        }\n        session.begin()\n    }\n\n    return (\n        <button\n            id=\"mollie_applepay_button\"\n            className=\"apple-pay-button apple-pay-button-black\"\n            onClick={(event) => {\n                event.preventDefault();\n                applePaySession();\n            }}\n            style={style}\n        >\n        </button>\n    );\n}\n\nexport default ApplePayButtonComponent;\n","export const ApplePayButtonEditorComponent = ({ buttonAttributes = {} }) => {\n    const style = {\n        height: `${buttonAttributes.height || 48}px`,\n        borderRadius: `${buttonAttributes.borderRadius || 4}px`\n    }\n\n    return (\n        <button\n            id=\"mollie_applepay_button\"\n            className=\"apple-pay-button apple-pay-button-black\"\n            style={style}\n        >\n        </button>\n    );\n};\nexport default ApplePayButtonEditorComponent;\n","let cachedAvailableGateways = {};\n\nfunction formatPriceLikeWc(price) {\n    // todo add thousandSeparator\n    return wcSettings.currency.priceFormat.replace('%1$s', wcSettings.currency.symbol).replace('%2$s',price.toFixed(wcSettings.currency.precision).replace('.', wcSettings.currency.decimalSeparator));\n}\n\nfunction loadCachedAvailableGateways() {\n    const storedData = localStorage.getItem('cachedAvailableGateways');\n    if (storedData) {\n        try {\n            cachedAvailableGateways = JSON.parse(storedData);\n        } catch (e) {\n            console.warn('Error parsing cachedAvailableGateways from localStorage:', e);\n            cachedAvailableGateways = {};\n        }\n    }\n}\n\nfunction saveCachedAvailableGateways() {\n    localStorage.setItem('cachedAvailableGateways', JSON.stringify(cachedAvailableGateways));\n}\n\nloadCachedAvailableGateways();\nfunction setAvailableGateways(country, currencyCode, data) {\n    cachedAvailableGateways = {\n        ...cachedAvailableGateways,\n        ...data\n    };\n    saveCachedAvailableGateways();\n}\nfunction useMollieAvailableGateways(billing, currencyCode, cartTotal, filters, ajaxUrl, jQuery, item) {\n    let country = billing.country;\n    const code = currencyCode;\n    const value = cartTotal;\n    if (!country) {\n        country = wcSettings?.baseLocation.country;\n    }\n\n    wp.element.useEffect(() => {\n        if (!country || !item) return;\n        const currencyCode = code;\n        const cartTotal = value;\n        const currentFilterKey = currencyCode + \"-\" + country;\n        if (cachedAvailableGateways.hasOwnProperty(currentFilterKey)) {\n            return;\n        }\n        jQuery.ajax({\n            url: ajaxUrl,\n            method: 'POST',\n            data: {\n                action: 'mollie_checkout_blocks_canmakepayment',\n                currentGateway: item,\n                currency: currencyCode,\n                billingCountry: country,\n                cartTotal,\n                paymentLocale: filters.paymentLocale\n            },\n            success: (response) => {\n                setAvailableGateways(country, currencyCode, response.data);\n                const cartTotals = wp.data.select('wc/store/cart').getCartTotals();\n                // Dispatch them again to trigger a re-render:\n                wp.data.dispatch('wc/store/cart').setCartData({...cartTotals});\n            },\n            error: (jqXHR, textStatus, errorThrown) => {\n                console.warn('Failed to fetch available gateways:', textStatus, errorThrown);\n            },\n        });\n    }, [billing, currencyCode, filters.paymentLocale, ajaxUrl, jQuery, item]);\n\n    return cachedAvailableGateways;\n}\n\n// Component that runs the hook but does not render anything.\nfunction MollieGatewayUpdater({ billing, currencyCode, cartTotal, filters, ajaxUrl, jQuery, item }) {\n\n    useMollieAvailableGateways(billing, currencyCode, cartTotal, filters, ajaxUrl, jQuery, item);\n    return null;\n}\n\nlet onSubmitLocal\nlet activePaymentMethodLocal\nlet creditCardSelected = new Event(\"mollie_creditcard_component_selected\", {bubbles: true});\nconst MollieComponent = (props) => {\n    let {onSubmit, activePaymentMethod, billing, item, useEffect, ajaxUrl, jQuery, emitResponse, eventRegistration, requiredFields, shippingData, isPhoneFieldVisible} = props\n    const {  responseTypes } = emitResponse;\n    const {onPaymentSetup, onCheckoutValidation} = eventRegistration;\n    if (!item || !item.name) {\n        return <div>Loading payment methods...</div>;\n    }\n    const [ selectedIssuer, selectIssuer ] = wp.element.useState('');\n    const [ inputPhone, selectPhone ] = wp.element.useState('');\n    const [ inputBirthdate, selectBirthdate ] = wp.element.useState('');\n    const [ inputCompany, selectCompany ] = wp.element.useState('');\n    const issuerKey = 'mollie-payments-for-woocommerce_issuer_' + activePaymentMethod\n    const {companyNameString, phoneString} = requiredFields\n    function getPhoneField()\n    {\n        const shippingPhone = document.getElementById('shipping-phone');\n        const billingPhone = document.getElementById('billing-phone');\n        return billingPhone || shippingPhone;\n    }\n    function updateTotalLabel(newTotal) {\n        let totalSpan = \"<span class='wc-block-formatted-money-amount wc-block-components-formatted-money-amount wc-block-components-totals-item__value'>\" + formatPriceLikeWc(newTotal) + \"</span>\"\n        let total = jQuery('.wc-block-components-totals-footer-item .wc-block-formatted-money-amount:first')\n        total.replaceWith(totalSpan)\n    }\n    function updateTaxesLabel(newTotal) {\n        let totalSpan = \"<span class='wc-block-formatted-money-amount wc-block-components-formatted-money-amount wc-block-components-totals-item__value'>\" + formatPriceLikeWc(newTotal) + \"</span>\"\n        let total = jQuery('div.wp-block-woocommerce-checkout-order-summary-taxes-block.wc-block-components-totals-wrapper > div > span.wc-block-formatted-money-amount.wc-block-components-formatted-money-amount.wc-block-components-totals-item__value:first')\n        total.replaceWith(totalSpan)\n    }\n\n    function hideFee(fee, response) {\n        fee?.hide()\n        updateTotalLabel(response.data.newTotal);\n        updateTaxesLabel(response.data.totalTax);\n    }\n\n    function feeMarkup(response) {\n        return \"<div class='wc-block-components-totals-item wc-block-components-totals-fees'>\" +\n            \"<span class='wc-block-components-totals-item__label'>\"\n            + response.data.name\n            + \"</span>\" +\n            \"<span class='wc-block-formatted-money-amount wc-block-components-formatted-money-amount wc-block-components-totals-item__value'>\"\n            + formatPriceLikeWc(response.data.amount)\n            + \"</span>\" +\n            \"<div class='wc-block-components-totals-item__description'>\" +\n            \"</div>\" +\n            \"</div>\";\n    }\n\n    function replaceFee(fee, newFee, response) {\n        fee.replaceWith(newFee)\n        updateTotalLabel(response.data.newTotal);\n        updateTaxesLabel(response.data.totalTax);\n    }\n\n    function insertNewFee(newFee, response) {\n        const subtotal = jQuery('.wc-block-components-totals-item:first')\n        subtotal.after(newFee)\n        updateTotalLabel(response.data.newTotal);\n        updateTaxesLabel(response.data.totalTax);\n    }\n\n    function handleFees(response) {\n        const fee = jQuery('.wc-block-components-totals-fees')\n        if (!response.data.amount) {\n            hideFee(fee, response);\n            return\n        }\n\n        let newFee = feeMarkup(response);\n        if (fee.length) {\n            replaceFee(fee, newFee, response);\n            return\n        }\n        insertNewFee(newFee, response);\n    }\n\n    useEffect(() => {\n        if(activePaymentMethodLocal !== activePaymentMethod && activePaymentMethod === 'mollie_wc_gateway_creditcard'){\n            document.documentElement.dispatchEvent(creditCardSelected);\n        }\n        activePaymentMethodLocal = activePaymentMethod\n        jQuery.ajax({\n            url: ajaxUrl,\n            method: 'POST',\n            data: {\n                action: 'mollie_checkout_blocks_surchage',\n                method: activePaymentMethod\n            },\n            complete: (jqXHR, textStatus) => {\n            },\n            success: (response, textStatus, jqXHR) => {\n                handleFees(response)\n            },\n            error: (jqXHR, textStatus, errorThrown) => {\n                console.warn(textStatus, errorThrown)\n            },\n        })\n    }, [activePaymentMethod, billing.cartTotal])\n\n    useEffect(() => {\n        const onProcessingPayment = () => {\n            const tokenVal = jQuery('.mollie-components > input').val()\n            return {\n                type: responseTypes.SUCCESS,\n                meta: {\n                    paymentMethodData: {\n                        payment_method: activePaymentMethod,\n                        payment_method_title: item.title,\n                        [issuerKey]: selectedIssuer,\n                        billing_phone: inputPhone,\n                        billing_company_billie: inputCompany,\n                        billing_birthdate: inputBirthdate,\n                        cardToken: tokenVal,\n                    }\n                },\n            };\n        }\n\n        const unsubscribePaymentProcessing = onPaymentSetup(\n            onProcessingPayment\n        );\n        return () => {\n            unsubscribePaymentProcessing()\n        };\n\n    }, [selectedIssuer, onPaymentSetup, inputPhone, inputCompany, inputBirthdate])\n\n    useEffect(() => {\n        let companyLabel = jQuery('div.wc-block-components-text-input.wc-block-components-address-form__company > label')\n        if (companyLabel.length === 0 || item.hideCompanyField === true) {\n            return\n        }\n\n        if (activePaymentMethod === 'mollie_wc_gateway_billie') {\n            let message = item.companyPlaceholder\n            companyLabel.replaceWith('<label htmlFor=\"shipping-company\">' + message + '</label>')\n        } else {\n            if (companyNameString !== false) {\n                companyLabel.replaceWith('<label htmlFor=\"shipping-company\">' + companyNameString + '</label>')\n            }\n        }\n        let isCompanyEmpty = (billing.billingData.company === '' && shippingData.shippingAddress.company === '') && inputCompany === '';\n        const unsubscribeProcessing = onCheckoutValidation(\n            () => {\n                if (activePaymentMethod === 'mollie_wc_gateway_billie' && isCompanyEmpty) {\n                    return {\n                        errorMessage: item.errorMessage,\n                    };\n                }\n            }\n        );\n        return () => {\n            unsubscribeProcessing()\n        };\n\n    }, [activePaymentMethod, onCheckoutValidation, billing.billingData, item, companyNameString, inputCompany]);\n\n    useEffect(() => {\n        let phoneLabel = getPhoneField()?.labels?.[0] ?? null;\n        if (!phoneLabel || phoneLabel.length === 0) {\n            return\n        }\n        if (activePaymentMethod === 'mollie_wc_gateway_in3') {\n            phoneLabel.innerText = item.phonePlaceholder\n        } else {\n            if (phoneString !== false) {\n                phoneLabel.innerText = phoneString\n            }\n        }\n        let isPhoneEmpty = (billing.billingData.phone === '' && shippingData.shippingAddress.phone === '') && inputPhone === '';\n        let isBirthdateValid = inputBirthdate === ''\n        let today = new Date();\n        let birthdate = new Date(inputBirthdate);\n        if (birthdate > today) {\n            isBirthdateValid = false\n        }\n        const unsubscribeProcessing = onCheckoutValidation(\n\n            () => {\n                if (activePaymentMethod === 'mollie_wc_gateway_in3' && (isPhoneEmpty || isBirthdateValid)) {\n                    return {\n                        errorMessage: item.errorMessage,\n                    };\n                }\n            }\n        );\n        return () => {\n            unsubscribeProcessing()\n        };\n\n    }, [activePaymentMethod, onCheckoutValidation, billing.billingData, shippingData.shippingAddress, item, phoneString, inputBirthdate, inputPhone]);\n\n    onSubmitLocal = onSubmit\n    const updateIssuer = (e) => selectIssuer(e.target.value);\n    const updateCompany = (e) => selectCompany(e.target.value);\n    const updatePhone = (e) => selectPhone(e.target.value);\n    const updateBirthdate = (e) => selectBirthdate( e.target.value );\n\n    function fieldMarkup(id, fieldType, label, action, value, placeholder = null) {\n        const className = \"wc-block-components-text-input wc-block-components-address-form__\" + id;\n        return <div class=\"custom-input\">\n            <label htmlFor={id} dangerouslySetInnerHTML={{__html: label}}></label>\n            <input type={fieldType} name={id} id={id} value={value} onChange={action} placeholder={placeholder}></input>\n        </div>\n    }\n\n    if (item.issuers && item.name !== \"mollie_wc_gateway_creditcard\"){\n        return <div><p>{item.content}</p><select name={issuerKey} dangerouslySetInnerHTML={ {__html: item.issuers} } value={selectedIssuer} onChange={updateIssuer}></select></div>\n    }\n\n    if(item.name === \"mollie_wc_gateway_creditcard\"){\n        return <div dangerouslySetInnerHTML={ {__html: item.content} }></div>;\n    }\n\n    if (item.name === \"mollie_wc_gateway_billie\") {\n        const billingCompanyField = document.querySelector('#billing-company');\n        const shippingCompanyField = document.querySelector('#shipping-company');\n        const isBillingCompanyRequired = billingCompanyField?.hasAttribute('required');\n        const isShippingCompanyRequired = shippingCompanyField?.hasAttribute('required');\n\n        if ((billingCompanyField && isBillingCompanyRequired) || (shippingCompanyField && isShippingCompanyRequired) || item.hideCompanyField === true) {\n            return;\n        }\n\n        const companyField = item.companyPlaceholder ? item.companyPlaceholder : \"Company name\";\n        return (\n            <>\n                <div><p>{item.content}</p></div>\n                {fieldMarkup(\"billing_company_billie\",\"text\", companyField, updateCompany, inputCompany)}\n            </>\n        );\n    }\n\n    useEffect(() => {\n        const countryCodes = {\n            BE: '+32xxxxxxxxx',\n            NL: '+316xxxxxxxx',\n            DE: '+49xxxxxxxxx',\n            AT: '+43xxxxxxxxx',\n        };\n        const country = billing.billingData.country;\n        item.phonePlaceholder = countryCodes[country] || countryCodes['NL'];\n    }, [billing.billingData.country]);\n\n    if (item.name === \"mollie_wc_gateway_in3\") {\n        const birthdateField = item.birthdatePlaceholder || \"Birthdate\";\n        const phoneField = item.phonePlaceholder || \"+316xxxxxxxx\";\n        const phoneLabel = item.phoneLabel || \"Phone\";\n        return (\n            <>\n                <div><p>{item.content}</p></div>\n                {fieldMarkup(\"billing-birthdate\", \"date\", birthdateField, updateBirthdate, inputBirthdate)}\n                {!isPhoneFieldVisible && fieldMarkup(\"billing-phone-in3\", \"tel\", phoneLabel, updatePhone, inputPhone, phoneField)}\n            </>\n        );\n    }\n\n    if (item.name === \"mollie_wc_gateway_riverty\") {\n        const birthdateField = item.birthdatePlaceholder || \"Birthdate\";\n        const phoneField = item.phonePlaceholder || \"+316xxxxxxxx\";\n        const phoneLabel = item.phoneLabel || \"Phone\";\n        return (\n            <>\n                <div><p>{item.content}</p></div>\n                {fieldMarkup(\"billing-birthdate\", \"date\", birthdateField, updateBirthdate, inputBirthdate)}\n                {!isPhoneFieldVisible && fieldMarkup(\"billing-phone-riverty\", \"tel\", phoneLabel, updatePhone, inputPhone, phoneField)}\n            </>\n        );\n    }\n\n    return <div><p>{item.content}</p></div>\n}\n\nconst Label = ({ item, filters, ajaxUrl, jQuery }) => {\n    const cartData = wp.data.useSelect((select) =>\n            select('wc/store/cart').getCartData(),\n        []\n    );\n    const cartTotals = wp.data.useSelect( (select) => select('wc/store/cart').getCartTotals(), [ ] );\n    const cartTotal = cartTotals?.total_price || 0;\n    return (\n        <>\n            <div dangerouslySetInnerHTML={{ __html: item.label }}/>\n            <MollieGatewayUpdater\n                billing={cartData.billingAddress}\n                currencyCode={wcSettings.currency.code}\n                filters={filters}\n                ajaxUrl={ajaxUrl}\n                jQuery={jQuery}\n                item={item}\n                cartTotal={cartTotal}\n            />\n        </>\n    );\n};\n\nconst molliePaymentMethod = (useEffect, ajaxUrl, filters, gatewayData, availableGateways, item, jQuery, requiredFields, isCompanyFieldVisible, isPhoneFieldVisible) =>{\n\n    document.addEventListener('mollie_components_ready_to_submit', function () {\n        onSubmitLocal()\n    })\n    function creditcardSelectedEvent() {\n        if (item.name === \"mollie_wc_gateway_creditcard\") {\n            document.documentElement.dispatchEvent(creditCardSelected);\n        }\n    }\n\n    // On first load, if availableGateways is not empty, store it\n    if (_.isEmpty(cachedAvailableGateways) && !_.isEmpty(availableGateways)) {\n        cachedAvailableGateways = availableGateways;\n        saveCachedAvailableGateways();\n    }\n    return {\n        name: item.name,\n        label:<Label\n            item={item}\n            ajaxUrl={ajaxUrl}\n            jQuery={jQuery}\n            filters={filters}\n        />,\n        content: <MollieComponent\n            item={item}\n            useEffect={useEffect}\n            ajaxUrl={ajaxUrl}\n            jQuery={jQuery}\n            requiredFields={requiredFields}\n            isPhoneFieldVisible={isPhoneFieldVisible}/>,\n        edit: <div>{item.edit}</div>,\n        paymentMethodId: item.paymentMethodId,\n        canMakePayment: ({cartTotals, billingData}) => {\n            if (!_.isEmpty(item.allowedCountries) && !(item.allowedCountries.includes(billingData.country))) {\n                return false\n            }\n            if (cartTotals <= 0) {\n                return true\n            }\n            loadCachedAvailableGateways();\n            const currencyCode = cartTotals?.currency_code;\n            let country = billingData?.country;\n            if (!country) {\n                country = wcSettings?.baseLocation.country;\n            }\n            const currentFilterKey = currencyCode + \"-\" + country;\n\n            creditcardSelectedEvent();\n            if (!cachedAvailableGateways.hasOwnProperty(currentFilterKey)) {\n                return false;\n            }\n\n            return cachedAvailableGateways[currentFilterKey].hasOwnProperty(item.name);\n        },\n        ariaLabel: item.ariaLabel,\n        supports: {\n            features: item.supports,\n        },\n    };\n}\n\nexport default molliePaymentMethod\n\n","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId](module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","import molliePaymentMethod from './blocks/molliePaymentMethod'\nimport ApplePayButtonComponent from './blocks/ApplePayButtonComponent'\nimport ApplePayButtonEditorComponent from './blocks/ApplePayButtonEditorComponent'\n\n(\n    function ({mollieBlockData, wc, _, jQuery}) {\n        if (_.isEmpty(mollieBlockData)) {\n            return;\n        }\n\n        const {registerPaymentMethod} = wc.wcBlocksRegistry;\n        const {defaultFields} = wc.wcSettings.allSettings;\n        const {ajaxUrl, filters, gatewayData, availableGateways} = mollieBlockData.gatewayData;\n        const {useEffect} = wp.element;\n        const isAppleSession = typeof window.ApplePaySession === \"function\"\n        localStorage.removeItem('cachedAvailableGateways');\n\n        function getPhoneField() {\n            const phoneFieldDataset = document.querySelector('[data-show-phone-field]');\n            if (!phoneFieldDataset) {\n                return true;\n            }\n            return phoneFieldDataset.dataset.showPhoneField !== \"false\"\n        }\n\n        const companyNameString = defaultFields.company.label\n        const isPhoneFieldVisible = getPhoneField();\n        const phoneString = defaultFields.phone.label\n        let requiredFields = {\n            'companyNameString': companyNameString,\n            'phoneString': phoneString,\n        }\n        gatewayData.forEach(item => {\n            let register = () => registerPaymentMethod(molliePaymentMethod(useEffect, ajaxUrl, filters, gatewayData, availableGateways, item, jQuery, requiredFields, isPhoneFieldVisible));\n            if (item.name === 'mollie_wc_gateway_applepay') {\n                const {isExpressEnabled} = item;\n                if ((isAppleSession && window.ApplePaySession.canMakePayments())) {\n                    register();\n                    if (isExpressEnabled !== true) {\n                        return;\n                    }\n                    const {registerExpressPaymentMethod} = wc.wcBlocksRegistry;\n                    registerExpressPaymentMethod({\n                        name: 'mollie_wc_gateway_applepay_express',\n                        title: 'Apple Pay Express button',\n                        description: 'Apple Pay Express button',\n                        content: <ApplePayButtonComponent/>,\n                        edit: <ApplePayButtonEditorComponent/>,\n                        ariaLabel: 'Apple Pay',\n                        canMakePayment: () => true,\n                        paymentMethodId: 'mollie_wc_gateway_applepay',\n                        gatewayId: 'mollie_wc_gateway_applepay',\n                        supports: {\n                            features: ['products'],\n                            style: ['height', 'borderRadius']\n                        },\n                    })\n                }\n                return;\n            }\n            register();\n        });\n    }\n)(window, wc)\n"],"names":["createAppleErrors","errors","errorList","_iterator","_createForOfIteratorHelper","_step","s","n","done","error","value","_error$contactField","contactField","_error$code","code","_error$message","message","appleError","ApplePayError","push","err","e","f","request","countryCode","currencyCode","totalLabel","subtotal","supportedNetworks","merchantCapabilities","shippingType","requiredBillingContactFields","requiredShippingContactFields","total","label","amount","type","ApplePayButtonComponent","_ref","_ref$buttonAttributes","buttonAttributes","mollieApplePayBlockDataCart","window","mollieBlockData","nonce","document","getElementById","updatedContactInfo","redirectionUrl","_mollieApplePayBlockD","product","_mollieApplePayBlockD2","needShipping","_mollieApplePayBlockD3","shop","_mollieApplePayBlockD4","_mollieApplePayBlockD5","ajaxUrl","style","height","concat","borderRadius","findSelectedShippingMethod","shippingRates","shippingRate","find","shippingMethod","selected","appleFormattedRate","detail","name","identifier","rate_id","applePaySession","_store$getShippingRat","session","ApplePaySession","store","wp","data","select","getShippingRates","shipping_rates","selectedShippingMethod","length","onshippingmethodselected","event","_this","jQuery","ajax","url","method","action","callerPage","simplifiedContact","success","applePayShippingMethodUpdate","textStatus","jqXHR","response","completeShippingMethodSelection","errorThrown","console","warn","abort","onshippingcontactselected","_this2","shippingContact","applePayShippingContactUpdate","newShippingMethods","completeShippingContactSelection","onvalidatemerchant","applePayValidateMerchantEvent","validationUrl","validationURL","merchantSession","completeMerchantValidation","JSON","parse","onpaymentauthorized","ApplePayPayment","_ApplePayPayment$paym","payment","billingContact","token","givenName","familyName","addressLines","postalCode","locality","administrativeArea","phoneNumber","emailAddress","authorizationResult","result","completePayment","location","href","begin","React","createElement","id","className","onClick","preventDefault","ApplePayButtonEditorComponent","cachedAvailableGateways","formatPriceLikeWc","price","wcSettings","currency","priceFormat","replace","symbol","toFixed","precision","decimalSeparator","loadCachedAvailableGateways","storedData","localStorage","getItem","saveCachedAvailableGateways","setItem","stringify","setAvailableGateways","country","_objectSpread","useMollieAvailableGateways","billing","cartTotal","filters","item","_wcSettings","baseLocation","element","useEffect","currentFilterKey","hasOwnProperty","currentGateway","billingCountry","paymentLocale","cartTotals","getCartTotals","dispatch","setCartData","MollieGatewayUpdater","onSubmitLocal","activePaymentMethodLocal","creditCardSelected","Event","bubbles","MollieComponent","props","onSubmit","activePaymentMethod","emitResponse","eventRegistration","requiredFields","shippingData","isPhoneFieldVisible","responseTypes","onPaymentSetup","onCheckoutValidation","_wp$element$useState","useState","_wp$element$useState2","_slicedToArray","selectedIssuer","selectIssuer","_wp$element$useState3","_wp$element$useState4","inputPhone","selectPhone","_wp$element$useState5","_wp$element$useState6","inputBirthdate","selectBirthdate","_wp$element$useState7","_wp$element$useState8","inputCompany","selectCompany","issuerKey","companyNameString","phoneString","getPhoneField","shippingPhone","billingPhone","updateTotalLabel","newTotal","totalSpan","replaceWith","updateTaxesLabel","hideFee","fee","hide","totalTax","feeMarkup","replaceFee","newFee","insertNewFee","after","handleFees","documentElement","dispatchEvent","complete","onProcessingPayment","tokenVal","val","SUCCESS","meta","paymentMethodData","_defineProperty","payment_method","payment_method_title","title","unsubscribePaymentProcessing","companyLabel","hideCompanyField","companyPlaceholder","isCompanyEmpty","billingData","company","shippingAddress","unsubscribeProcessing","errorMessage","_getPhoneField$labels","_getPhoneField","phoneLabel","labels","innerText","phonePlaceholder","isPhoneEmpty","phone","isBirthdateValid","today","Date","birthdate","updateIssuer","target","updateCompany","updatePhone","updateBirthdate","fieldMarkup","fieldType","placeholder","arguments","undefined","class","htmlFor","dangerouslySetInnerHTML","__html","onChange","issuers","content","billingCompanyField","querySelector","shippingCompanyField","isBillingCompanyRequired","hasAttribute","isShippingCompanyRequired","companyField","Fragment","countryCodes","BE","NL","DE","AT","birthdateField","birthdatePlaceholder","phoneField","Label","_ref2","cartData","useSelect","getCartData","total_price","billingAddress","molliePaymentMethod","gatewayData","availableGateways","isCompanyFieldVisible","addEventListener","creditcardSelectedEvent","_","isEmpty","edit","paymentMethodId","canMakePayment","_ref3","allowedCountries","includes","currency_code","_wcSettings2","ariaLabel","supports","features","wc","registerPaymentMethod","wcBlocksRegistry","defaultFields","allSettings","_mollieBlockData$gate","isAppleSession","removeItem","phoneFieldDataset","dataset","showPhoneField","forEach","register","isExpressEnabled","canMakePayments","registerExpressPaymentMethod","description","gatewayId"],"sourceRoot":""}
     894//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"mollieBlockIndex.min.js","mappings":"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","sources":["webpack://mollie-payments-for-woocommerce/./resources/js/applePayError.js","webpack://mollie-payments-for-woocommerce/./resources/js/applePayRequest.js","webpack://mollie-payments-for-woocommerce/./resources/js/blocks/ApplePayButtonComponent.js","webpack://mollie-payments-for-woocommerce/./resources/js/blocks/ApplePayButtonEditorComponent.js","webpack://mollie-payments-for-woocommerce/./resources/js/blocks/molliePaymentMethod.js","webpack://mollie-payments-for-woocommerce/webpack/bootstrap","webpack://mollie-payments-for-woocommerce/webpack/runtime/define property getters","webpack://mollie-payments-for-woocommerce/webpack/runtime/hasOwnProperty shorthand","webpack://mollie-payments-for-woocommerce/webpack/runtime/make namespace object","webpack://mollie-payments-for-woocommerce/./resources/js/mollieBlockIndex.js"],"sourcesContent":["export function createAppleErrors(errors) {\n    const errorList = []\n    for (const error of errors) {\n        const {contactField = null, code = null, message = null} = error\n        const appleError = contactField ? new ApplePayError(code, contactField, message) : new ApplePayError(code)\n        errorList.push(appleError)\n    }\n\n    return errorList\n}\n","export const request = (countryCode, currencyCode, totalLabel, subtotal) => {\n    return {\n        countryCode: countryCode,\n        currencyCode: currencyCode,\n        supportedNetworks: ['amex', 'maestro', 'masterCard', 'visa', 'vPay'],\n        merchantCapabilities: ['supports3DS'],\n        shippingType: 'shipping',\n        requiredBillingContactFields: [\n            'postalAddress',\n            'email'\n        ],\n        requiredShippingContactFields: [\n            'postalAddress',\n            'email'\n        ],\n        total: {\n            label: totalLabel,\n            amount: subtotal,\n            type: 'final'\n        }\n    }\n}\n","import {request} from \"../applePayRequest\";\nimport {createAppleErrors} from \"../applePayError\";\n\nexport const ApplePayButtonComponent = ({ buttonAttributes = {} }) => {\n    const mollieApplePayBlockDataCart = window.mollieApplePayBlockDataCart || window.mollieBlockData.mollieApplePayBlockDataCart\n    const nonce = document.getElementById(\"woocommerce-process-checkout-nonce\").value\n    let updatedContactInfo = []\n    let redirectionUrl = ''\n    const {\n        product: {needShipping = true, subtotal},\n        shop: {countryCode, currencyCode = 'EUR', totalLabel = ''},\n        ajaxUrl,\n    } = mollieApplePayBlockDataCart\n    const style = {\n        height: `${buttonAttributes.height || 48}px`,\n        borderRadius: `${buttonAttributes.borderRadius || 4}px`\n    }\n\n    const findSelectedShippingMethod = (shippingRates) => {\n        let shippingRate = shippingRates.find((shippingMethod) => shippingMethod.selected === true)\n        const appleFormattedRate = {\n            amount: '',\n            detail: '',\n            label: shippingRate.name,\n            identifier: shippingRate.rate_id,\n            selected: shippingRate.selected,\n        }\n        return shippingRate ? appleFormattedRate : ''\n    }\n\n    let applePaySession = () => {\n        const session = new ApplePaySession(3, request(countryCode, currencyCode, totalLabel, subtotal))\n        const store = wp.data.select('wc/store/cart')\n        const shippingRates = store.getShippingRates()?.[0]?.shipping_rates;\n        let selectedShippingMethod = '';\n        if (shippingRates && shippingRates.length > 0) {\n            selectedShippingMethod = findSelectedShippingMethod(shippingRates, selectedShippingMethod);\n        }\n            session.onshippingmethodselected = function (event) {\n            jQuery.ajax({\n                url: ajaxUrl,\n                method: 'POST',\n                data: {\n                    action: 'mollie_apple_pay_update_shipping_method',\n                    shippingMethod: event.shippingMethod,\n                    callerPage: 'cart',\n                    simplifiedContact: updatedContactInfo,\n                    'woocommerce-process-checkout-nonce': nonce,\n                },\n                success: (applePayShippingMethodUpdate, textStatus, jqXHR) => {\n                    let response = applePayShippingMethodUpdate.data\n                    selectedShippingMethod = event.shippingMethod\n                    if (applePayShippingMethodUpdate.success === false) {\n                        response.errors = createAppleErrors(response.errors)\n                    }\n                    this.completeShippingMethodSelection(response)\n                },\n                error: (jqXHR, textStatus, errorThrown) => {\n                    console.warn(textStatus, errorThrown)\n                    session.abort()\n                },\n            })\n        }\n        session.onshippingcontactselected = function (event) {\n            jQuery.ajax({\n                url: ajaxUrl,\n                method: 'POST',\n                data: {\n                    action: 'mollie_apple_pay_update_shipping_contact',\n                    simplifiedContact: event.shippingContact,\n                    callerPage: 'cart',\n                    needShipping: needShipping,\n                    'woocommerce-process-checkout-nonce': nonce,\n                    shippingMethod: selectedShippingMethod,\n                },\n                success: (applePayShippingContactUpdate, textStatus, jqXHR) => {\n                    let response = applePayShippingContactUpdate.data\n                    updatedContactInfo = event.shippingContact\n                    if (applePayShippingContactUpdate.success === false) {\n                        response.errors = createAppleErrors(response.errors)\n                    }\n                    if (response.newShippingMethods) {\n                        selectedShippingMethod = response.newShippingMethods[0]\n                    }\n                    this.completeShippingContactSelection(response)\n                },\n                error: (jqXHR, textStatus, errorThrown) => {\n                    console.warn(textStatus, errorThrown)\n                    session.abort()\n                },\n            })\n        }\n        session.onvalidatemerchant = (applePayValidateMerchantEvent) => {\n            jQuery.ajax({\n                url: ajaxUrl,\n                method: 'POST',\n                data: {\n                    action: 'mollie_apple_pay_validation',\n                    validationUrl: applePayValidateMerchantEvent.validationURL,\n                    'woocommerce-process-checkout-nonce': nonce,\n                },\n                success: (merchantSession, textStatus, jqXHR) => {\n                    if (merchantSession.success === true) {\n                        session.completeMerchantValidation(JSON.parse(merchantSession.data))\n                    } else {\n                        console.warn(merchantSession.data)\n                        session.abort()\n                    }\n                },\n                error: (jqXHR, textStatus, errorThrown) => {\n                    console.warn(textStatus, errorThrown)\n                    session.abort()\n                },\n            })\n        }\n        session.onpaymentauthorized = (ApplePayPayment) => {\n            const {billingContact, shippingContact} = ApplePayPayment.payment\n\n            jQuery.ajax({\n                url: ajaxUrl,\n                method: 'POST',\n                data: {\n                    action: 'mollie_apple_pay_create_order_cart',\n                    shippingContact: ApplePayPayment.payment.shippingContact,\n                    billingContact: ApplePayPayment.payment.billingContact,\n                    token: ApplePayPayment.payment.token,\n                    shippingMethod: selectedShippingMethod,\n                    'mollie-payments-for-woocommerce_issuer_applepay': 'applepay',\n                    'woocommerce-process-checkout-nonce': nonce,\n                    'billing_first_name': billingContact.givenName || '',\n                    'billing_last_name': billingContact.familyName || '',\n                    'billing_company': '',\n                    'billing_country': billingContact.countryCode || '',\n                    'billing_address_1': billingContact.addressLines[0] || '',\n                    'billing_address_2': billingContact.addressLines[1] || '',\n                    'billing_postcode': billingContact.postalCode || '',\n                    'billing_city': billingContact.locality || '',\n                    'billing_state': billingContact.administrativeArea || '',\n                    'billing_phone': billingContact.phoneNumber || '000000000000',\n                    'billing_email': shippingContact.emailAddress || '',\n                    'shipping_first_name': shippingContact.givenName || '',\n                    'shipping_last_name': shippingContact.familyName || '',\n                    'shipping_company': '',\n                    'shipping_country': shippingContact.countryCode || '',\n                    'shipping_address_1': shippingContact.addressLines[0] || '',\n                    'shipping_address_2': shippingContact.addressLines[1] || '',\n                    'shipping_postcode': shippingContact.postalCode || '',\n                    'shipping_city': shippingContact.locality || '',\n                    'shipping_state': shippingContact.administrativeArea || '',\n                    'shipping_phone': shippingContact.phoneNumber || '000000000000',\n                    'shipping_email': shippingContact.emailAddress || '',\n                    'order_comments': '',\n                    'payment_method': 'mollie_wc_gateway_applepay',\n                    '_wp_http_referer': '/?wc-ajax=update_order_review'\n                },\n                success: (authorizationResult, textStatus, jqXHR) => {\n                    let result = authorizationResult.data\n                    if (authorizationResult.success === true) {\n                        redirectionUrl = result['returnUrl'];\n                        session.completePayment(result['responseToApple'])\n                        window.location.href = redirectionUrl\n                    } else {\n                        result.errors = createAppleErrors(result.errors)\n                        session.completePayment(result)\n                    }\n                },\n                error: (jqXHR, textStatus, errorThrown) => {\n                    console.warn(textStatus, errorThrown)\n                    session.abort()\n                },\n            })\n        }\n        session.begin()\n    }\n\n    return (\n        <button\n            id=\"mollie_applepay_button\"\n            className=\"apple-pay-button apple-pay-button-black\"\n            onClick={(event) => {\n                event.preventDefault();\n                applePaySession();\n            }}\n            style={style}\n        >\n        </button>\n    );\n}\n\nexport default ApplePayButtonComponent;\n","export const ApplePayButtonEditorComponent = ({ buttonAttributes = {} }) => {\n    const style = {\n        height: `${buttonAttributes.height || 48}px`,\n        borderRadius: `${buttonAttributes.borderRadius || 4}px`\n    }\n\n    return (\n        <button\n            id=\"mollie_applepay_button\"\n            className=\"apple-pay-button apple-pay-button-black\"\n            style={style}\n        >\n        </button>\n    );\n};\nexport default ApplePayButtonEditorComponent;\n","let cachedAvailableGateways = {};\n\nfunction formatPriceLikeWc(price) {\n    // todo add thousandSeparator\n    return wcSettings.currency.priceFormat.replace('%1$s', wcSettings.currency.symbol).replace('%2$s',price.toFixed(wcSettings.currency.precision).replace('.', wcSettings.currency.decimalSeparator));\n}\n\nfunction setAvailableGateways(country, currencyCode, data) {\n    cachedAvailableGateways = {\n        ...cachedAvailableGateways,\n        ...data\n    };\n}\nfunction useMollieAvailableGateways(billing, currencyCode, cartTotal, filters, ajaxUrl) {\n    let country = billing.country;\n    const code = currencyCode;\n    const value = cartTotal;\n    if (!country) {\n        country = wcSettings?.baseLocation.country;\n    }\n\n    wp.element.useEffect(() => {\n        if (!country) return;\n        const currencyCode = code;\n        const cartTotal = value;\n        const currentFilterKey = currencyCode + \"-\" + country;\n        if (cachedAvailableGateways.hasOwnProperty(currentFilterKey)) {\n            return;\n        }\n        fetch(\n            ajaxUrl,\n            {\n                method: 'POST',\n                headers: {\n                    \"Content-Type\": \"application/x-www-form-urlencoded\",\n                },\n                body: new URLSearchParams({\n                    action: 'mollie_checkout_blocks_canmakepayment',\n                    currency: currencyCode,\n                    billingCountry: country,\n                    cartTotal,\n                    paymentLocale: filters.paymentLocale\n                }),\n            }\n        ).then(response => response.json()).then(data => {\n            setAvailableGateways(country, currencyCode, data.data);\n            const cartTotals = wp.data.select('wc/store/cart').getCartTotals();\n            // Dispatch them again to trigger a re-render:\n            wp.data.dispatch('wc/store/cart').setCartData({...cartTotals});\n        });\n    }, [billing, currencyCode, filters.paymentLocale]);\n\n    return cachedAvailableGateways;\n}\n\n// Component that runs the hook but does not render anything.\nfunction MollieGatewayUpdater({ billing, currencyCode, cartTotal, filters, ajaxUrl}) {\n\n    useMollieAvailableGateways(billing, currencyCode, cartTotal, filters, ajaxUrl);\n    return null;\n}\n\nlet onSubmitLocal\nlet activePaymentMethodLocal\nlet creditCardSelected = new Event(\"mollie_creditcard_component_selected\", {bubbles: true});\nconst MollieComponent = (props) => {\n    let {onSubmit, activePaymentMethod, billing, item, useEffect, ajaxUrl, jQuery, emitResponse, eventRegistration, requiredFields, shippingData, isPhoneFieldVisible} = props\n    const {  responseTypes } = emitResponse;\n    const {onPaymentSetup, onCheckoutValidation} = eventRegistration;\n    if (!item || !item.name) {\n        return <div>Loading payment methods...</div>;\n    }\n    const [ selectedIssuer, selectIssuer ] = wp.element.useState('');\n    const [ inputPhone, selectPhone ] = wp.element.useState('');\n    const [ inputBirthdate, selectBirthdate ] = wp.element.useState('');\n    const [ inputCompany, selectCompany ] = wp.element.useState('');\n    const issuerKey = 'mollie-payments-for-woocommerce_issuer_' + activePaymentMethod\n    const {companyNameString, phoneString} = requiredFields\n    function getPhoneField()\n    {\n        const shippingPhone = document.getElementById('shipping-phone');\n        const billingPhone = document.getElementById('billing-phone');\n        return billingPhone || shippingPhone;\n    }\n    function updateTotalLabel(newTotal) {\n        let totalSpan = \"<span class='wc-block-formatted-money-amount wc-block-components-formatted-money-amount wc-block-components-totals-item__value'>\" + formatPriceLikeWc(newTotal) + \"</span>\"\n        let total = jQuery('.wc-block-components-totals-footer-item .wc-block-formatted-money-amount:first')\n        total.replaceWith(totalSpan)\n    }\n    function updateTaxesLabel(newTotal) {\n        let totalSpan = \"<span class='wc-block-formatted-money-amount wc-block-components-formatted-money-amount wc-block-components-totals-item__value'>\" + formatPriceLikeWc(newTotal) + \"</span>\"\n        let total = jQuery('div.wp-block-woocommerce-checkout-order-summary-taxes-block.wc-block-components-totals-wrapper > div > span.wc-block-formatted-money-amount.wc-block-components-formatted-money-amount.wc-block-components-totals-item__value:first')\n        total.replaceWith(totalSpan)\n    }\n\n    function hideFee(fee, response) {\n        fee?.hide()\n        updateTotalLabel(response.data.newTotal);\n        updateTaxesLabel(response.data.totalTax);\n    }\n\n    function feeMarkup(response) {\n        return \"<div class='wc-block-components-totals-item wc-block-components-totals-fees'>\" +\n            \"<span class='wc-block-components-totals-item__label'>\"\n            + response.data.name\n            + \"</span>\" +\n            \"<span class='wc-block-formatted-money-amount wc-block-components-formatted-money-amount wc-block-components-totals-item__value'>\"\n            + formatPriceLikeWc(response.data.amount)\n            + \"</span>\" +\n            \"<div class='wc-block-components-totals-item__description'>\" +\n            \"</div>\" +\n            \"</div>\";\n    }\n\n    function replaceFee(fee, newFee, response) {\n        fee.replaceWith(newFee)\n        updateTotalLabel(response.data.newTotal);\n        updateTaxesLabel(response.data.totalTax);\n    }\n\n    function insertNewFee(newFee, response) {\n        const subtotal = jQuery('.wc-block-components-totals-item:first')\n        subtotal.after(newFee)\n        updateTotalLabel(response.data.newTotal);\n        updateTaxesLabel(response.data.totalTax);\n    }\n\n    function handleFees(response) {\n        const fee = jQuery('.wc-block-components-totals-fees')\n        if (!response.data.amount) {\n            hideFee(fee, response);\n            return\n        }\n\n        let newFee = feeMarkup(response);\n        if (fee.length) {\n            replaceFee(fee, newFee, response);\n            return\n        }\n        insertNewFee(newFee, response);\n    }\n\n    useEffect(() => {\n        if(activePaymentMethodLocal !== activePaymentMethod && activePaymentMethod === 'mollie_wc_gateway_creditcard'){\n            document.documentElement.dispatchEvent(creditCardSelected);\n        }\n        activePaymentMethodLocal = activePaymentMethod\n        jQuery.ajax({\n            url: ajaxUrl,\n            method: 'POST',\n            data: {\n                action: 'mollie_checkout_blocks_surchage',\n                method: activePaymentMethod\n            },\n            complete: (jqXHR, textStatus) => {\n            },\n            success: (response, textStatus, jqXHR) => {\n                handleFees(response)\n            },\n            error: (jqXHR, textStatus, errorThrown) => {\n                console.warn(textStatus, errorThrown)\n            },\n        })\n    }, [activePaymentMethod, billing.cartTotal])\n\n    useEffect(() => {\n        const onProcessingPayment = () => {\n            let data = {\n                payment_method: activePaymentMethod,\n                payment_method_title: item.title,\n                [issuerKey]: selectedIssuer,\n                billing_phone: inputPhone,\n                billing_company_billie: inputCompany,\n                billing_birthdate: inputBirthdate,\n                cardToken: '',\n            };\n            const tokenVal = jQuery('.mollie-components > input').val()\n            if (tokenVal) {\n                data.cardToken = tokenVal;\n            }\n            return {\n                type: responseTypes.SUCCESS,\n                meta: {\n                    paymentMethodData: data\n                },\n            };\n        }\n\n        const unsubscribePaymentProcessing = onPaymentSetup(\n            onProcessingPayment\n        );\n        return () => {\n            unsubscribePaymentProcessing()\n        };\n\n    }, [selectedIssuer, onPaymentSetup, inputPhone, inputCompany, inputBirthdate])\n\n    useEffect(() => {\n        let companyLabel = jQuery('div.wc-block-components-text-input.wc-block-components-address-form__company > label')\n        if (companyLabel.length === 0 || item.hideCompanyField === true) {\n            return\n        }\n\n        if (activePaymentMethod === 'mollie_wc_gateway_billie') {\n            let message = item.companyPlaceholder\n            companyLabel.replaceWith('<label htmlFor=\"shipping-company\">' + message + '</label>')\n        } else {\n            if (companyNameString !== false) {\n                companyLabel.replaceWith('<label htmlFor=\"shipping-company\">' + companyNameString + '</label>')\n            }\n        }\n        let isCompanyEmpty = (billing.billingData.company === '' && shippingData.shippingAddress.company === '') && inputCompany === '';\n        const unsubscribeProcessing = onCheckoutValidation(\n            () => {\n                if (activePaymentMethod === 'mollie_wc_gateway_billie' && isCompanyEmpty) {\n                    return {\n                        errorMessage: item.errorMessage,\n                    };\n                }\n            }\n        );\n        return () => {\n            unsubscribeProcessing()\n        };\n\n    }, [activePaymentMethod, onCheckoutValidation, billing.billingData, item, companyNameString, inputCompany]);\n\n    useEffect(() => {\n        let phoneLabel = getPhoneField()?.labels?.[0] ?? null;\n        if (!phoneLabel || phoneLabel.length === 0) {\n            return\n        }\n        if (activePaymentMethod === 'mollie_wc_gateway_in3') {\n            phoneLabel.innerText = item.phonePlaceholder\n        } else {\n            if (phoneString !== false) {\n                phoneLabel.innerText = phoneString\n            }\n        }\n        let isPhoneEmpty = (billing.billingData.phone === '' && shippingData.shippingAddress.phone === '') && inputPhone === '';\n        let isBirthdateValid = inputBirthdate === ''\n        let today = new Date();\n        let birthdate = new Date(inputBirthdate);\n        if (birthdate > today) {\n            isBirthdateValid = false\n        }\n        const unsubscribeProcessing = onCheckoutValidation(\n\n            () => {\n                if (activePaymentMethod === 'mollie_wc_gateway_in3' && (isPhoneEmpty || isBirthdateValid)) {\n                    return {\n                        errorMessage: item.errorMessage,\n                    };\n                }\n            }\n        );\n        return () => {\n            unsubscribeProcessing()\n        };\n\n    }, [activePaymentMethod, onCheckoutValidation, billing.billingData, shippingData.shippingAddress, item, phoneString, inputBirthdate, inputPhone]);\n\n    onSubmitLocal = onSubmit\n    const updateIssuer = (e) => selectIssuer(e.target.value);\n    const updateCompany = (e) => selectCompany(e.target.value);\n    const updatePhone = (e) => selectPhone(e.target.value);\n    const updateBirthdate = (e) => selectBirthdate( e.target.value );\n\n    function fieldMarkup(id, fieldType, label, action, value, placeholder = null) {\n        const className = \"wc-block-components-text-input wc-block-components-address-form__\" + id;\n        return <div class=\"custom-input\">\n            <label htmlFor={id} dangerouslySetInnerHTML={{__html: label}}></label>\n            <input type={fieldType} name={id} id={id} value={value} onChange={action} placeholder={placeholder}></input>\n        </div>\n    }\n\n    if (item.issuers && item.name !== \"mollie_wc_gateway_creditcard\"){\n        return <div><p>{item.content}</p><select name={issuerKey} dangerouslySetInnerHTML={ {__html: item.issuers} } value={selectedIssuer} onChange={updateIssuer}></select></div>\n    }\n\n    if(item.name === \"mollie_wc_gateway_creditcard\"){\n        return <div dangerouslySetInnerHTML={ {__html: item.content} }></div>;\n    }\n\n    if (item.name === \"mollie_wc_gateway_billie\") {\n        const billingCompanyField = document.querySelector('#billing-company');\n        const shippingCompanyField = document.querySelector('#shipping-company');\n        const isBillingCompanyRequired = billingCompanyField?.hasAttribute('required');\n        const isShippingCompanyRequired = shippingCompanyField?.hasAttribute('required');\n\n        if ((billingCompanyField && isBillingCompanyRequired) || (shippingCompanyField && isShippingCompanyRequired) || item.hideCompanyField === true) {\n            return;\n        }\n\n        const companyField = item.companyPlaceholder ? item.companyPlaceholder : \"Company name\";\n        return (\n            <>\n                <div><p>{item.content}</p></div>\n                {fieldMarkup(\"billing_company_billie\",\"text\", companyField, updateCompany, inputCompany)}\n            </>\n        );\n    }\n\n    useEffect(() => {\n        const countryCodes = {\n            BE: '+32xxxxxxxxx',\n            NL: '+316xxxxxxxx',\n            DE: '+49xxxxxxxxx',\n            AT: '+43xxxxxxxxx',\n        };\n        const country = billing.billingData.country;\n        item.phonePlaceholder = countryCodes[country] || countryCodes['NL'];\n    }, [billing.billingData.country]);\n\n    if (item.name === \"mollie_wc_gateway_in3\") {\n        const birthdateField = item.birthdatePlaceholder || \"Birthdate\";\n        const phoneField = item.phonePlaceholder || \"+316xxxxxxxx\";\n        const phoneLabel = item.phoneLabel || \"Phone\";\n        return (\n            <>\n                <div><p>{item.content}</p></div>\n                {fieldMarkup(\"billing-birthdate\", \"date\", birthdateField, updateBirthdate, inputBirthdate)}\n                {!isPhoneFieldVisible && fieldMarkup(\"billing-phone-in3\", \"tel\", phoneLabel, updatePhone, inputPhone, phoneField)}\n            </>\n        );\n    }\n\n    if (item.name === \"mollie_wc_gateway_riverty\") {\n        const birthdateField = item.birthdatePlaceholder || \"Birthdate\";\n        const phoneField = item.phonePlaceholder || \"+316xxxxxxxx\";\n        const phoneLabel = item.phoneLabel || \"Phone\";\n        return (\n            <>\n                <div><p>{item.content}</p></div>\n                {fieldMarkup(\"billing-birthdate\", \"date\", birthdateField, updateBirthdate, inputBirthdate)}\n                {!isPhoneFieldVisible && fieldMarkup(\"billing-phone-riverty\", \"tel\", phoneLabel, updatePhone, inputPhone, phoneField)}\n            </>\n        );\n    }\n\n    return <div><p>{item.content}</p></div>\n}\n\nconst Label = ({ item, filters, ajaxUrl }) => {\n    const cartData = wp.data.useSelect((select) =>\n            select('wc/store/cart').getCartData(),\n        []\n    );\n    const cartTotals = wp.data.useSelect( (select) => select('wc/store/cart').getCartTotals(), [ ] );\n    const cartTotal = cartTotals?.total_price || 0;\n    return (\n        <>\n            <div dangerouslySetInnerHTML={{ __html: item.label }}/>\n            <MollieGatewayUpdater\n                billing={cartData.billingAddress}\n                currencyCode={wcSettings.currency.code}\n                filters={filters}\n                ajaxUrl={ajaxUrl}\n                cartTotal={cartTotal}\n            />\n        </>\n    );\n};\n\nconst molliePaymentMethod = (useEffect, ajaxUrl, filters, gatewayData, availableGateways, item, jQuery, requiredFields, isCompanyFieldVisible, isPhoneFieldVisible) =>{\n\n    if (item.name === \"mollie_wc_gateway_creditcard\") {\n        document.addEventListener('mollie_components_ready_to_submit', function () {\n            onSubmitLocal()\n        })\n    }\n    function creditcardSelectedEvent() {\n        if (item.name === \"mollie_wc_gateway_creditcard\") {\n            document.documentElement.dispatchEvent(creditCardSelected);\n        }\n    }\n\n    return {\n        name: item.name,\n        label:<Label\n            item={item}\n            ajaxUrl={ajaxUrl}\n            filters={filters}\n        />,\n        content: <MollieComponent\n            item={item}\n            useEffect={useEffect}\n            ajaxUrl={ajaxUrl}\n            jQuery={jQuery}\n            requiredFields={requiredFields}\n            isPhoneFieldVisible={isPhoneFieldVisible}/>,\n        edit: <div>{item.edit}</div>,\n        paymentMethodId: item.paymentMethodId,\n        canMakePayment: ({cartTotals, billingData}) => {\n            if (!_.isEmpty(item.allowedCountries) && !(item.allowedCountries.includes(billingData.country))) {\n                return false\n            }\n            if (cartTotals <= 0) {\n                return true\n            }\n            const currencyCode = cartTotals?.currency_code;\n            let country = billingData?.country;\n            if (!country) {\n                country = wcSettings?.baseLocation.country;\n            }\n            const currentFilterKey = currencyCode + \"-\" + country;\n\n            creditcardSelectedEvent();\n\n            if (!cachedAvailableGateways.hasOwnProperty(currentFilterKey)) {\n                cachedAvailableGateways = {\n                    ...cachedAvailableGateways,\n                    ...availableGateways\n                };\n            }\n\n            if (availableGateways.hasOwnProperty(currentFilterKey) && availableGateways[currentFilterKey].hasOwnProperty(item.name)) {\n                return true;\n            }\n\n            if (cachedAvailableGateways.hasOwnProperty(currentFilterKey) && cachedAvailableGateways[currentFilterKey].hasOwnProperty(item.name)) {\n                return true;\n            }\n\n            return false;\n        },\n        ariaLabel: item.ariaLabel,\n        supports: {\n            features: item.supports,\n        },\n    };\n}\nexport default molliePaymentMethod\n\n","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId](module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","import molliePaymentMethod from './blocks/molliePaymentMethod'\nimport ApplePayButtonComponent from './blocks/ApplePayButtonComponent'\nimport ApplePayButtonEditorComponent from './blocks/ApplePayButtonEditorComponent'\n\n(\n    function ({mollieBlockData, wc, _, jQuery}) {\n        if (_.isEmpty(mollieBlockData)) {\n            return;\n        }\n\n        const {registerPaymentMethod} = wc.wcBlocksRegistry;\n        const {defaultFields} = wc.wcSettings.allSettings;\n        const {ajaxUrl, filters, gatewayData, availableGateways} = mollieBlockData.gatewayData;\n        const {useEffect} = wp.element;\n        const isAppleSession = typeof window.ApplePaySession === \"function\"\n\n        function getPhoneField() {\n            const phoneFieldDataset = document.querySelector('[data-show-phone-field]');\n            if (!phoneFieldDataset) {\n                return true;\n            }\n            return phoneFieldDataset.dataset.showPhoneField !== \"false\"\n        }\n\n        const companyNameString = defaultFields.company.label\n        const isPhoneFieldVisible = getPhoneField();\n        const phoneString = defaultFields.phone.label\n        let requiredFields = {\n            'companyNameString': companyNameString,\n            'phoneString': phoneString,\n        }\n        gatewayData.forEach(item => {\n            let register = () => registerPaymentMethod(molliePaymentMethod(useEffect, ajaxUrl, filters, gatewayData, availableGateways, item, jQuery, requiredFields, isPhoneFieldVisible));\n            if (item.name === 'mollie_wc_gateway_applepay') {\n                const {isExpressEnabled} = item;\n                if ((isAppleSession && window.ApplePaySession.canMakePayments())) {\n                    register();\n                    if (isExpressEnabled !== true) {\n                        return;\n                    }\n                    const {registerExpressPaymentMethod} = wc.wcBlocksRegistry;\n                    registerExpressPaymentMethod({\n                        name: 'mollie_wc_gateway_applepay_express',\n                        title: 'Apple Pay Express button',\n                        description: 'Apple Pay Express button',\n                        content: <ApplePayButtonComponent/>,\n                        edit: <ApplePayButtonEditorComponent/>,\n                        ariaLabel: 'Apple Pay',\n                        canMakePayment: () => true,\n                        paymentMethodId: 'mollie_wc_gateway_applepay',\n                        gatewayId: 'mollie_wc_gateway_applepay',\n                        supports: {\n                            features: ['products'],\n                            style: ['height', 'borderRadius']\n                        },\n                    })\n                }\n                return;\n            }\n            register();\n        });\n    }\n)(window, wc)\n"],"names":["createAppleErrors","errors","errorList","_iterator","_createForOfIteratorHelper","_step","s","n","done","error","value","_error$contactField","contactField","_error$code","code","_error$message","message","appleError","ApplePayError","push","err","e","f","request","countryCode","currencyCode","totalLabel","subtotal","supportedNetworks","merchantCapabilities","shippingType","requiredBillingContactFields","requiredShippingContactFields","total","label","amount","type","ApplePayButtonComponent","_ref","_ref$buttonAttributes","buttonAttributes","mollieApplePayBlockDataCart","window","mollieBlockData","nonce","document","getElementById","updatedContactInfo","redirectionUrl","_mollieApplePayBlockD","product","_mollieApplePayBlockD2","needShipping","_mollieApplePayBlockD3","shop","_mollieApplePayBlockD4","_mollieApplePayBlockD5","ajaxUrl","style","height","concat","borderRadius","findSelectedShippingMethod","shippingRates","shippingRate","find","shippingMethod","selected","appleFormattedRate","detail","name","identifier","rate_id","applePaySession","_store$getShippingRat","session","ApplePaySession","store","wp","data","select","getShippingRates","shipping_rates","selectedShippingMethod","length","onshippingmethodselected","event","_this","jQuery","ajax","url","method","action","callerPage","simplifiedContact","success","applePayShippingMethodUpdate","textStatus","jqXHR","response","completeShippingMethodSelection","errorThrown","console","warn","abort","onshippingcontactselected","_this2","shippingContact","applePayShippingContactUpdate","newShippingMethods","completeShippingContactSelection","onvalidatemerchant","applePayValidateMerchantEvent","validationUrl","validationURL","merchantSession","completeMerchantValidation","JSON","parse","onpaymentauthorized","ApplePayPayment","_ApplePayPayment$paym","payment","billingContact","token","givenName","familyName","addressLines","postalCode","locality","administrativeArea","phoneNumber","emailAddress","authorizationResult","result","completePayment","location","href","begin","React","createElement","id","className","onClick","preventDefault","ApplePayButtonEditorComponent","cachedAvailableGateways","formatPriceLikeWc","price","wcSettings","currency","priceFormat","replace","symbol","toFixed","precision","decimalSeparator","setAvailableGateways","country","_objectSpread","useMollieAvailableGateways","billing","cartTotal","filters","_wcSettings","baseLocation","element","useEffect","currentFilterKey","hasOwnProperty","fetch","headers","body","URLSearchParams","billingCountry","paymentLocale","then","json","cartTotals","getCartTotals","dispatch","setCartData","MollieGatewayUpdater","onSubmitLocal","activePaymentMethodLocal","creditCardSelected","Event","bubbles","MollieComponent","props","onSubmit","activePaymentMethod","item","emitResponse","eventRegistration","requiredFields","shippingData","isPhoneFieldVisible","responseTypes","onPaymentSetup","onCheckoutValidation","_wp$element$useState","useState","_wp$element$useState2","_slicedToArray","selectedIssuer","selectIssuer","_wp$element$useState3","_wp$element$useState4","inputPhone","selectPhone","_wp$element$useState5","_wp$element$useState6","inputBirthdate","selectBirthdate","_wp$element$useState7","_wp$element$useState8","inputCompany","selectCompany","issuerKey","companyNameString","phoneString","getPhoneField","shippingPhone","billingPhone","updateTotalLabel","newTotal","totalSpan","replaceWith","updateTaxesLabel","hideFee","fee","hide","totalTax","feeMarkup","replaceFee","newFee","insertNewFee","after","handleFees","documentElement","dispatchEvent","complete","onProcessingPayment","_defineProperty","payment_method","payment_method_title","title","tokenVal","val","cardToken","SUCCESS","meta","paymentMethodData","unsubscribePaymentProcessing","companyLabel","hideCompanyField","companyPlaceholder","isCompanyEmpty","billingData","company","shippingAddress","unsubscribeProcessing","errorMessage","_getPhoneField$labels","_getPhoneField","phoneLabel","labels","innerText","phonePlaceholder","isPhoneEmpty","phone","isBirthdateValid","today","Date","birthdate","updateIssuer","target","updateCompany","updatePhone","updateBirthdate","fieldMarkup","fieldType","placeholder","arguments","undefined","class","htmlFor","dangerouslySetInnerHTML","__html","onChange","issuers","content","billingCompanyField","querySelector","shippingCompanyField","isBillingCompanyRequired","hasAttribute","isShippingCompanyRequired","companyField","Fragment","countryCodes","BE","NL","DE","AT","birthdateField","birthdatePlaceholder","phoneField","Label","_ref2","cartData","useSelect","getCartData","total_price","billingAddress","molliePaymentMethod","gatewayData","availableGateways","isCompanyFieldVisible","addEventListener","creditcardSelectedEvent","edit","paymentMethodId","canMakePayment","_ref3","_","isEmpty","allowedCountries","includes","currency_code","_wcSettings2","ariaLabel","supports","features","wc","registerPaymentMethod","wcBlocksRegistry","defaultFields","allSettings","_mollieBlockData$gate","isAppleSession","phoneFieldDataset","dataset","showPhoneField","forEach","register","isExpressEnabled","canMakePayments","registerExpressPaymentMethod","description","gatewayId"],"sourceRoot":""}

  • mollie-payments-for-woocommerce/trunk/readme.txt

    r3242454 r3262577  
    11=== Mollie Payments for WooCommerce ===
    22Contributors: daanvm, danielhuesken, davdebcom, dinamiko, syde, l.vangunst, ndijkstra, robin-mollie, wido, carmen222, inpsyde-maticluznar
    3 Tags: mollie, payments, payment gateway, woocommerce, credit card, apple pay, ideal, bancontact, klarna, sofort, woocommerce subscriptions
    4 Requires at least: 3.8
     3Tags: mollie, woocommerce, payments, ecommerce, credit card
     4Requires at least: 5.0
    55Tested up to: 6.7
    66Stable tag: 7.10.0
    7 Requires PHP: 7.2
     7Requires PHP: 7.4
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    197197= Minimum Requirements =
    198198
    199 * PHP version 7.2 or greater
     199* PHP version 7.4 or greater
    200200* PHP extensions enabled: cURL, JSON
    201 * WordPress 3.8 or greater
     201* WordPress 5.0 or greater
    202202* WooCommerce 3.9 or greater
    203203* Mollie account
    … …  
    226226
    227227== Changelog ==
     228
     229= 8.0.0 - 27-03-2025 =
     230
     231* Feature Flag - Klarna, Riverty and Billie can be used with Payments API
     232* Feature - Added support for Mollie's new Payments API features
     233* Fixed - Notice for missing value of cardToken
     234* Fixed - ltrim error on Apple Pay notice with php 8.2 (author @kylwes)
     235* Fixed - Logged URL should be same as used in future logic (author @tombroucke)
    228236
    229237= 7.10.0 - 18-02-2025 =
    … …  
    241249= 7.9.1 - 22-01-2025 =
    242250
    243 * Feature: Style Apple Pay express button via Checkout block
    244 * Fixed: Notice `_load_textdomain_just_in_time` due to early translation loading
    245 * Fixed: Company Name input field not saved in Order when Billie was enabled
    246 * Fixed: Mollie Payment methods may not load on Checkout block
    247 * Fixed: Mollie Payment methods may disappear from Checkout block when changing billing country
    248 * Fixed: Mollie Components are not enabled by default on new installations
     251* Feature - Style Apple Pay express button via Checkout block
     252* Fixed - Notice `_load_textdomain_just_in_time` due to early translation loading
     253* Fixed - Company Name input field not saved in Order when Billie was enabled
     254* Fixed - Mollie Payment methods may not load on Checkout block
     255* Fixed - Mollie Payment methods may disappear from Checkout block when changing billing country
     256* Fixed - Mollie Components are not enabled by default on new installations
    249257
    250258= 7.9.0 - 18-11-2024 =
    … …  
    257265* Fixed - Bank Transfer payment details displayed in one line on order-received page
    258266
    259 
    260267= 7.8.2 - 08-09-2024 =
    261268
    262269* Fixed - Subscription renewal status on-hold instead of active
    263 
    264270
    265271= 7.8.1 - 07-09-2024 =

  • mollie-payments-for-woocommerce/trunk/src/Activation/ActivationModule.php

    r3226701 r3262577  
    1717    private $pluginVersion;
    1818    /**
    19      * ActivationModule constructor.
    20      */
    21     public function __construct($baseFile, $pluginVersion)
    22     {
    23         $this->baseFile = $baseFile;
    24         $this->pluginVersion = $pluginVersion;
    25     }
    26     /**
    2719     * @param ContainerInterface $container
    2820     *
    … …  
    3123    public function run(ContainerInterface $container): bool
    3224    {
     25        $this->pluginVersion = $container->get('shared.plugin_version');
     26        $this->baseFile = \M4W_FILE;
    3327        add_action('init', [$this, 'pluginInit']);
    3428        add_action('admin_init', [$this, 'mollieWcNoticeApiKeyMissing']);

  • mollie-payments-for-woocommerce/trunk/src/Assets/AssetsModule.php

    r3226701 r3262577  
    2323        return \true;
    2424    }
    25     public function enqueueBlockCheckoutScripts(Data $dataService, array $gatewayInstances): void
     25    public function enqueueBlockCheckoutScripts(Data $dataService, array $gatewayInstances, ContainerInterface $container): void
    2626    {
    2727        if (!has_block('woocommerce/checkout')) {
    … …  
    3131        wp_enqueue_style('mollie-gateway-icons');
    3232        wp_enqueue_style('mollie-block-custom-field');
    33         \Mollie\WooCommerce\Assets\MollieCheckoutBlocksSupport::localizeWCBlocksData($dataService, $gatewayInstances);
     33        \Mollie\WooCommerce\Assets\MollieCheckoutBlocksSupport::localizeWCBlocksData($dataService, $gatewayInstances, $container);
    3434    }
    3535    public function registerButtonsBlockScripts(string $pluginUrl, string $pluginPath): void
    … …  
    145145     * Enqueue Frontend only scripts
    146146     *
    147      * @param $container Container
     147     * @param ContainerInterface $container
    148148     * @return void
    149149     */
    … …  
    195195        $object_name = 'mollieComponentsSettings';
    196196        $data = ['merchantProfileId' => $merchantProfileId, 'options' => ['locale' => $locale, 'testmode' => $settingsHelper->isTestModeEnabled()], 'enabledGateways' => $gatewayNames, 'componentsSettings' => $mollieComponentsStylesGateways, 'componentsAttributes' => [['name' => 'cardHolder', 'label' => esc_html__('Name on card', 'mollie-payments-for-woocommerce')], ['name' => 'cardNumber', 'label' => esc_html__('Card number', 'mollie-payments-for-woocommerce')], ['name' => 'expiryDate', 'label' => esc_html__('Expiry date', 'mollie-payments-for-woocommerce')], ['name' => 'verificationCode', 'label' => esc_html__('CVC/CVV', 'mollie-payments-for-woocommerce')]], 'messages' => ['defaultErrorMessage' => esc_html__('An unknown error occurred, please check the card fields.', 'mollie-payments-for-woocommerce')], 'isCheckout' => is_checkout(), 'isCheckoutPayPage' => is_checkout_pay_page()];
    197         if (has_block("woocommerce/checkout")) {
     197        if (has_block("woocommerce/checkout") && !is_wc_endpoint_url('order-pay')) {
    198198            wp_enqueue_script('mollie-components-blocks');
    199199            wp_localize_script('mollie-components-blocks', $object_name, $data);
    … …  
    288288        /** @var Settings */
    289289        $settingsHelper = $container->get('settings.settings_helper');
    290         $gatewayInstances = $container->get('gateway.instances');
    291         add_action('woocommerce_blocks_loaded', function () {
    292             woocommerce_store_api_register_update_callback(['namespace' => 'mollie-payments-for-woocommerce', 'callback' => function () {
     290        $gatewayInstances = $container->get('__deprecated.gateway_helpers');
     291        add_action('woocommerce_blocks_loaded', static function () {
     292            woocommerce_store_api_register_update_callback(['namespace' => 'mollie-payments-for-woocommerce', 'callback' => static function () {
    293293                // Do nothing
    294294            }]);
    … …  
    296296        /** Add support to Mollie blocks for WooCommerce checkout blocks functionality */
    297297        //https://github.com/woocommerce/woocommerce-blocks/blob/trunk/docs/third-party-developers/extensibility/checkout-payment-methods/payment-method-integration.md#putting-it-all-together
    298         add_action('woocommerce_blocks_loaded', function () use ($dataService, $gatewayInstances, $pluginUrl, $pluginPath, $hasBlocksEnabled) {
     298        add_action('woocommerce_blocks_loaded', function () use ($dataService, $gatewayInstances, $pluginUrl, $pluginPath, $hasBlocksEnabled, $container) {
    299299            if ($hasBlocksEnabled && is_admin() && class_exists('Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType')) {
    300                 add_action('woocommerce_blocks_payment_method_type_registration', function (PaymentMethodRegistry $paymentMethodRegistry) use ($dataService, $gatewayInstances, $pluginUrl, $pluginPath) {
    301                     $paymentMethodRegistry->register(new \Mollie\WooCommerce\Assets\MollieCheckoutBlocksSupport($dataService, $gatewayInstances, $this->getPluginUrl($pluginUrl, '/public/js/mollieBlockIndex.min.js'), (string) filemtime($this->getPluginPath($pluginPath, '/public/js/mollieBlockIndex.min.js'))));
     300                add_action('woocommerce_blocks_payment_method_type_registration', function (PaymentMethodRegistry $paymentMethodRegistry) use ($dataService, $gatewayInstances, $pluginUrl, $pluginPath, $container) {
     301                    $paymentMethodRegistry->register(new \Mollie\WooCommerce\Assets\MollieCheckoutBlocksSupport($dataService, $gatewayInstances, $this->getPluginUrl($pluginUrl, '/public/js/mollieBlockIndex.min.js'), (string) filemtime($this->getPluginPath($pluginPath, '/public/js/mollieBlockIndex.min.js')), $container));
    302302                });
    303303            }
    … …  
    318318            if ($hasBlocksEnabled) {
    319319                /** @var array */
    320                 $gatewayInstances = $container->get('gateway.instances');
     320                $gatewayInstances = $container->get('__deprecated.gateway_helpers');
    321321                self::registerBlockScripts($pluginUrl, $pluginPath);
    322                 add_action('wp_enqueue_scripts', function () use ($dataService, $gatewayInstances) {
    323                     $this->enqueueBlockCheckoutScripts($dataService, $gatewayInstances);
     322                add_action('wp_enqueue_scripts', function () use ($dataService, $gatewayInstances, $container) {
     323                    $this->enqueueBlockCheckoutScripts($dataService, $gatewayInstances, $container);
    324324                });
    325325                $this->registerButtonsBlockScripts($pluginUrl, $pluginPath);

  • mollie-payments-for-woocommerce/trunk/src/Assets/MollieCheckoutBlocksSupport.php

    r3226701 r3262577  
    44
    55use Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType;
    6 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
    7 use Mollie\WooCommerce\Gateway\MolliePaymentGatewayI;
     6use Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\DefaultFieldsStrategy;
    87use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
    98use Mollie\WooCommerce\Shared\Data;
     9use Mollie\Psr\Container\ContainerInterface;
    1010final class MollieCheckoutBlocksSupport extends AbstractPaymentMethodType
    1111{
    … …  
    2222    /** @var string $registerScriptVersion */
    2323    protected $registerScriptVersion;
    24     public function __construct(Data $dataService, array $gatewayInstances, string $registerScriptUrl, string $registerScriptVersion)
     24    private ContainerInterface $container;
     25    public function __construct(Data $dataService, array $gatewayInstances, string $registerScriptUrl, string $registerScriptVersion, ContainerInterface $container)
    2526    {
    2627        $this->dataService = $dataService;
    … …  
    2829        $this->registerScriptUrl = $registerScriptUrl;
    2930        $this->registerScriptVersion = $registerScriptVersion;
     31        $this->container = $container;
    3032    }
    3133    public function initialize()
    … …  
    4042    {
    4143        wp_register_script(self::$scriptHandle, $this->registerScriptUrl, ['wc-blocks-registry', 'underscore', 'jquery'], $this->registerScriptVersion, \true);
    42         self::localizeWCBlocksData($this->dataService, $this->gatewayInstances);
     44        self::localizeWCBlocksData($this->dataService, $this->gatewayInstances, $this->container);
    4345        return [self::$scriptHandle];
    4446    }
    45     public static function localizeWCBlocksData($dataService, $gatewayInstances)
     47    public static function localizeWCBlocksData($dataService, $gatewayInstances, $container)
    4648    {
    4749        wp_enqueue_style('mollie-applepaydirect');
    48         wp_localize_script(self::$scriptHandle, 'mollieBlockData', ['gatewayData' => self::gatewayDataForWCBlocks($dataService, $gatewayInstances), 'mollieApplePayBlockDataCart' => $dataService->mollieApplePayBlockDataCart()]);
     50        wp_localize_script(self::$scriptHandle, 'mollieBlockData', ['gatewayData' => self::gatewayDataForWCBlocks($dataService, $gatewayInstances, $container), 'mollieApplePayBlockDataCart' => $dataService->mollieApplePayBlockDataCart()]);
    4951    }
    50     public static function gatewayDataForWCBlocks(Data $dataService, array $gatewayInstances): array
     52    public static function gatewayDataForWCBlocks(Data $dataService, array $deprecatedGatewayHelpers, ContainerInterface $container): array
    5153    {
    5254        $filters = $dataService->wooCommerceFiltersForCheckout();
    … …  
    5456        $availablePaymentMethods = [];
    5557        /**
    56          * @var MolliePaymentGatewayI $gateway
     58         * @var $gateway
    5759         * psalm-suppress  UnusedForeachValue
    5860         */
    … …  
    6567            $filterKey = "{$filters['amount']['currency']}-{$filters['billingCountry']}";
    6668            foreach ($availableGateways as $key => $gateway) {
    67                 $availablePaymentMethods[$filterKey][$key] = $gateway->paymentMethod()->getProperty('id');
     69                $gatewayId = $gateway->id;
     70                $methodId = substr($gatewayId, strrpos($gatewayId, '_') + 1);
     71                $availablePaymentMethods[$filterKey][$key] = $methodId;
    6872            }
    6973        }
    7074        $dataToScript = ['ajaxUrl' => admin_url('admin-ajax.php'), 'filters' => ['currency' => isset($filters['amount']['currency']) ? $filters['amount']['currency'] : \false, 'cartTotal' => isset($filters['amount']['value']) ? $filters['amount']['value'] : \false, 'paymentLocale' => isset($filters['locale']) ? $filters['locale'] : \false, 'billingCountry' => isset($filters['billingCountry']) ? $filters['billingCountry'] : \false]];
     75        $paymentGateways = WC()->payment_gateways()->payment_gateways();
    7176        $gatewayData = [];
    72         $isSepaEnabled = isset($gatewayInstances['mollie_wc_gateway_directdebit']) && $gatewayInstances['mollie_wc_gateway_directdebit']->enabled === 'yes';
    73         /** @var MolliePaymentGateway $gateway */
    74         foreach ($gatewayInstances as $gatewayKey => $gateway) {
    75             $method = $gateway->paymentMethod();
     77        $isSepaEnabled = isset($deprecatedGatewayHelpers['mollie_wc_gateway_directdebit']) && $deprecatedGatewayHelpers['mollie_wc_gateway_directdebit']->enabled === 'yes';
     78        /** @var PaymentGateway $gateway */
     79        foreach ($paymentGateways as $gatewayKey => $gateway) {
     80            if (substr($gateway->id, 0, 18) !== 'mollie_wc_gateway_') {
     81                continue;
     82            }
     83            $deprecatedGateway = $deprecatedGatewayHelpers[$gatewayKey];
     84            $method = $deprecatedGateway->paymentMethod();
    7685            $gatewayId = is_string($method->getProperty('id')) ? $method->getProperty('id') : "";
    7786            if ($gateway->enabled !== 'yes' || $gatewayId === 'directdebit' && !is_admin()) {
    … …  
    8190            $issuers = \false;
    8291            if ($method->getProperty('paymentFields') === \true) {
    83                 $paymentFieldsService = $method->paymentFieldsService();
    84                 $paymentFieldsService->setStrategy($method);
    85                 $issuers = $method->paymentFieldsService()->getStrategyMarkup($gateway);
     92                $className = 'Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\\' . ucfirst($method->getProperty('id')) . 'FieldsStrategy';
     93                $paymentFieldsStrategy = class_exists($className) ? new $className($deprecatedGateway, $gateway->get_description(), $dataService) : new DefaultFieldsStrategy($deprecatedGateway, $gateway->get_description(), $dataService);
     94                $issuers = $paymentFieldsStrategy->getFieldMarkup($deprecatedGateway, $dataService);
    8695            }
    8796            if ($gatewayId === 'creditcard') {
    … …  
    8998                $issuers = \false;
    9099            }
    91             $title = $method->title();
    92             $labelMarkup = "<span style='margin-right: 1em'>{$title}</span>{$gateway->icon}";
     100            $title = $method->title($container);
     101            $labelMarkup = "<span style='margin-right: 1em'>{$title}</span>{$gateway->get_icon()}";
    93102            $hasSurcharge = $method->hasSurcharge();
    94103            $countryCodes = ['BE' => '+32xxxxxxxxx', 'NL' => '+316xxxxxxxx', 'DE' => '+49xxxxxxxxx', 'AT' => '+43xxxxxxxxx'];

  • mollie-payments-for-woocommerce/trunk/src/BlockService/CheckoutBlockService.php

    r3226701 r3262577  
    6060            $filterKey = "{$filters['amount']['currency']}-{$filters['billingCountry']}";
    6161            foreach ($availableGateways as $key => $gateway) {
    62                 $availablePaymentMethods[$filterKey][$key] = $gateway->paymentMethod()->getProperty('id');
     62                $availablePaymentMethods[$filterKey][$key] = str_replace('mollie_wc_gateway_', '', $gateway->id);
    6363            }
    6464        }

  • mollie-payments-for-woocommerce/trunk/src/Buttons/ApplePayButton/ResponsesToApple.php

    r3191126 r3262577  
    1313    protected $logger;
    1414    /**
    15      * @var MolliePaymentGatewayI
     15     * @var
    1616     */
    17     protected $gateway;
     17    protected $deprecatedAppleHelper;
    1818    /**
    1919     * ResponsesToApple constructor.
    2020     */
    21     public function __construct(Logger $logger, MolliePaymentGatewayI $appleGateway)
     21    public function __construct(Logger $logger, $deprecatedAppleHelper)
    2222    {
    2323        $this->logger = $logger;
    24         $this->gateway = $appleGateway;
     24        $this->deprecatedAppleHelper = $deprecatedAppleHelper;
    2525    }
    2626    /**
    … …  
    174174    {
    175175        $order = wc_get_order($orderId);
    176         $redirect_url = $this->gateway->getReturnRedirectUrlForOrder($order);
     176        $redirect_url = $this->deprecatedAppleHelper->getReturnRedirectUrlForOrder($order);
    177177        // Add utm_nooverride query string
    178178        $redirect_url = add_query_arg(['utm_nooverride' => 1], $redirect_url);
    179         $this->logger->debug(__METHOD__ . sprintf(': Redirect url on return order %s, order %s: %s', $this->gateway->paymentMethod()->getProperty('id'), $orderId, $redirect_url));
     179        $this->logger->debug(__METHOD__ . sprintf(': Redirect url on return order %s, order %s: %s', $this->deprecatedAppleHelper->paymentMethod()->getProperty('id'), $orderId, $redirect_url));
    180180        return $redirect_url;
    181181    }

  • mollie-payments-for-woocommerce/trunk/src/Buttons/PayPalButton/PayPalAjaxRequests.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\Buttons\PayPalButton;
    55
     6use Mollie\Inpsyde\PaymentGateway\PaymentGateway;
    67use Mollie\WooCommerce\Gateway\Surcharge;
    78use Mollie\WooCommerce\Notice\NoticeInterface;
    … …  
    2930     * @param  $gateway
    3031     */
    31     public function __construct($gateway, NoticeInterface $notice, Logger $logger)
     32    public function __construct(PaymentGateway $gateway, NoticeInterface $notice, Logger $logger)
    3233    {
    3334        $this->gateway = $gateway;

  • mollie-payments-for-woocommerce/trunk/src/Gateway/GatewayModule.php

    r3242448 r3262577  
    77use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
    88use Automattic\WooCommerce\StoreApi\Exceptions\RouteException;
    9 use DateTime;
    109use Mollie\Inpsyde\Modularity\Module\ExecutableModule;
     10use Mollie\Inpsyde\Modularity\Module\ExtendingModule;
    1111use Mollie\Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
    1212use Mollie\Inpsyde\Modularity\Module\ServiceModule;
     13use Mollie\Inpsyde\PaymentGateway\PaymentMethodServiceProviderTrait;
    1314use Mollie\WooCommerce\BlockService\CheckoutBlockService;
    14 use Mollie\WooCommerce\Buttons\ApplePayButton\AppleAjaxRequests;
    1515use Mollie\WooCommerce\Buttons\ApplePayButton\ApplePayDirectHandler;
    16 use Mollie\WooCommerce\Buttons\ApplePayButton\ResponsesToApple;
    17 use Mollie\WooCommerce\Buttons\PayPalButton\DataToPayPal;
    18 use Mollie\WooCommerce\Buttons\PayPalButton\PayPalAjaxRequests;
    1916use Mollie\WooCommerce\Buttons\PayPalButton\PayPalButtonHandler;
    2017use Mollie\WooCommerce\Gateway\Voucher\MaybeDisableGateway;
    21 use Mollie\WooCommerce\Notice\AdminNotice;
    22 use Mollie\WooCommerce\Notice\FrontendNotice;
    23 use Mollie\WooCommerce\Notice\NoticeInterface;
    24 use Mollie\WooCommerce\Payment\MollieObject;
    25 use Mollie\WooCommerce\Payment\MollieOrderService;
    26 use Mollie\WooCommerce\Payment\OrderInstructionsService;
    27 use Mollie\WooCommerce\Payment\PaymentCheckoutRedirectService;
    28 use Mollie\WooCommerce\Payment\PaymentFactory;
    29 use Mollie\WooCommerce\Payment\PaymentFieldsService;
    30 use Mollie\WooCommerce\Payment\PaymentService;
    3118use Mollie\WooCommerce\PaymentMethods\IconFactory;
    3219use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
    33 use Mollie\WooCommerce\SDK\Api;
    34 use Mollie\WooCommerce\SDK\HttpResponse;
    3520use Mollie\WooCommerce\Settings\Settings;
    3621use Mollie\WooCommerce\Shared\Data;
    3722use Mollie\WooCommerce\Shared\GatewaySurchargeHandler;
     23use Mollie\WooCommerce\PaymentMethods\Constants;
    3824use Mollie\WooCommerce\Shared\SharedDataDictionary;
    39 use Mollie\WooCommerce\Subscription\MollieSepaRecurringGateway;
    40 use Mollie\WooCommerce\Subscription\MollieSubscriptionGateway;
    41 use Mollie\WooCommerce\PaymentMethods\Constants;
    4225use Mollie\Psr\Container\ContainerInterface;
    43 use Mollie\Psr\Log\LoggerInterface as Logger;
    44 use WP_Post;
    45 class GatewayModule implements ServiceModule, ExecutableModule
     26class GatewayModule implements ServiceModule, ExecutableModule, ExtendingModule
    4627{
    4728    use ModuleClassNameIdTrait;
     29    use PaymentMethodServiceProviderTrait;
    4830    public const APPLE_PAY_METHOD_ALLOWED_KEY = 'mollie_apple_pay_method_allowed';
    4931    public const POST_DATA_KEY = 'post_data';
    … …  
    5840    const FIELD_IN3_BIRTHDATE = 'billing_birthdate';
    5941    const GATEWAY_NAME_IN3 = "mollie_wc_gateway_in3";
    60     public function services(): array
    61     {
    62         return ['gateway.classnames' => static function (): array {
    63             return SharedDataDictionary::GATEWAY_CLASSNAMES;
    64         }, 'gateway.instances' => function (ContainerInterface $container): array {
    65             return $this->instantiatePaymentMethodGateways($container);
    66         }, 'gateway.paymentMethods' => static function (ContainerInterface $container): array {
    67             return (new self())->instantiatePaymentMethods($container);
    68         }, 'gateway.paymentMethodsEnabledAtMollie' => static function (ContainerInterface $container): array {
    69             $dataHelper = $container->get('settings.data_helper');
    70             assert($dataHelper instanceof Data);
    71             $settings = $container->get('settings.settings_helper');
    72             assert($settings instanceof Settings);
    73             $apiKey = $settings->getApiKey();
    74             $methods = $apiKey ? $dataHelper->getAllPaymentMethods($apiKey) : [];
    75             $enabledMethods = [];
    76             foreach ($methods as $method) {
    77                 $enabledMethods[] = $method['id'];
    78             }
    79             return $enabledMethods;
    80         }, 'gateway.listAllMethodsAvailable' => static function (ContainerInterface $container): array {
    81             $dataHelper = $container->get('settings.data_helper');
    82             assert($dataHelper instanceof Data);
    83             $settings = $container->get('settings.settings_helper');
    84             assert($settings instanceof Settings);
    85             $apiKey = $settings->getApiKey();
    86             $methods = $apiKey ? $dataHelper->getAllAvailablePaymentMethods() : [];
    87             $availableMethods = [];
    88             $implementedMethods = $container->get('gateway.classnames');
    89             foreach ($methods as $method) {
    90                 if (in_array('Mollie_WC_Gateway_' . ucfirst($method['id']), $implementedMethods, \true)) {
    91                     $availableMethods[] = $method;
    92                 }
    93             }
    94             return $availableMethods;
    95         }, 'gateway.getPaymentMethodsAfterFeatureFlag' => static function (ContainerInterface $container): array {
    96             $availablePaymentMethods = $container->get('gateway.listAllMethodsAvailable');
    97             $klarnaOneFlag = (bool) apply_filters('inpsyde.feature-flags.mollie-woocommerce.klarna_one_enabled', \true);
    98             if (!$klarnaOneFlag) {
    99                 $availablePaymentMethods = array_filter($availablePaymentMethods, static function ($method) {
    100                     return $method['id'] !== Constants::KLARNA;
    101                 });
    102             }
    103             $bancomatpayFlag = (bool) apply_filters('inpsyde.feature-flags.mollie-woocommerce.bancomatpay_enabled', \true);
    104             if (!$bancomatpayFlag) {
    105                 $availablePaymentMethods = array_filter($availablePaymentMethods, static function ($method) {
    106                     return $method['id'] !== Constants::BANCOMATPAY;
    107                 });
    108             }
    109             $almaFlag = (bool) apply_filters('inpsyde.feature-flags.mollie-woocommerce.alma_enabled', \true);
    110             if (!$almaFlag) {
    111                 $availablePaymentMethods = array_filter($availablePaymentMethods, static function ($method) {
    112                     return $method['id'] !== Constants::ALMA;
    113                 });
    114             }
    115             $swishFlag = (bool) apply_filters('inpsyde.feature-flags.mollie-woocommerce.swish_enabled', \true);
    116             if (!$swishFlag) {
    117                 $availablePaymentMethods = array_filter($availablePaymentMethods, static function ($method) {
    118                     return $method['id'] !== Constants::SWISH;
    119                 });
    120             }
    121             return $availablePaymentMethods;
    122         }, 'gateway.isSDDGatewayEnabled' => static function (ContainerInterface $container): bool {
    123             $enabledMethods = $container->get('gateway.paymentMethodsEnabledAtMollie');
    124             return in_array(Constants::DIRECTDEBIT, $enabledMethods, \true);
    125         }, IconFactory::class => static function (ContainerInterface $container): IconFactory {
    126             $pluginUrl = $container->get('shared.plugin_url');
    127             $pluginPath = $container->get('shared.plugin_path');
    128             return new IconFactory($pluginUrl, $pluginPath);
    129         }, PaymentService::class => static function (ContainerInterface $container): PaymentService {
    130             $logger = $container->get(Logger::class);
    131             assert($logger instanceof Logger);
    132             $notice = $container->get(AdminNotice::class);
    133             assert($notice instanceof AdminNotice);
    134             $paymentFactory = $container->get(PaymentFactory::class);
    135             assert($paymentFactory instanceof PaymentFactory);
    136             $data = $container->get('settings.data_helper');
    137             assert($data instanceof Data);
    138             $api = $container->get('SDK.api_helper');
    139             assert($api instanceof Api);
    140             $settings = $container->get('settings.settings_helper');
    141             assert($settings instanceof Settings);
    142             $pluginId = $container->get('shared.plugin_id');
    143             $paymentCheckoutRedirectService = $container->get(PaymentCheckoutRedirectService::class);
    144             assert($paymentCheckoutRedirectService instanceof PaymentCheckoutRedirectService);
    145             $voucherDefaultCategory = $container->get('voucher.defaultCategory');
    146             return new PaymentService($notice, $logger, $paymentFactory, $data, $api, $settings, $pluginId, $paymentCheckoutRedirectService, $voucherDefaultCategory);
    147         }, OrderInstructionsService::class => static function (): OrderInstructionsService {
    148             return new OrderInstructionsService();
    149         }, PaymentFieldsService::class => static function (ContainerInterface $container): PaymentFieldsService {
    150             $data = $container->get('settings.data_helper');
    151             assert($data instanceof Data);
    152             return new PaymentFieldsService($data);
    153         }, PaymentCheckoutRedirectService::class => static function (ContainerInterface $container): PaymentCheckoutRedirectService {
    154             $data = $container->get('settings.data_helper');
    155             assert($data instanceof Data);
    156             return new PaymentCheckoutRedirectService($data);
    157         }, \Mollie\WooCommerce\Gateway\Surcharge::class => static function (ContainerInterface $container): \Mollie\WooCommerce\Gateway\Surcharge {
    158             return new \Mollie\WooCommerce\Gateway\Surcharge();
    159         }, MollieOrderService::class => static function (ContainerInterface $container): MollieOrderService {
    160             $HttpResponseService = $container->get('SDK.HttpResponse');
    161             assert($HttpResponseService instanceof HttpResponse);
    162             $logger = $container->get(Logger::class);
    163             assert($logger instanceof Logger);
    164             $paymentFactory = $container->get(PaymentFactory::class);
    165             assert($paymentFactory instanceof PaymentFactory);
    166             $data = $container->get('settings.data_helper');
    167             assert($data instanceof Data);
    168             $pluginId = $container->get('shared.plugin_id');
    169             return new MollieOrderService($HttpResponseService, $logger, $paymentFactory, $data, $pluginId);
    170         }, \Mollie\WooCommerce\Gateway\OrderMandatoryGatewayDisabler::class => static function (ContainerInterface $container): \Mollie\WooCommerce\Gateway\OrderMandatoryGatewayDisabler {
    171             $settings = $container->get('settings.settings_helper');
    172             assert($settings instanceof Settings);
    173             $isSettingsOrderApi = $settings->isOrderApiSetting();
    174             return new \Mollie\WooCommerce\Gateway\OrderMandatoryGatewayDisabler($isSettingsOrderApi);
    175         }, 'gateway.isBillieEnabled' => static function (ContainerInterface $container): bool {
    176             $settings = $container->get('settings.settings_helper');
    177             assert($settings instanceof Settings);
    178             $isSettingsOrderApi = $settings->isOrderApiSetting();
    179             $billie = isset($container->get('gateway.paymentMethods')['billie']) ? $container->get('gateway.paymentMethods')['billie'] : null;
    180             $isBillieEnabled = \false;
    181             if ($billie instanceof PaymentMethodI) {
    182                 $isBillieEnabled = $billie->getProperty('enabled') === 'yes';
    183             }
    184             return $isSettingsOrderApi && $isBillieEnabled;
    185         }];
    186     }
    18742    public function run(ContainerInterface $container): bool
    18843    {
    … …  
    19348        });
    19449        add_filter('woocommerce_payment_gateways', static function ($gateways) use ($container) {
    195             $mollieGateways = $container->get('gateway.instances');
    196             return array_merge($gateways, $mollieGateways);
    197         });
    198         add_filter('woocommerce_payment_gateways', static function ($gateways) use ($container) {
    19950            $orderMandatoryGatewayDisabler = $container->get(\Mollie\WooCommerce\Gateway\OrderMandatoryGatewayDisabler::class);
    20051            assert($orderMandatoryGatewayDisabler instanceof \Mollie\WooCommerce\Gateway\OrderMandatoryGatewayDisabler);
    … …  
    20354        add_filter('woocommerce_payment_gateways', static function ($gateways) {
    20455            $maybeEnablegatewayHelper = new MaybeDisableGateway();
     56            $gateways = $maybeEnablegatewayHelper->maybeDisableBankTransferGateway($gateways);
    20557            return $maybeEnablegatewayHelper->maybeDisableMealVoucherGateway($gateways);
    20658        });
    207         add_filter('woocommerce_payment_gateways', [$this, 'maybeDisableBankTransferGateway'], 20);
     59        add_filter('woocommerce_payment_gateways', static function ($gateways) use ($container) {
     60            $deprecatedGatewayHelpers = $container->get('__deprecated.gateway_helpers');
     61            foreach ($gateways as $gateway) {
     62                $isMolliegateway = is_string($gateway) && strpos($gateway, 'mollie_wc_gateway_') !== \false || is_object($gateway) && strpos($gateway->id, 'mollie_wc_gateway_') !== \false;
     63                if (!$isMolliegateway) {
     64                    continue;
     65                }
     66                // Add subscription filters after payment gateways are loaded
     67                $isSubscriptiongateway = $gateway->supports('subscriptions');
     68                if ($isSubscriptiongateway) {
     69                    $deprecatedGatewayHelpers[$gateway->id]->addSubscriptionFilters($gateway);
     70                }
     71                // Add payment instructions
     72                $displayInstructionsService = $container->get('gateway.hooks.displayInstructions');
     73                $displayInstructionsService($gateway);
     74                // Add thankyou page actions for gateway
     75                $thankyouPageService = $container->get('gateway.hooks.thankyouPage');
     76                if (!has_action('woocommerce_thankyou_' . $gateway->id)) {
     77                    $thankyouPageService($gateway);
     78                }
     79                // Add subscription payment hooks
     80                $isSubscriptionPaymentService = $container->get('gateway.hooks.isSubscriptionPayment');
     81                $isSubscriptionPaymentService($gateway);
     82            }
     83            return $gateways;
     84        }, 30);
    20885        // Disable SEPA as payment option in WooCommerce checkout
    20986        add_filter('woocommerce_available_payment_gateways', [$this, 'disableSEPAInCheckout'], 11, 1);
    … …  
    229106        assert($surchargeService instanceof \Mollie\WooCommerce\Gateway\Surcharge);
    230107        $this->gatewaySurchargeHandling($surchargeService);
    231         $notice = $container->get(AdminNotice::class);
    232         assert($notice instanceof AdminNotice);
    233         $logger = $container->get(Logger::class);
    234         assert($logger instanceof Logger);
    235         $pluginUrl = $container->get('shared.plugin_url');
    236         $apiHelper = $container->get('SDK.api_helper');
    237         assert($apiHelper instanceof Api);
    238         $settingsHelper = $container->get('settings.settings_helper');
    239         assert($settingsHelper instanceof Settings);
    240         $appleGateway = isset($container->get('gateway.instances')['mollie_wc_gateway_applepay']) ? $container->get('gateway.instances')['mollie_wc_gateway_applepay'] : \false;
    241         if ($appleGateway) {
    242             $this->mollieApplePayDirectHandling($notice, $logger, $apiHelper, $settingsHelper, $appleGateway);
    243         }
    244         $paypalGateway = isset($container->get('gateway.instances')['mollie_wc_gateway_paypal']) ? $container->get('gateway.instances')['mollie_wc_gateway_paypal'] : \false;
    245         if ($paypalGateway) {
    246             $this->molliePayPalButtonHandling($paypalGateway, $notice, $logger, $pluginUrl);
    247         }
     108        $this->paymentButtonsBootstrap($container);
    248109        $maybeDisableVoucher = new MaybeDisableGateway();
    249110        $dataService = $container->get('settings.data_helper');
    … …  
    272133            return $fields;
    273134        }, 10, 3);
     135        add_action('init', static function () use ($container) {
     136            $paymentMethods = $container->get('gateway.paymentMethods');
     137            foreach ($paymentMethods as $paymentMethod) {
     138                assert($paymentMethod instanceof PaymentMethodI);
     139                $paymentMethod->initializeTranslations();
     140                $paymentMethod->updateSettingsWithDefaults($container);
     141            }
     142        });
     143        add_filter('woocommerce_get_transaction_url', static function ($return_url, $order, \WC_Payment_Gateway $wcGateway) {
     144            if ($return_url || strpos($wcGateway->id, 'mollie_wc_gateway_') === \false) {
     145                return $return_url;
     146            }
     147            $transactionId = $order->get_transaction_id();
     148            $isPaymentApi = substr($transactionId, 0, 3) === 'tr_';
     149            $resource = $transactionId && !$isPaymentApi ? 'orders' : 'payments';
     150            return 'https://my.mollie.com/dashboard/' . $resource . '/' . trim($transactionId) . '?utm_source=woocommerce&utm_medium=plugin&utm_campaign=partner';
     151        }, 10, 3);
    274152        return \true;
     153    }
     154    public function services(): array
     155    {
     156        static $services;
     157        if ($services === null) {
     158            $services = require_once __DIR__ . '/inc/services.php';
     159        }
     160        return $services();
     161    }
     162    /**
     163     * @inheritDoc
     164     */
     165    public function extensions(): array
     166    {
     167        static $extensions;
     168        if ($extensions === null) {
     169            $extensions = require_once __DIR__ . '/inc/extensions.php';
     170        }
     171        return $extensions();
    275172    }
    276173    /**
    … …  
    292189            printf('<p style="border-bottom:solid 1px #eee;padding-bottom:13px;">%s</p>', wp_kses($meta, $allowedTags));
    293190        }, $screen, 'side', 'high');
    294     }
    295     /**
    296      * Disable Bank Transfer Gateway
    297      *
    298      * @param ?array $gateways
    299      * @return array
    300      */
    301     public function maybeDisableBankTransferGateway(?array $gateways): array
    302     {
    303         if (!is_array($gateways)) {
    304             return [];
    305         }
    306         $isWcApiRequest = (bool) filter_input(\INPUT_GET, 'wc-api', \FILTER_SANITIZE_SPECIAL_CHARS);
    307         $bankTransferSettings = get_option('mollie_wc_gateway_banktransfer_settings', \false);
    308         //If the setting is active is forced Payment API so we need to filter the gateway when order is in pay-page
    309         // as it might have been created with Orders API
    310         $isActiveExpiryDate = $bankTransferSettings && isset($bankTransferSettings['activate_expiry_days_setting']) && $bankTransferSettings['activate_expiry_days_setting'] === "yes" && isset($bankTransferSettings['order_dueDate']) && $bankTransferSettings['order_dueDate'] > 0;
    311         /*
    312          * There is only one case where we want to filter the gateway and it's when the
    313          * pay-page render the available payments methods AND the setting is enabled
    314          *
    315          * For any other case we want to be sure bank transfer gateway is included.
    316          */
    317         if ($isWcApiRequest || !$isActiveExpiryDate || is_checkout() && !is_wc_endpoint_url('order-pay') || !wp_doing_ajax() && !is_wc_endpoint_url('order-pay') || is_admin()) {
    318             return $gateways;
    319         }
    320         $bankTransferGatewayClassName = 'mollie_wc_gateway_banktransfer';
    321         unset($gateways[$bankTransferGatewayClassName]);
    322         return $gateways;
    323191    }
    324192    public function gatewaySurchargeHandling(\Mollie\WooCommerce\Gateway\Surcharge $surcharge)
    … …  
    376244    }
    377245    /**
    378      * Bootstrap the ApplePay button logic if feature enabled
    379      */
    380     public function mollieApplePayDirectHandling(NoticeInterface $notice, Logger $logger, Api $apiHelper, Settings $settingsHelper, MollieSubscriptionGateway $appleGateway)
    381     {
    382         $buttonEnabledCart = mollieWooCommerceIsApplePayDirectEnabled('cart');
    383         $buttonEnabledProduct = mollieWooCommerceIsApplePayDirectEnabled('product');
    384         if ($buttonEnabledCart || $buttonEnabledProduct) {
    385             $notices = new AdminNotice();
    386             $responseTemplates = new ResponsesToApple($logger, $appleGateway);
    387             $ajaxRequests = new AppleAjaxRequests($responseTemplates, $notice, $logger, $apiHelper, $settingsHelper);
    388             $applePayHandler = new ApplePayDirectHandler($notices, $ajaxRequests);
    389             $applePayHandler->bootstrap($buttonEnabledProduct, $buttonEnabledCart);
    390         }
    391     }
    392     /**
    393      * Bootstrap the Mollie_WC_Gateway_PayPal button logic if feature enabled
    394      */
    395     public function molliePayPalButtonHandling($gateway, NoticeInterface $notice, Logger $logger, string $pluginUrl)
    396     {
    397         $enabledInProduct = mollieWooCommerceIsPayPalButtonEnabled('product');
    398         $enabledInCart = mollieWooCommerceIsPayPalButtonEnabled('cart');
    399         $shouldBuildIt = $enabledInProduct || $enabledInCart;
    400         if ($shouldBuildIt) {
    401             $ajaxRequests = new PayPalAjaxRequests($gateway, $notice, $logger);
    402             $data = new DataToPayPal($pluginUrl);
    403             $payPalHandler = new PayPalButtonHandler($ajaxRequests, $data);
    404             $payPalHandler->bootstrap($enabledInProduct, $enabledInCart);
    405         }
    406     }
    407     public function instantiatePaymentMethodGateways(ContainerInterface $container): array
    408     {
    409         $logger = $container->get(Logger::class);
    410         assert($logger instanceof Logger);
    411         $notice = $container->get(FrontendNotice::class);
    412         assert($notice instanceof FrontendNotice);
    413         $paymentService = $container->get(PaymentService::class);
    414         assert($paymentService instanceof PaymentService);
    415         $mollieOrderService = $container->get(MollieOrderService::class);
    416         assert($mollieOrderService instanceof MollieOrderService);
    417         $HttpResponseService = $container->get('SDK.HttpResponse');
    418         assert($HttpResponseService instanceof HttpResponse);
    419         $settingsHelper = $container->get('settings.settings_helper');
    420         assert($settingsHelper instanceof Settings);
    421         $apiHelper = $container->get('SDK.api_helper');
    422         assert($apiHelper instanceof Api);
    423         $paymentMethods = $container->get('gateway.paymentMethods');
    424         $data = $container->get('settings.data_helper');
    425         assert($data instanceof Data);
    426         $orderInstructionsService = new OrderInstructionsService();
    427         $mollieObject = $container->get(MollieObject::class);
    428         assert($mollieObject instanceof MollieObject);
    429         $paymentFactory = $container->get(PaymentFactory::class);
    430         assert($paymentFactory instanceof PaymentFactory);
    431         $pluginId = $container->get('shared.plugin_id');
    432         $gateways = [];
    433         if (empty($paymentMethods)) {
    434             return $gateways;
    435         }
    436         foreach ($paymentMethods as $paymentMethod) {
    437             $paymentMethodId = $paymentMethod->getIdFromConfig();
    438             if (!in_array($paymentMethodId, $container->get('gateway.paymentMethodsEnabledAtMollie'))) {
    439                 continue;
    440             }
    441             $isSepa = $paymentMethod->getProperty('SEPA');
    442             $key = 'mollie_wc_gateway_' . $paymentMethodId;
    443             if ($isSepa) {
    444                 $directDebit = $paymentMethods[Constants::DIRECTDEBIT];
    445                 $gateways[$key] = new MollieSepaRecurringGateway($directDebit, $paymentMethod, $paymentService, $orderInstructionsService, $mollieOrderService, $data, $logger, $notice, $HttpResponseService, $settingsHelper, $mollieObject, $paymentFactory, $pluginId, $apiHelper);
    446             } elseif ($paymentMethod->getProperty('Subscription')) {
    447                 $gateways[$key] = new MollieSubscriptionGateway($paymentMethod, $paymentService, $orderInstructionsService, $mollieOrderService, $data, $logger, $notice, $HttpResponseService, $settingsHelper, $mollieObject, $paymentFactory, $pluginId, $apiHelper);
    448             } else {
    449                 $gateways[$key] = new \Mollie\WooCommerce\Gateway\MolliePaymentGateway($paymentMethod, $paymentService, $orderInstructionsService, $mollieOrderService, $data, $logger, $notice, $HttpResponseService, $mollieObject, $paymentFactory, $pluginId);
    450             }
    451         }
    452         return $gateways;
    453     }
    454     /**
    455      * @param $container
     246     * @param ContainerInterface $container
     247     * @return void
     248     * @throws \Psr\Container\ContainerExceptionInterface
     249     * @throws \Psr\Container\NotFoundExceptionInterface
     250     */
     251    public function paymentButtonsBootstrap(ContainerInterface $container): void
     252    {
     253        $applePayDirectHandler = $container->get(ApplePayDirectHandler::class);
     254        if ($applePayDirectHandler instanceof ApplePayDirectHandler) {
     255            $buttonEnabledCart = mollieWooCommerceIsApplePayDirectEnabled('cart');
     256            $buttonEnabledProduct = mollieWooCommerceIsApplePayDirectEnabled('product');
     257            if ($buttonEnabledCart || $buttonEnabledProduct) {
     258                $applePayDirectHandler->bootstrap($buttonEnabledProduct, $buttonEnabledCart);
     259            }
     260        }
     261        $paypalButtonHandler = $container->get(PayPalButtonHandler::class);
     262        if ($paypalButtonHandler instanceof PayPalButtonHandler) {
     263            $enabledInProduct = mollieWooCommerceIsPayPalButtonEnabled('product');
     264            $enabledInCart = mollieWooCommerceIsPayPalButtonEnabled('cart');
     265            $shouldBuildIt = $enabledInProduct || $enabledInCart;
     266            if ($shouldBuildIt) {
     267                $paypalButtonHandler->bootstrap($enabledInProduct, $enabledInCart);
     268            }
     269        }
     270    }
     271    /**
     272     * This instantiates all payment methods that we have implemented
     273     * disregards if they are available at Mollie or not
     274     *
    456275     * @return array
    457276     */
    458     protected function instantiatePaymentMethods($container): array
     277    protected function instantiatePaymentMethods(): array
    459278    {
    460279        $paymentMethods = [];
    461         $listAllAvailablePaymentMethods = $container->get('gateway.getPaymentMethodsAfterFeatureFlag');
    462         $iconFactory = $container->get(IconFactory::class);
    463         assert($iconFactory instanceof IconFactory);
    464         $settingsHelper = $container->get('settings.settings_helper');
    465         assert($settingsHelper instanceof Settings);
    466         $surchargeService = $container->get(\Mollie\WooCommerce\Gateway\Surcharge::class);
    467         assert($surchargeService instanceof \Mollie\WooCommerce\Gateway\Surcharge);
    468         $paymentFieldsService = $container->get(PaymentFieldsService::class);
    469         assert($paymentFieldsService instanceof PaymentFieldsService);
    470         foreach ($listAllAvailablePaymentMethods as $paymentMethodAvailable) {
    471             $paymentMethodId = $paymentMethodAvailable['id'];
    472             $paymentMethods[$paymentMethodId] = $this->buildPaymentMethod($paymentMethodId, $iconFactory, $settingsHelper, $paymentFieldsService, $surchargeService, $paymentMethodAvailable);
     280        $allGatewayClassNames = SharedDataDictionary::GATEWAY_CLASSNAMES;
     281        foreach ($allGatewayClassNames as $gatewayClassName) {
     282            $parts = explode('_', $gatewayClassName);
     283            $methodId = strtolower(end($parts));
     284            $paymentMethods[$methodId] = $this->buildPaymentMethod($methodId);
    473285        }
    474286        //I need DirectDebit to create SEPA gateway
    475287        if (!in_array(Constants::DIRECTDEBIT, array_keys($paymentMethods), \true)) {
    476             $paymentMethodId = Constants::DIRECTDEBIT;
    477             $paymentMethods[$paymentMethodId] = $this->buildPaymentMethod($paymentMethodId, $iconFactory, $settingsHelper, $paymentFieldsService, $surchargeService, []);
     288            $methodId = Constants::DIRECTDEBIT;
     289            $paymentMethods[$methodId] = $this->buildPaymentMethod($methodId);
    478290        }
    479291        return $paymentMethods;
     292    }
     293    /**
     294     * @param string $id
     295     * @param IconFactory $iconFactory
     296     * @param Settings $settingsHelper
     297     * @param Surcharge $surchargeService
     298     * @param array $paymentMethods
     299     * @return PaymentMethodI | array
     300     */
     301    public function buildPaymentMethod(string $id)
     302    {
     303        $transformedId = ucfirst($id);
     304        $paymentMethodClassName = 'Mollie\WooCommerce\PaymentMethods\\' . $transformedId;
     305        return new $paymentMethodClassName();
    480306    }
    481307    public function in3FieldsMandatory($fields, $errors)
    … …  
    503329    }
    504330    /**
    505      * @param string $id
    506      * @param IconFactory $iconFactory
    507      * @param Settings $settingsHelper
    508      * @param PaymentFieldsService $paymentFieldsService
    509      * @param Surcharge $surchargeService
    510      * @param array $paymentMethods
    511      * @return PaymentMethodI | array
    512      */
    513     public function buildPaymentMethod(string $id, IconFactory $iconFactory, Settings $settingsHelper, PaymentFieldsService $paymentFieldsService, \Mollie\WooCommerce\Gateway\Surcharge $surchargeService, array $apiMethod)
    514     {
    515         $transformedId = ucfirst($id);
    516         $paymentMethodClassName = 'Mollie\WooCommerce\PaymentMethods\\' . $transformedId;
    517         $paymentMethod = new $paymentMethodClassName($iconFactory, $settingsHelper, $paymentFieldsService, $surchargeService, $apiMethod);
    518         return $paymentMethod;
     331     * Some payment methods require mandatory fields, this function will add them to the checkout fields array
     332     * @param $fields
     333     * @param string $gatewayName
     334     * @param string $field
     335     * @param $errors
     336     * @return mixed
     337     */
     338    public function addPaymentMethodMandatoryFields($fields, string $gatewayName, string $field, string $fieldLabel, $errors)
     339    {
     340        if ($fields['payment_method'] !== $gatewayName) {
     341            return $fields;
     342        }
     343        if (!isset($fields[$field])) {
     344            $fieldPosted = filter_input(\INPUT_POST, $field, \FILTER_SANITIZE_SPECIAL_CHARS) ?? \false;
     345            if ($fieldPosted) {
     346                $fields[$field] = $fieldPosted;
     347            } else {
     348                $errors->add('validation', sprintf(
     349                    /* translators: Placeholder 1: field name. */
     350                    __('%s is a required field.', 'woocommerce'),
     351                    "<strong>{$fieldLabel}</strong>"
     352                ));
     353            }
     354        }
     355        return $fields;
    519356    }
    520357    public function addPaymentMethodMandatoryFieldsPhoneVerification($fields, string $gatewayName, string $field, string $fieldLabel, $errors)

  • mollie-payments-for-woocommerce/trunk/src/Gateway/OrderMandatoryGatewayDisabler.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\Gateway;
    55
     6use Mollie\Inpsyde\PaymentGateway\PaymentGateway;
    67class OrderMandatoryGatewayDisabler
    78{
    … …  
    1011     */
    1112    protected $isSettingsOrderApi;
     13    private array $paymentMethods;
    1214    /**
    1315     * OrderMandatoryGatewayDisabler constructor.
    1416     */
    15     public function __construct(bool $isSettingsOrderApi)
     17    public function __construct(bool $isSettingsOrderApi, array $paymentMethods)
    1618    {
    1719        $this->isSettingsOrderApi = $isSettingsOrderApi;
     20        $this->paymentMethods = $paymentMethods;
    1821    }
    1922    /**
    … …  
    3639            return $gateways;
    3740        }
    38         return array_filter($gateways, static function ($gateway) {
    39             return !$gateway instanceof \Mollie\WooCommerce\Gateway\MolliePaymentGateway || !$gateway->paymentMethod()->getProperty('orderMandatory');
     41        $paymentMethods = $this->paymentMethods;
     42        return array_filter($gateways, static function ($gateway) use ($paymentMethods) {
     43            if (!mollieWooCommerceIsMollieGateway($gateway)) {
     44                return \true;
     45            }
     46            $gatewayId = $gateway->id;
     47            $methodId = substr($gatewayId, strrpos($gatewayId, '_') + 1);
     48            $method = $paymentMethods[$methodId] ?? null;
     49            return !$method->getProperty('orderMandatory');
    4050        });
    4151    }

  • mollie-payments-for-woocommerce/trunk/src/Gateway/Voucher/MaybeDisableGateway.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\Gateway\Voucher;
    55
    6 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
    7 use Mollie\WooCommerce\Payment\PaymentService;
     6use Mollie\Inpsyde\PaymentGateway\PaymentGateway;
     7use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
     8use Mollie\WooCommerce\Payment\PaymentProcessor;
    89use Mollie\WooCommerce\PaymentMethods\Voucher;
    910class MaybeDisableGateway
    1011{
     12    /**
     13     * Disable Bank Transfer Gateway
     14     *
     15     * @param ?array $gateways
     16     * @return array
     17     */
     18    public function maybeDisableBankTransferGateway(?array $gateways): array
     19    {
     20        if (!is_array($gateways)) {
     21            return [];
     22        }
     23        $isWcApiRequest = (bool) filter_input(\INPUT_GET, 'wc-api', \FILTER_SANITIZE_SPECIAL_CHARS);
     24        $bankTransferSettings = get_option('mollie_wc_gateway_banktransfer_settings', \false);
     25        //If the setting is active is forced Payment API so we need to filter the gateway when order is in pay-page
     26        // as it might have been created with Orders API
     27        $isActiveExpiryDate = $bankTransferSettings && isset($bankTransferSettings['activate_expiry_days_setting']) && $bankTransferSettings['activate_expiry_days_setting'] === "yes" && isset($bankTransferSettings['order_dueDate']) && $bankTransferSettings['order_dueDate'] > 0;
     28        /*
     29         * There is only one case where we want to filter the gateway and it's when the
     30         * pay-page render the available payments methods AND the setting is enabled
     31         *
     32         * For any other case we want to be sure bank transfer gateway is included.
     33         */
     34        if ($isWcApiRequest || !$isActiveExpiryDate || is_checkout() && !is_wc_endpoint_url('order-pay') || !wp_doing_ajax() && !is_wc_endpoint_url('order-pay') || is_admin()) {
     35            return $gateways;
     36        }
     37        $bankTransferGatewayClassName = 'mollie_wc_gateway_banktransfer';
     38        unset($gateways[$bankTransferGatewayClassName]);
     39        return $gateways;
     40    }
    1141    /**
    1242     * Disable Voucher Gateway if no categories associated with any product
    … …  
    2454        }
    2555        $isWcApiRequest = (bool) filter_input(\INPUT_GET, 'wc-api', \FILTER_SANITIZE_SPECIAL_CHARS);
     56        $isCheckoutPage = is_checkout();
     57        $isOrderPayPage = is_wc_endpoint_url('order-pay');
    2658        // To exclude we are in Checkout or Order Pay page. These are the other options where gateways are required.
    27         $notInCheckoutOrPayPage = $isWcApiRequest || !doing_action('woocommerce_payment_gateways') || !wp_doing_ajax() && !is_wc_endpoint_url('order-pay');
     59        $notInCheckoutOrPayPage = $isWcApiRequest || !doing_action('woocommerce_payment_gateways') || !wp_doing_ajax() && !$isOrderPayPage && !$isCheckoutPage;
    2860        $notHasBlocks = !has_block('woocommerce/checkout');
    2961        /*
    … …  
    3971        $mealVoucherGatewayIndex = \false;
    4072        foreach ($gateways as $key => $gateway) {
    41             if (!$gateway instanceof MolliePaymentGateway) {
     73            if (!mollieWooCommerceIsMollieGateway($gateway)) {
    4274                continue;
    4375            }
    … …  
    4779        }
    4880        $productsWithCategory = $this->numberProductsWithCategory();
    49         $paymentAPISetting = get_option('mollie-payments-for-woocommerce_api_switch') === PaymentService::PAYMENT_METHOD_TYPE_PAYMENT;
     81        $paymentAPISetting = get_option('mollie-payments-for-woocommerce_api_switch') === PaymentProcessor::PAYMENT_METHOD_TYPE_PAYMENT;
    5082        if ($mealVoucherGatewayIndex !== \false && ($productsWithCategory === 0 || $paymentAPISetting)) {
    5183            unset($gateways[$mealVoucherGatewayIndex]);

  • mollie-payments-for-woocommerce/trunk/src/Gateway/Voucher/VoucherModule.php

    r3164004 r3262577  
    5050    public function run(ContainerInterface $container): bool
    5151    {
    52         $gatewayInstances = $container->get('gateway.instances');
     52        $gatewayInstances = $container->get('__deprecated.gateway_helpers');
    5353        $voucherGateway = $gatewayInstances['mollie_wc_gateway_voucher'] ?? \false;
    5454        $voucher = $voucherGateway && $voucherGateway->enabled === 'yes';

  • mollie-payments-for-woocommerce/trunk/src/Payment/MollieObject.php

    r3226701 r3262577  
    77use Mollie\Api\Resources\Order;
    88use Mollie\Api\Resources\Payment;
    9 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
     9use Mollie\WooCommerce\Payment\Request\RequestFactory;
    1010use Mollie\WooCommerce\PaymentMethods\Voucher;
    1111use Mollie\WooCommerce\SDK\Api;
    1212use Mollie\WooCommerce\Settings\Settings;
     13use Mollie\WooCommerce\Shared\SharedDataDictionary;
    1314use WC_Order;
    1415use WC_Payment_Gateway;
    1516use Mollie\Psr\Log\LoggerInterface as Logger;
    16 use stdClass;
    1717class MollieObject
    1818{
    19     public const MAXIMAL_LENGTH_ADDRESS = 100;
    20     public const MAXIMAL_LENGTH_POSTALCODE = 20;
    21     public const MAXIMAL_LENGTH_CITY = 200;
    22     public const MAXIMAL_LENGTH_REGION = 200;
    2319    protected $data;
    2420    /**
    … …  
    3430     * @var Logger
    3531     */
    36     protected $logger;
     32    protected Logger $logger;
    3733    /**
    3834     * @var PaymentFactory
    3935     */
    40     protected $paymentFactory;
     36    protected \Mollie\WooCommerce\Payment\PaymentFactory $paymentFactory;
    4137    protected $dataService;
    4238    protected $apiHelper;
    43     protected $settingsHelper;
     39    protected Settings $settingsHelper;
    4440    protected $dataHelper;
    4541    /**
    … …  
    4743     */
    4844    protected $pluginId;
    49     public function __construct($data, Logger $logger, \Mollie\WooCommerce\Payment\PaymentFactory $paymentFactory, Api $apiHelper, Settings $settingsHelper, string $pluginId)
     45    /**
     46     * @var null
     47     */
     48    private $paymentMethod;
     49    protected RequestFactory $requestFactory;
     50    public function __construct($data, Logger $logger, \Mollie\WooCommerce\Payment\PaymentFactory $paymentFactory, Api $apiHelper, Settings $settingsHelper, string $pluginId, RequestFactory $requestFactory)
    5051    {
    5152        $this->data = $data;
    … …  
    5758        $base_location = wc_get_base_location();
    5859        static::$shop_country = $base_location['country'];
     60        $this->paymentMethod = null;
     61        $this->requestFactory = $requestFactory;
    5962    }
    6063    public function data()
    … …  
    131134    protected function getPaymentRequestData($order, $customerId, $voucherDefaultCategory = Voucher::NO_CATEGORY)
    132135    {
     136    }
     137    /**
     138     * @param \WC_Order $order
     139     * @param string $new_status
     140     * @param string $note
     141     * @param bool $restore_stock
     142     */
     143    public function updateOrderStatus(\WC_Order $order, $new_status, $note = '', $restore_stock = \true)
     144    {
     145        $order->update_status($new_status, $note);
     146        switch ($new_status) {
     147            case SharedDataDictionary::STATUS_ON_HOLD:
     148                if ($restore_stock === \true) {
     149                    if (!$order->get_meta('_order_stock_reduced', \true)) {
     150                        // Reduce order stock
     151                        wc_reduce_stock_levels($order->get_id());
     152                        $this->logger->debug(__METHOD__ . ":  Stock for order {$order->get_id()} reduced.");
     153                    }
     154                }
     155                break;
     156            case SharedDataDictionary::STATUS_PENDING:
     157            case SharedDataDictionary::STATUS_FAILED:
     158            case SharedDataDictionary::STATUS_CANCELLED:
     159                if ($order->get_meta('_order_stock_reduced', \true)) {
     160                    // Restore order stock
     161                    $this->dataHelper->restoreOrderStock($order);
     162                    $this->logger->debug(__METHOD__ . " Stock for order {$order->get_id()} restored.");
     163                }
     164                break;
     165        }
    133166    }
    134167    /**
    … …  
    497530        }
    498531    }
    499     protected function addSequenceTypeForSubscriptionsFirstPayments($orderId, $gateway, $paymentRequestData): array
    500     {
    501         if ($this->dataHelper->isSubscription($orderId) || $this->dataHelper->isWcSubscription($orderId)) {
    502             $disable_automatic_payments = apply_filters($this->pluginId . '_is_automatic_payment_disabled', \false);
    503             $supports_subscriptions = $gateway->supports('subscriptions');
    504             if ($supports_subscriptions == \true && $disable_automatic_payments == \false) {
    505                 $paymentRequestData = $this->addSequenceTypeFirst($paymentRequestData);
    506             }
    507         }
    508         return $paymentRequestData;
    509     }
    510     public function addSequenceTypeFirst($paymentRequestData)
    511     {
    512     }
    513532    /**
    514533     * @param $order
    … …  
    540559    {
    541560        if (function_exists('wcs_order_contains_renewal') && wcs_order_contains_renewal($orderId)) {
    542             if ($gateway instanceof MolliePaymentGateway) {
    543                 $gateway->paymentService()->updateOrderStatus($order, $newOrderStatus, sprintf(
     561            if (mollieWooCommerceIsMollieGateway($gateway->id)) {
     562                $this->updateOrderStatus($order, $newOrderStatus, sprintf(
    544563                    /* translators: Placeholder 1: payment method title, placeholder 2: payment ID */
    545564                    __('%1$s renewal payment failed via Mollie (%2$s). You will need to manually review the payment and adjust product stocks if you use them.', 'mollie-payments-for-woocommerce'),
    … …  
    554573                $emails['WC_Email_Failed_Order']->trigger($orderId);
    555574            }
    556         } elseif ($gateway instanceof MolliePaymentGateway) {
    557             $gateway->paymentService()->updateOrderStatus($order, $newOrderStatus, sprintf(
     575        } elseif (mollieWooCommerceIsMollieGateway($gateway->id)) {
     576            $this->updateOrderStatus($order, $newOrderStatus, sprintf(
    558577                /* translators: Placeholder 1: payment method title, placeholder 2: payment ID */
    559578                __('%1$s payment failed via Mollie (%2$s).', 'mollie-payments-for-woocommerce'),
    … …  
    594613        }
    595614    }
    596     /**
    597      * Get the url to return to on Mollie return
    598      * saves the return redirect and failed redirect, so we save the page language in case there is one set
    599      * For example 'http://mollie-wc.docker.myhost/wc-api/mollie_return/?order_id=89&key=wc_order_eFZyH8jki6fge'
    600      *
    601      * @param WC_Order $order The order processed
    602      *
    603      * @return string The url with order id and key as params
    604      */
    605     public function getReturnUrl($order, $returnUrl)
    606     {
    607         $returnUrl = untrailingslashit($returnUrl);
    608         $returnUrl = $this->asciiDomainName($returnUrl);
    609         $orderId = $order->get_id();
    610         $orderKey = $order->get_order_key();
    611         $onMollieReturn = 'onMollieReturn';
    612         $returnUrl = $this->appendOrderArgumentsToUrl($orderId, $orderKey, $returnUrl, $onMollieReturn);
    613         $returnUrl = untrailingslashit($returnUrl);
    614         $this->logger->debug(" Order {$orderId} returnUrl: {$returnUrl}", [\true]);
    615         return apply_filters($this->pluginId . '_return_url', $returnUrl, $order);
    616     }
    617     /**
    618      * Get the webhook url
    619      * For example 'http://mollie-wc.docker.myhost/wc-api/mollie_return/mollie_wc_gateway_bancontact/?order_id=89&key=wc_order_eFZyH8jki6fge'
    620      *
    621      * @param WC_Order $order The order processed
    622      *
    623      * @return string The url with gateway and order id and key as params
    624      */
    625     public function getWebhookUrl($order, $gatewayId)
    626     {
    627         $webhookUrl = WC()->api_request_url($gatewayId);
    628         $webhookUrl = untrailingslashit($webhookUrl);
    629         $webhookUrl = $this->asciiDomainName($webhookUrl);
    630         $orderId = $order->get_id();
    631         $orderKey = $order->get_order_key();
    632         $webhookUrl = $this->appendOrderArgumentsToUrl($orderId, $orderKey, $webhookUrl);
    633         $webhookUrl = untrailingslashit($webhookUrl);
    634         $this->logger->debug(" Order {$orderId} webhookUrl: {$webhookUrl}", [\true]);
    635         return apply_filters($this->pluginId . '_webhook_url', $webhookUrl, $order);
    636     }
    637     /**
    638      * @param $url
    639      *
    640      * @return string
    641      */
    642     protected function asciiDomainName($url): string
    643     {
    644         $parsed = wp_parse_url($url);
    645         $scheme = isset($parsed['scheme']) ? $parsed['scheme'] : '';
    646         $domain = isset($parsed['host']) ? $parsed['host'] : \false;
    647         $query = isset($parsed['query']) ? $parsed['query'] : '';
    648         $path = isset($parsed['path']) ? $parsed['path'] : '';
    649         if (!$domain) {
    650             return $url;
    651         }
    652         if (function_exists('idn_to_ascii')) {
    653             $domain = $this->idnEncodeDomain($domain);
    654             $url = $scheme . "://" . $domain . $path . '?' . $query;
    655         }
    656         return $url;
    657     }
    658     /**
    659      * @param $order_id
    660      * @param $order_key
    661      * @param $webhook_url
    662      * @param string $filterFlag
    663      *
    664      * @return string
    665      */
    666     protected function appendOrderArgumentsToUrl($order_id, $order_key, $webhook_url, $filterFlag = '')
    667     {
    668         $webhook_url = add_query_arg(['order_id' => $order_id, 'key' => $order_key, 'filter_flag' => $filterFlag], $webhook_url);
    669         return $webhook_url;
    670     }
    671     /**
    672      * @param $domain
    673      * @return false|mixed|string
    674      */
    675     protected function idnEncodeDomain($domain)
    676     {
    677         if (defined('IDNA_NONTRANSITIONAL_TO_ASCII') && defined('INTL_IDNA_VARIANT_UTS46')) {
    678             $domain = idn_to_ascii($domain, \IDNA_NONTRANSITIONAL_TO_ASCII, \INTL_IDNA_VARIANT_UTS46) ? idn_to_ascii($domain, \IDNA_NONTRANSITIONAL_TO_ASCII, \INTL_IDNA_VARIANT_UTS46) : $domain;
    679         } else {
    680             $domain = idn_to_ascii($domain) ? idn_to_ascii($domain) : $domain;
    681         }
    682         return $domain;
    683     }
    684     protected function getPaymentDescription($order, $option)
    685     {
    686         $description = !$option ? '' : trim($option);
    687         $description = !$description ? '{orderNumber}' : $description;
    688         switch ($description) {
    689             // Support for old deprecated options.
    690             // TODO: remove when deprecated
    691             case '{orderNumber}':
    692                 $description = _x('Order {orderNumber}', 'Payment description for {orderNumber}', 'mollie-payments-for-woocommerce');
    693                 $description = $this->replaceTagsDescription($order, $description);
    694                 break;
    695             case '{storeName}':
    696                 $description = _x('StoreName {storeName}', 'Payment description for {storeName}', 'mollie-payments-for-woocommerce');
    697                 $description = $this->replaceTagsDescription($order, $description);
    698                 break;
    699             case '{customer.firstname}':
    700                 $description = _x('Customer Firstname {customer.firstname}', 'Payment description for {customer.firstname}', 'mollie-payments-for-woocommerce');
    701                 $description = $this->replaceTagsDescription($order, $description);
    702                 break;
    703             case '{customer.lastname}':
    704                 $description = _x('Customer Lastname {customer.lastname}', 'Payment description for {customer.lastname}', 'mollie-payments-for-woocommerce');
    705                 $description = $this->replaceTagsDescription($order, $description);
    706                 break;
    707             case '{customer.company}':
    708                 $description = _x('Customer Company {customer.company}', 'Payment description for {customer.company}', 'mollie-payments-for-woocommerce');
    709                 $description = $this->replaceTagsDescription($order, $description);
    710                 break;
    711             // Support for custom string with interpolation.
    712             default:
    713                 // Replace available description tags.
    714                 $description = $this->replaceTagsDescription($order, $description);
    715                 break;
    716         }
    717         // Fall back on default if description turns out empty.
    718         return !$description ? __('Order', 'woocommerce') . ' ' . $order->get_order_number() : $description;
    719     }
    720     /**
    721      * @param $order
    722      * @param $description
    723      * @return array|string|string[]
    724      */
    725     protected function replaceTagsDescription($order, $description)
    726     {
    727         $replacement_tags = ['{orderNumber}' => $order->get_order_number(), '{storeName}' => get_bloginfo('name'), '{customer.firstname}' => $order->get_billing_first_name(), '{customer.lastname}' => $order->get_billing_last_name(), '{customer.company}' => $order->get_billing_company()];
    728         foreach ($replacement_tags as $tag => $replacement) {
    729             $description = str_replace($tag, $replacement, $description);
    730         }
    731         return $description;
    732     }
    733     /**
    734      * @param $order
    735      * @return stdClass
    736      */
    737     protected function createBillingAddress($order)
    738     {
    739         // Setup billing and shipping objects
    740         $billingAddress = new stdClass();
    741         // Get user details
    742         $billingAddress->givenName = ctype_space($order->get_billing_first_name()) ? null : $order->get_billing_first_name();
    743         $billingAddress->familyName = ctype_space($order->get_billing_last_name()) ? null : $order->get_billing_last_name();
    744         $billingAddress->email = ctype_space($order->get_billing_email()) ? null : $order->get_billing_email();
    745         // Create billingAddress object
    746         $billingAddress->streetAndNumber = ctype_space($order->get_billing_address_1()) ? null : $this->maximalFieldLengths($order->get_billing_address_1(), self::MAXIMAL_LENGTH_ADDRESS);
    747         $billingAddress->streetAdditional = ctype_space($order->get_billing_address_2()) ? null : $this->maximalFieldLengths($order->get_billing_address_2(), self::MAXIMAL_LENGTH_ADDRESS);
    748         $billingAddress->postalCode = ctype_space($order->get_billing_postcode()) ? null : $this->maximalFieldLengths($order->get_billing_postcode(), self::MAXIMAL_LENGTH_POSTALCODE);
    749         $billingAddress->city = ctype_space($order->get_billing_city()) ? null : $this->maximalFieldLengths($order->get_billing_city(), self::MAXIMAL_LENGTH_CITY);
    750         $billingAddress->region = ctype_space($order->get_billing_state()) ? null : $this->maximalFieldLengths($order->get_billing_state(), self::MAXIMAL_LENGTH_REGION);
    751         $billingAddress->country = ctype_space($order->get_billing_country()) ? null : $this->maximalFieldLengths($order->get_billing_country(), self::MAXIMAL_LENGTH_REGION);
    752         $billingAddress->organizationName = $this->billingCompanyField($order);
    753         $phone = $this->getPhoneNumber($order);
    754         $billingAddress->phone = ctype_space($phone) ? null : $this->getFormattedPhoneNumber($phone);
    755         return $billingAddress;
    756     }
    757     protected function getPhoneNumber($order)
    758     {
    759         $phone = !empty($order->get_billing_phone()) ? $order->get_billing_phone() : $order->get_shipping_phone();
    760         if (empty($phone)) {
    761             //phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
    762             $phone = wc_clean(wp_unslash($_POST['billing_phone'] ?? ''));
    763         }
    764         return $phone;
    765     }
    766     protected function getFormattedPhoneNumber(string $phone)
    767     {
    768         //remove whitespaces and all non numerical characters except +
    769         $phone = preg_replace('/[^0-9+]+/', '', $phone);
    770         if (!is_string($phone)) {
    771             return null;
    772         }
    773         //check if phone starts with 06 and replace with +316
    774         $phone = transformPhoneToNLFormat($phone);
    775         //check that $phone is in E164 format or can be changed by api
    776         if (is_string($phone) && preg_match('/^\+[1-9]\d{10,13}$|^[1-9]\d{9,13}$/', $phone)) {
    777             return $phone;
    778         }
    779         return null;
    780     }
    781     /**
    782      * @param $order
    783      * @return string|null
    784      */
    785     public function billingCompanyField($order): ?string
    786     {
    787         if (!trim($order->get_billing_company())) {
    788             return $this->checkBillieCompanyField($order);
    789         }
    790         return $this->maximalFieldLengths($order->get_billing_company(), self::MAXIMAL_LENGTH_ADDRESS);
    791     }
    792     private function checkBillieCompanyField($order)
    793     {
    794         $gateway = wc_get_payment_gateway_by_order($order);
    795         if (!$gateway || !$gateway->id) {
    796             return null;
    797         }
    798         $isBillieMethodId = $gateway->id === 'mollie_wc_gateway_billie';
    799         if ($isBillieMethodId) {
    800             //phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
    801             $fieldPosted = wc_clean(wp_unslash($_POST["billing_company_billie"] ?? ''));
    802             $company = ($fieldPosted ?: $order->get_billing_company()) ?: $order->get_shipping_company();
    803             return $company ? $this->maximalFieldLengths($company, self::MAXIMAL_LENGTH_ADDRESS) : null;
    804         }
    805         return null;
    806     }
    807     /**
    808      * @param $order
    809      * @return stdClass
    810      */
    811     protected function createShippingAddress($order)
    812     {
    813         $shippingAddress = new stdClass();
    814         // Get user details
    815         $shippingAddress->givenName = ctype_space($order->get_shipping_first_name()) ? null : $order->get_shipping_first_name();
    816         $shippingAddress->familyName = ctype_space($order->get_shipping_last_name()) ? null : $order->get_shipping_last_name();
    817         $shippingAddress->email = ctype_space($order->get_billing_email()) ? null : $order->get_billing_email();
    818         // WooCommerce doesn't have a shipping email
    819         // Create shippingAddress object
    820         $shippingAddress->streetAndNumber = ctype_space($order->get_shipping_address_1()) ? null : $this->maximalFieldLengths($order->get_shipping_address_1(), self::MAXIMAL_LENGTH_ADDRESS);
    821         $shippingAddress->streetAdditional = ctype_space($order->get_shipping_address_2()) ? null : $this->maximalFieldLengths($order->get_shipping_address_2(), self::MAXIMAL_LENGTH_ADDRESS);
    822         $shippingAddress->postalCode = ctype_space($order->get_shipping_postcode()) ? null : $this->maximalFieldLengths($order->get_shipping_postcode(), self::MAXIMAL_LENGTH_POSTALCODE);
    823         $shippingAddress->city = ctype_space($order->get_shipping_city()) ? null : $this->maximalFieldLengths($order->get_shipping_city(), self::MAXIMAL_LENGTH_CITY);
    824         $shippingAddress->region = ctype_space($order->get_shipping_state()) ? null : $this->maximalFieldLengths($order->get_shipping_state(), self::MAXIMAL_LENGTH_REGION);
    825         $shippingAddress->country = ctype_space($order->get_shipping_country()) ? null : $this->maximalFieldLengths($order->get_shipping_country(), self::MAXIMAL_LENGTH_REGION);
    826         return $shippingAddress;
    827     }
    828     /**
    829      * Method that shortens the field to a certain length
    830      *
    831      * @param string $field
    832      * @param int    $maximalLength
    833      *
    834      * @return null|string
    835      */
    836     protected function maximalFieldLengths($field, $maximalLength)
    837     {
    838         if (!is_string($field)) {
    839             return null;
    840         }
    841         if (is_int($maximalLength) && strlen($field) > $maximalLength) {
    842             $field = substr($field, 0, $maximalLength);
    843             $field = !$field ? null : $field;
    844         }
    845         return $field;
    846     }
    847615}

  • mollie-payments-for-woocommerce/trunk/src/Payment/MollieOrder.php

    r3226701 r3262577  
    55
    66use Exception;
     7use Mollie\Inpsyde\PaymentGateway\PaymentGateway;
    78use Mollie\Api\Exceptions\ApiException;
    89use Mollie\Api\Resources\Payment;
    910use Mollie\Api\Resources\Order;
    1011use Mollie\Api\Resources\Refund;
    11 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
     12use Mollie\WooCommerce\Gateway\Refund\OrderItemsRefunder;
     13use Mollie\WooCommerce\Gateway\Refund\PartialRefundException;
     14use Mollie\WooCommerce\Payment\Request\RequestFactory;
    1215use Mollie\WooCommerce\PaymentMethods\Voucher;
    1316use Mollie\WooCommerce\SDK\Api;
     17use Mollie\WooCommerce\Settings\Settings;
     18use Mollie\WooCommerce\Shared\Data;
    1419use Mollie\WooCommerce\Shared\SharedDataDictionary;
     20use Mollie\Psr\Log\LoggerInterface as Logger;
    1521use Mollie\Psr\Log\LogLevel;
    1622use WC_Order;
    … …  
    2632    protected static $shop_country;
    2733    /**
    28      * @var OrderLines
    29      */
    30     protected $orderLines;
    31     /**
    3234     * @var OrderItemsRefunder
    3335     */
    … …  
    3941     * @param $data
    4042     */
    41     public function __construct(\Mollie\WooCommerce\Payment\OrderItemsRefunder $orderItemsRefunder, $data, $pluginId, Api $apiHelper, $settingsHelper, $dataHelper, $logger, \Mollie\WooCommerce\Payment\OrderLines $orderLines)
     43    public function __construct(OrderItemsRefunder $orderItemsRefunder, $data, string $pluginId, Api $apiHelper, Settings $settingsHelper, Data $dataHelper, Logger $logger, RequestFactory $requestFactory)
    4244    {
    4345        $this->data = $data;
    … …  
    4648        $this->apiHelper = $apiHelper;
    4749        $this->settingsHelper = $settingsHelper;
     50        $this->logger = $logger;
     51        $this->requestFactory = $requestFactory;
    4852        $this->dataHelper = $dataHelper;
    49         $this->logger = $logger;
    50         $this->orderLines = $orderLines;
    5153    }
    5254    public function getPaymentObject($paymentId, $testMode = \false, $useCache = \true)
    … …  
    7072    public function getPaymentRequestData($order, $customerId, $voucherDefaultCategory = Voucher::NO_CATEGORY)
    7173    {
    72         $settingsHelper = $this->settingsHelper;
    73         $paymentLocale = $settingsHelper->getPaymentLocale();
    74         $storeCustomer = $settingsHelper->shouldStoreCustomer();
    75         $gateway = wc_get_payment_gateway_by_order($order);
    76         if (!$gateway || !$gateway instanceof MolliePaymentGateway) {
    77             return ['result' => 'failure'];
    78         }
    79         $gatewayId = $gateway->id;
    80         $selectedIssuer = $gateway->getSelectedIssuer();
    81         $returnUrl = $gateway->get_return_url($order);
    82         $returnUrl = $this->getReturnUrl($order, $returnUrl);
    83         $webhookUrl = $this->getWebhookUrl($order, $gatewayId);
    84         $isPayPalExpressOrder = $order->get_meta('_mollie_payment_method_button') === 'PayPalButton';
    85         $billingAddress = null;
    86         if (!$isPayPalExpressOrder) {
    87             $billingAddress = $this->createBillingAddress($order);
    88             $shippingAddress = $this->createShippingAddress($order);
    89         }
    90         // Generate order lines for Mollie Orders
    91         $orderLinesHelper = $this->orderLines;
    92         $orderLines = $orderLinesHelper->order_lines($order, $voucherDefaultCategory);
    93         // Build the Mollie order data
    94         $paymentRequestData = ['amount' => ['currency' => $this->dataHelper->getOrderCurrency($order), 'value' => $this->dataHelper->formatCurrencyValue($order->get_total(), $this->dataHelper->getOrderCurrency($order))], 'redirectUrl' => $returnUrl, 'webhookUrl' => $webhookUrl, 'method' => $gateway->paymentMethod()->getProperty('id'), 'payment' => ['issuer' => $selectedIssuer], 'locale' => $paymentLocale, 'billingAddress' => $billingAddress, 'metadata' => apply_filters($this->pluginId . '_payment_object_metadata', ['order_id' => $order->get_id(), 'order_number' => $order->get_order_number()]), 'lines' => $orderLines['lines'], 'orderNumber' => $order->get_order_number()];
    95         $paymentRequestData = $this->addSequenceTypeForSubscriptionsFirstPayments($order->get_id(), $gateway, $paymentRequestData);
    96         // Only add shippingAddress if all required fields are set
    97         if (!empty($shippingAddress->streetAndNumber) && !empty($shippingAddress->postalCode) && !empty($shippingAddress->city) && !empty($shippingAddress->country)) {
    98             $paymentRequestData['shippingAddress'] = $shippingAddress;
    99         }
    100         // Only store customer at Mollie if setting is enabled
    101         if ($storeCustomer) {
    102             $paymentRequestData['payment']['customerId'] = $customerId;
    103         }
    104         $cardToken = mollieWooCommerceCardToken();
    105         if ($cardToken && isset($paymentRequestData['payment'])) {
    106             $paymentRequestData['payment']['cardToken'] = $cardToken;
    107         }
    108         //phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
    109         $applePayToken = wc_clean(wp_unslash($_POST["token"] ?? ''));
    110         if ($applePayToken && isset($paymentRequestData['payment'])) {
    111             $encodedApplePayToken = wp_json_encode($applePayToken);
    112             $paymentRequestData['payment']['applePayPaymentToken'] = $encodedApplePayToken;
    113         }
    114         $customerBirthdate = $this->getCustomerBirthdate($order);
    115         if ($customerBirthdate) {
    116             $paymentRequestData['consumerDateOfBirth'] = $customerBirthdate;
    117         }
    118         return $paymentRequestData;
     74        return $this->requestFactory->createRequest('order', $order, $customerId);
    11975    }
    12076    public function setActiveMolliePayment($orderId)
    … …  
    162118        $ibanDetails = [];
    163119        if (isset($payment->_embedded->payments[0]->id)) {
    164             $actualPayment = new \Mollie\WooCommerce\Payment\MolliePayment($payment->_embedded->payments[0]->id, $this->pluginId, $this->apiHelper, $this->settingsHelper, $this->dataHelper, $this->logger);
     120            $actualPayment = new \Mollie\WooCommerce\Payment\MolliePayment($payment->_embedded->payments[0]->id, $this->pluginId, $this->apiHelper, $this->settingsHelper, $this->dataHelper, $this->logger, $this->requestFactory);
    165121            $actualPayment = $actualPayment->getPaymentObject($actualPayment->data);
    166122            /**
    … …  
    171127        }
    172128        return $ibanDetails;
    173     }
    174     public function addSequenceTypeFirst($paymentRequestData)
    175     {
    176         $paymentRequestData['payment']['sequenceType'] = 'first';
    177         return $paymentRequestData;
    178129    }
    179130    /**
    … …  
    462413            try {
    463414                return $this->orderItemsRefunder->refund($order, $items, $paymentObject, $reason);
    464             } catch (\Mollie\WooCommerce\Payment\PartialRefundException $exception) {
     415            } catch (PartialRefundException $exception) {
    465416                $this->logger->debug(__METHOD__ . ' - ' . $exception->getMessage());
    466417                return $this->refund_amount($order, $amount, $paymentObject, $reason);
    … …  
    596547    {
    597548        $gateway = wc_get_payment_gateway_by_order($order);
    598         if (!$this->isOrderPaymentStartedByOtherGateway($order) && is_a($gateway, MolliePaymentGateway::class)) {
    599             $gateway->paymentService()->updateOrderStatus($order, $newOrderStatus);
     549        if (!$this->isOrderPaymentStartedByOtherGateway($order) && is_a($gateway, PaymentGateway::class)) {
     550            $this->updateOrderStatus($order, $newOrderStatus);
    600551        } else {
    601552            $this->informNotUpdatingStatus($gateway->id, $order);
    … …  
    669620        unset($items[$item->get_id()]);
    670621    }
    671     protected function getCustomerBirthdate($order)
    672     {
    673         $gateway = wc_get_payment_gateway_by_order($order);
    674         if (!$gateway || !isset($gateway->id)) {
    675             return null;
    676         }
    677         if (strpos($gateway->id, 'mollie_wc_gateway_') === \false) {
    678             return null;
    679         }
    680         $additionalFields = $gateway->paymentMethod()->getProperty('additionalFields');
    681         $methodId = $additionalFields && in_array('birthdate', $additionalFields, \true);
    682         if ($methodId) {
    683             $optionName = 'billing_birthdate_' . $gateway->paymentMethod()->getProperty('id');
    684             //phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
    685             $fieldPosted = wc_clean(wp_unslash($_POST[$optionName] ?? ''));
    686             if ($fieldPosted === '' || !is_string($fieldPosted)) {
    687                 return null;
    688             }
    689             $order->update_meta_data($optionName, $fieldPosted);
    690             $order->save();
    691             $format = "Y-m-d";
    692             return gmdate($format, (int) strtotime($fieldPosted));
    693         }
    694         return null;
     622    public function setOrder($data)
     623    {
     624        $this->data = $data;
    695625    }
    696626}

  • mollie-payments-for-woocommerce/trunk/src/Payment/MollieOrderService.php

    r3242448 r3262577  
    44namespace Mollie\WooCommerce\Payment;
    55
     6use Mollie\Inpsyde\PaymentGateway\PaymentGateway;
    67use Mollie\Api\Exceptions\ApiException;
    78use Mollie\Api\Resources\Order;
    89use Mollie\Api\Resources\Payment;
    910use Mollie\WooCommerce\Gateway\AbstractGateway;
    10 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
     11use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
    1112use Mollie\WooCommerce\SDK\HttpResponse;
    1213use Mollie\WooCommerce\Shared\Data;
    1314use Mollie\WooCommerce\Shared\SharedDataDictionary;
     15use Mollie\Psr\Container\ContainerInterface;
    1416use Mollie\Psr\Log\LoggerInterface as Logger;
    1517use Mollie\Psr\Log\LogLevel;
    … …  
    3537    protected $data;
    3638    protected $pluginId;
    37     /**
    38      * PaymentService constructor.
    39      */
    40     public function __construct(HttpResponse $httpResponse, Logger $logger, \Mollie\WooCommerce\Payment\PaymentFactory $paymentFactory, Data $data, string $pluginId)
     39    private ContainerInterface $container;
     40    /**
     41     * MollieOrderService constructor.
     42     */
     43    public function __construct(HttpResponse $httpResponse, Logger $logger, \Mollie\WooCommerce\Payment\PaymentFactory $paymentFactory, Data $data, string $pluginId, ContainerInterface $container)
    4144    {
    4245        $this->httpResponse = $httpResponse;
    … …  
    4548        $this->data = $data;
    4649        $this->pluginId = $pluginId;
     50        $this->container = $container;
    4751    }
    4852    public function setGateway($gateway)
    … …  
    7781        }
    7882        $gateway = wc_get_payment_gateway_by_order($order);
    79         if (!$gateway instanceof MolliePaymentGateway) {
     83        if (!mollieWooCommerceIsMollieGateway($gateway->id)) {
    8084            return;
    8185        }
    … …  
    98102            return;
    99103        }
    100         $payment = $payment_object->getPaymentObject($payment_object->data(), $test_mode, $use_cache = \false);
     104        $payment = $payment_object->getPaymentObject($payment_object->data(), $test_mode, \false);
    101105        // Payment not found
    102106        if (!$payment) {
    103107            $this->httpResponse->setHttpResponseCode(404);
    104108            $this->logger->debug(__METHOD__ . ": payment object {$payment_object_id} not found.", [\true]);
    105             return;
    106         }
    107         if (in_array($payment->method, ['klarna', 'klarnapaylater', 'klarnasliceit', 'klarnapaynow'], \true) && strpos($paymentId, 'tr_') === 0) {
    108             $this->httpResponse->setHttpResponseCode(200);
    109             $this->logger->debug($this->gateway->id . ": not respond on transaction webhooks for this payment method. Payment ID {$payment->id}, order ID {$order_id}");
    110109            return;
    111110        }
    … …  
    125124            // TODO David: move to payment object?
    126125            // Add a debug message that order was already paid for
    127             $this->gateway->handlePaidOrderWebhook($order, $payment);
     126            $this->handlePaidOrderWebhook($order, $payment);
    128127            // Check and process a possible refund or chargeback
    129128            $this->processRefunds($order, $payment);
    … …  
    155154    }
    156155    /**
     156     * @param \WC_Order $order
     157     * @param $payment
     158     */
     159    public function handlePaidOrderWebhook(\WC_Order $order, $payment)
     160    {
     161        // Duplicate webhook call
     162        $this->httpResponse->setHttpResponseCode(204);
     163        $order = wc_get_order($order);
     164        $order_id = $order->get_id();
     165        $this->logger->debug(__METHOD__ . ' - ' . $order_id . ": Order does not need a payment by Mollie (payment {$payment->id}).", [\true]);
     166    }
     167    /**
    157168     * @param WC_Order $order
    158169     *
    … …  
    162173    {
    163174        $order_id = $order->get_id();
     175        $gateway = wc_get_payment_gateway_by_order($order);
     176        $paymentMethod = $this->container->get('payment_gateway.getPaymentMethod')($gateway->id);
    164177        // Check whether the order is processed and paid via another gateway
    165178        if ($this->isOrderPaidByOtherGateway($order)) {
    166             $this->logger->debug(__METHOD__ . ' ' . $this->gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: no, previously processed by other (non-Mollie) gateway.', [\true]);
     179            $this->logger->debug(__METHOD__ . ' ' . $gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: no, previously processed by other (non-Mollie) gateway.', [\true]);
    167180            return \false;
    168181        }
    169182        // Check whether the order is processed and paid via Mollie
    170183        if (!$this->isOrderPaidAndProcessed($order)) {
    171             $this->logger->debug(__METHOD__ . ' ' . $this->gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: yes, order not previously processed by Mollie gateway.', [\true]);
     184            $this->logger->debug(__METHOD__ . ' ' . $gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: yes, order not previously processed by Mollie gateway.', [\true]);
    172185            return \true;
    173186        }
     187        if ('1' === $order->get_meta('_mollie_authorized')) {
     188            $this->logger->debug(__METHOD__ . ' ' . $gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: yes, order is authorized.');
     189            return \true;
     190        }
    174191        if ($order->needs_payment()) {
    175             $this->logger->debug(__METHOD__ . ' ' . $this->gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: yes, WooCommerce thinks order needs payment.', [\true]);
     192            $this->logger->debug(__METHOD__ . ' ' . $gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: yes, WooCommerce thinks order needs payment.', [\true]);
    176193            return \true;
    177194        }
    178195        // Has initial order status 'on-hold'
    179         if ($this->gateway->paymentMethod()->getInitialOrderStatus() === SharedDataDictionary::STATUS_ON_HOLD && $order->has_status(SharedDataDictionary::STATUS_ON_HOLD)) {
    180             $this->logger->debug(__METHOD__ . ' ' . $this->gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: yes, has status On-Hold. ', [\true]);
     196        if ($paymentMethod->getInitialOrderStatus() === SharedDataDictionary::STATUS_ON_HOLD && $order->has_status(SharedDataDictionary::STATUS_ON_HOLD)) {
     197            $this->logger->debug(__METHOD__ . ' ' . $gateway->id . ': Order ' . $order_id . ' orderNeedsPayment check: yes, has status On-Hold. ', [\true]);
    181198            return \true;
    182199        }
    … …  
    498515    {
    499516        $payment_method_title = '';
    500         if (!$this->gateway instanceof MolliePaymentGateway) {
    501             return $payment_method_title;
    502         }
    503         if ($payment->method === $this->gateway->paymentMethod()->getProperty('id')) {
     517        if ($payment->method === $this->gateway->id) {
    504518            $payment_method_title = $this->gateway->method_title;
    505519        }

  • mollie-payments-for-woocommerce/trunk/src/Payment/MolliePayment.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\Payment;
    55
     6use Mollie\Inpsyde\PaymentGateway\PaymentGateway;
    67use Mollie\Api\Exceptions\ApiException;
    7 use Mollie\Api\Resources\Order;
    88use Mollie\Api\Resources\Payment;
    99use Mollie\Api\Resources\Refund;
    10 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
    11 use Mollie\WooCommerce\Gateway\MolliePaymentGatewayI;
     10use Mollie\WooCommerce\Payment\Request\RequestFactory;
    1211use Mollie\WooCommerce\PaymentMethods\Voucher;
    1312use Mollie\WooCommerce\SDK\Api;
     13use Mollie\WooCommerce\Settings\Settings;
     14use Mollie\WooCommerce\Shared\Data;
    1415use Mollie\WooCommerce\Shared\SharedDataDictionary;
     16use Mollie\Psr\Log\LoggerInterface as Logger;
    1517use Mollie\Psr\Log\LogLevel;
    1618use WC_Order;
    17 use WC_Payment_Gateway;
    1819use WC_Subscriptions_Manager;
    1920use WP_Error;
    … …  
    2223    public const ACTION_AFTER_REFUND_PAYMENT_CREATED = 'mollie-payments-for-woocommerce' . '_refund_payment_created';
    2324    protected $pluginId;
    24     public function __construct($data, $pluginId, Api $apiHelper, $settingsHelper, $dataHelper, $logger)
     25    public function __construct($data, string $pluginId, Api $apiHelper, Settings $settingsHelper, Data $dataHelper, Logger $logger, RequestFactory $requestFactory)
    2526    {
    2627        $this->data = $data;
    … …  
    2829        $this->apiHelper = $apiHelper;
    2930        $this->settingsHelper = $settingsHelper;
     31        $this->logger = $logger;
     32        $this->requestFactory = $requestFactory;
    3033        $this->dataHelper = $dataHelper;
    31         $this->logger = $logger;
    3234    }
    3335    public function getPaymentObject($paymentId, $testMode = \false, $useCache = \true)
    … …  
    5355    public function getPaymentRequestData($order, $customerId, $voucherDefaultCategory = Voucher::NO_CATEGORY)
    5456    {
    55         $settingsHelper = $this->settingsHelper;
    56         $optionName = $this->pluginId . '_' . 'api_payment_description';
    57         $option = get_option($optionName);
    58         $paymentDescription = $this->getPaymentDescription($order, $option);
    59         $paymentLocale = $settingsHelper->getPaymentLocale();
    60         $storeCustomer = $settingsHelper->shouldStoreCustomer();
    61         $gateway = wc_get_payment_gateway_by_order($order);
    62         if (!$gateway || !$gateway instanceof MolliePaymentGateway) {
    63             return ['result' => 'failure'];
    64         }
    65         $gatewayId = $gateway->id;
    66         $selectedIssuer = $gateway->getSelectedIssuer();
    67         $returnUrl = $gateway->get_return_url($order);
    68         $returnUrl = $this->getReturnUrl($order, $returnUrl);
    69         $webhookUrl = $this->getWebhookUrl($order, $gatewayId);
    70         $orderId = $order->get_id();
    71         $paymentRequestData = ['amount' => ['currency' => $this->dataHelper->getOrderCurrency($order), 'value' => $this->dataHelper->formatCurrencyValue($order->get_total(), $this->dataHelper->getOrderCurrency($order))], 'description' => $paymentDescription, 'redirectUrl' => $returnUrl, 'webhookUrl' => $webhookUrl, 'method' => $gateway->paymentMethod()->getProperty('id'), 'issuer' => $selectedIssuer, 'locale' => $paymentLocale, 'metadata' => apply_filters($this->pluginId . '_payment_object_metadata', ['order_id' => $order->get_id()])];
    72         $paymentRequestData = $this->addSequenceTypeForSubscriptionsFirstPayments($order->get_id(), $gateway, $paymentRequestData);
    73         if ($storeCustomer) {
    74             $paymentRequestData['customerId'] = $customerId;
    75         }
    76         $cardToken = mollieWooCommerceCardToken();
    77         if ($cardToken) {
    78             $paymentRequestData['cardToken'] = $cardToken;
    79         }
    80         //phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
    81         $applePayToken = wc_clean(wp_unslash($_POST["token"] ?? ''));
    82         if ($applePayToken) {
    83             $encodedApplePayToken = wp_json_encode($applePayToken);
    84             $paymentRequestData['applePayPaymentToken'] = $encodedApplePayToken;
    85         }
    86         $paymentRequestData = $this->addCustomRequestFields($order, $paymentRequestData, $gateway);
    87         return $paymentRequestData;
    88     }
    89     public function addSequenceTypeFirst($paymentRequestData)
    90     {
    91         $paymentRequestData['sequenceType'] = 'first';
    92         return $paymentRequestData;
     57        return $this->requestFactory->createRequest('payment', $order, $customerId);
    9358    }
    9459    /**
    … …  
    152117    /**
    153118     * @param \WC_Order                     $order
    154      * @param \Mollie\Api\Resources\Payment $payment
     119     * @param Payment $payment
    155120     * @param string                       $paymentMethodTitle
    156121     */
    … …  
    190155            // Add messages to log
    191156            $this->logger->debug(__METHOD__ . ' payment at Mollie not paid, so no processing for order ' . $orderId);
     157        }
     158    }
     159    /**
     160     * @param \WC_Order                   $order
     161     * @param Payment $payment
     162     * @param string                     $paymentMethodTitle
     163     */
     164    public function onWebhookAuthorized(WC_Order $order, Payment $payment, $paymentMethodTitle)
     165    {
     166        // Get order ID in the correct way depending on WooCommerce version
     167        $orderId = $order->get_id();
     168        if ($payment->isAuthorized()) {
     169            // Add messages to log
     170            $this->logger->debug(__METHOD__ . ' called for order ' . $orderId);
     171            // WooCommerce 2.2.0 has the option to store the Payment transaction id.
     172            $order->payment_complete($payment->id);
     173            // Add messages to log
     174            $this->logger->debug(__METHOD__ . ' WooCommerce payment_complete() processed and returned to ' . __METHOD__ . ' for order ' . $orderId);
     175            $order->add_order_note(sprintf(
     176                /* translators: Placeholder 1: payment method title, placeholder 2: payment ID */
     177                __('Order authorized using %1$s payment (%2$s). Set order to completed in WooCommerce when you have shipped the products, to capture the payment. Do this within 28 days, or the order will expire. To handle individual order lines, process the order via the Mollie Dashboard.', 'mollie-payments-for-woocommerce'),
     178                $paymentMethodTitle,
     179                $payment->id . ($payment->mode === 'test' ? ' - ' . __('test mode', 'mollie-payments-for-woocommerce') : '')
     180            ));
     181            //check for webhook that order is Authorized on Paid webhook
     182            $order->update_meta_data('_mollie_authorized', '1');
     183            // Mark the order as processed and paid via Mollie
     184            $this->setOrderPaidAndProcessed($order);
     185            // Remove (old) cancelled payments from this order
     186            $this->unsetCancelledMolliePaymentId($orderId);
     187            // Add messages to log
     188            $this->logger->debug(__METHOD__ . ' processing order status update via Mollie plugin fully completed for order ' . $orderId);
     189            // Subscription processing
     190            $this->deleteSubscriptionFromPending($order);
     191        } else {
     192            // Add messages to log
     193            $this->logger->debug(__METHOD__ . ' order at Mollie not authorized, so no processing for order ' . $orderId);
    192194        }
    193195    }
    … …  
    371373    /**
    372374     * @param WC_Order $order
    373      * @param MolliePaymentGatewayI $gateway
     375     * @param PaymentGateway $gateway
    374376     * @param                    $newOrderStatus
    375377     * @param                    $orderId
    … …  
    377379    protected function maybeUpdateStatus(WC_Order $order, $gateway, $newOrderStatus)
    378380    {
    379         if ($this->isOrderPaymentStartedByOtherGateway($order) || !is_a($gateway, MolliePaymentGateway::class)) {
     381        if ($this->isOrderPaymentStartedByOtherGateway($order) || !is_a($gateway, PaymentGateway::class)) {
    380382            $this->informNotUpdatingStatus($gateway->id, $order);
    381383            return;
    382384        }
    383         $gateway->paymentService()->updateOrderStatus($order, $newOrderStatus);
    384     }
    385     protected function addCustomRequestFields($order, array $paymentRequestData, MolliePaymentGateway $gateway)
    386     {
    387         if ($gateway->paymentMethod()->hasProperty('paymentAPIfields')) {
    388             $paymentAPIfields = $gateway->paymentMethod()->getProperty('paymentAPIfields');
    389             foreach ($paymentAPIfields as $field) {
    390                 if (!method_exists($this, 'create' . ucfirst($field))) {
    391                     continue;
    392                 }
    393                 $value = $this->{'create' . ucfirst($field)}($order);
    394                 if ($value) {
    395                     $paymentRequestData[$field] = $value;
    396                 }
    397             }
    398         }
    399         return $paymentRequestData;
     385        $this->updateOrderStatus($order, $newOrderStatus);
     386    }
     387    public function setPayment($data)
     388    {
     389        $this->data = $data;
    400390    }
    401391}

  • mollie-payments-for-woocommerce/trunk/src/Payment/MollieSubscription.php

    r3164004 r3262577  
    44
    55use Mollie\Api\Types\SequenceType;
    6 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
     6use Mollie\WooCommerce\Payment\Request\Middleware\MiddlewareHandler;
     7use Mollie\WooCommerce\Payment\Request\Middleware\PaymentDescriptionMiddleware;
     8use Mollie\WooCommerce\PaymentMethods\AbstractPaymentMethod;
    79use Mollie\WooCommerce\SDK\Api;
    8 use Mollie\WooCommerce\Subscription\MollieSubscriptionGateway;
     10use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;
     11use Mollie\Psr\Log\LoggerInterface as Logger;
    912class MollieSubscription extends \Mollie\WooCommerce\Payment\MollieObject
    1013{
    1114    protected $pluginId;
    1215    /**
     16     * @var mixed
     17     */
     18    private AbstractPaymentMethod $paymentMethod;
     19    protected MiddlewareHandler $middleware;
     20    /**
    1321     * Molliesubscription constructor.
    1422     *
    1523     */
    16     public function __construct($pluginId, Api $apiHelper, $settingsHelper, $dataHelper, $logger)
     24    public function __construct($pluginId, Api $apiHelper, $settingsHelper, $dataHelper, Logger $logger, AbstractPaymentMethod $paymentMethod, $middlewareHandler)
    1725    {
    1826        $this->pluginId = $pluginId;
    … …  
    2129        $this->dataHelper = $dataHelper;
    2230        $this->logger = $logger;
     31        $this->paymentMethod = $paymentMethod;
     32        $this->middleware = $middlewareHandler;
    2333    }
    2434    /**
    … …  
    3141        $paymentLocale = $this->settingsHelper->getPaymentLocale();
    3242        $gateway = wc_get_payment_gateway_by_order($order);
    33         if (!$gateway || !$gateway instanceof MolliePaymentGateway) {
     43        if (!$gateway || !mollieWooCommerceIsMollieGateway($gateway->id)) {
    3444            return ['result' => 'failure'];
    3545        }
    3646        $gatewayId = $gateway->id;
     47        $methodId = substr($gatewayId, strrpos($gatewayId, '_') + 1);
    3748        $optionName = $this->pluginId . '_api_payment_description';
    3849        $option = get_option($optionName);
    3950        $paymentDescription = $this->getRecurringPaymentDescription($order, $option, $initialPaymentUsedOrderAPI);
    40         $selectedIssuer = $gateway->getSelectedIssuer();
    41         $returnUrl = $gateway->get_return_url($order);
    42         $returnUrl = $this->getReturnUrl($order, $returnUrl);
    43         $webhookUrl = $this->getWebhookUrl($order, $gatewayId);
    44         return array_filter(['amount' => ['currency' => $this->dataHelper->getOrderCurrency($order), 'value' => $this->dataHelper->formatCurrencyValue($order->get_total(), $this->dataHelper->getOrderCurrency($order))], 'description' => $paymentDescription, 'redirectUrl' => $returnUrl, 'webhookUrl' => $webhookUrl, 'method' => $gateway->paymentMethod()->getProperty('id'), 'issuer' => $selectedIssuer, 'locale' => $paymentLocale, 'metadata' => ['order_id' => $order->get_id()], 'sequenceType' => 'recurring', 'customerId' => $customerId]);
     51        $requestData = array_filter(['amount' => ['currency' => $this->dataHelper->getOrderCurrency($order), 'value' => $this->dataHelper->formatCurrencyValue($order->get_total(), $this->dataHelper->getOrderCurrency($order))], 'description' => $paymentDescription, 'method' => $methodId, 'locale' => $paymentLocale, 'metadata' => ['order_id' => $order->get_id()], 'sequenceType' => SequenceType::SEQUENCETYPE_RECURRING, 'customerId' => $customerId]);
     52        $context = 'payment';
     53        return $this->middleware->handle($requestData, $order, $context);
    4554    }
    4655    protected function getRecurringPaymentDescription($order, $option, $initialPaymentUsedOrderAPI)
    … …  
    5665            return $description;
    5766        }
    58         return $this->getPaymentDescription($order, $option);
     67        $middleware = new PaymentDescriptionMiddleware($this->dataHelper);
     68        $requestData = [];
     69        $context = 'payment';
     70        $result = $middleware->__invoke($requestData, $order, $context, static function ($requestData) {
     71            return $requestData;
     72        });
     73        return $result['description'];
    5974    }
    6075    /**
    … …  
    6277     *
    6378     * @param bool $status
    64      * @param MollieSubscriptionGateway $subscriptionGateway
     79     * @param MollieSubscriptionGatewayHandler $deprecatedSubscriptionHelper
    6580     * @return bool
    6681     */
    67     public function isAvailableForSubscriptions(bool $status, MollieSubscriptionGateway $subscriptionGateway, $orderTotal): bool
     82    public function isAvailableForSubscriptions(bool $status, MollieSubscriptionGatewayHandler $deprecatedSubscriptionHelper, $orderTotal, $gateway): bool
    6883    {
    6984        $subscriptionPluginActive = class_exists('WC_Subscriptions') && class_exists('WC_Subscriptions_Admin');
    … …  
    7186            return $status;
    7287        }
    73         $currency = $subscriptionGateway->getCurrencyFromOrder();
    74         $billingCountry = $subscriptionGateway->getBillingCountry();
    75         $paymentLocale = $subscriptionGateway->dataService()->getPaymentLocale();
     88        $currency = $deprecatedSubscriptionHelper->getCurrencyFromOrder();
     89        $billingCountry = $deprecatedSubscriptionHelper->getBillingCountry();
     90        $paymentLocale = $deprecatedSubscriptionHelper->dataService()->getPaymentLocale();
    7691        // Check recurring totals against recurring payment methods for future renewal payments
    77         $recurringTotal = $subscriptionGateway->get_recurring_total();
     92        $recurringTotal = $deprecatedSubscriptionHelper->get_recurring_total();
    7893        // See get_available_payment_gateways() in woocommerce-subscriptions/includes/gateways/class-wc-subscriptions-payment-gateways.php
    7994        $acceptManualRenewals = 'yes' === get_option(\WC_Subscriptions_Admin::$option_prefix . '_accept_manual_renewals', 'no');
    80         $supportsSubscriptions = $subscriptionGateway->supports('subscriptions');
     95        $supportsSubscriptions = $gateway->supports('subscriptions');
    8196        if ($acceptManualRenewals === \true || !$supportsSubscriptions || empty($recurringTotal)) {
    8297            return $status;
    … …  
    85100            // First check recurring payment methods CC and SDD
    86101            $filters = $this->buildFilters($currency, $recurring_total, $billingCountry, SequenceType::SEQUENCETYPE_RECURRING, $paymentLocale);
    87             $status = $subscriptionGateway->isAvailableMethodInCheckout($filters);
     102            $status = $deprecatedSubscriptionHelper->isAvailableMethodInCheckout($filters);
    88103        }
    89104        // Check available first payment methods with today's order total, but ignore SSD gateway (not shown in checkout)
    90         if ($subscriptionGateway->paymentMethod()->getProperty('id') === 'mollie_wc_gateway_directdebit') {
     105        if ($deprecatedSubscriptionHelper->paymentMethod()->getProperty('id') === 'mollie_wc_gateway_directdebit') {
    91106            return $status;
    92107        }
    93108        $filters = $this->buildFilters($currency, $orderTotal, $billingCountry, SequenceType::SEQUENCETYPE_FIRST, $paymentLocale);
    94         return $subscriptionGateway->isAvailableMethodInCheckout($filters);
     109        return $deprecatedSubscriptionHelper->isAvailableMethodInCheckout($filters);
    95110    }
    96111    /**

  • mollie-payments-for-woocommerce/trunk/src/Payment/OrderLines.php

    r3226701 r3262577  
    106106                }
    107107                $this->currency = $this->dataHelper->getOrderCurrency($this->order);
    108                 $mollie_order_item = ['sku' => $this->get_item_reference($product), 'name' => $this->get_item_name($cart_item), 'quantity' => $this->get_item_quantity($cart_item), 'vatRate' => round($this->get_item_vatRate($cart_item, $product), 2), 'unitPrice' => ['currency' => $this->currency, 'value' => $this->dataHelper->formatCurrencyValue($this->get_item_price($cart_item), $this->currency)], 'totalAmount' => ['currency' => $this->currency, 'value' => $this->dataHelper->formatCurrencyValue($this->get_item_total_amount($cart_item), $this->currency)], 'vatAmount' => ['currency' => $this->currency, 'value' => $this->dataHelper->formatCurrencyValue($this->get_item_tax_amount($cart_item), $this->currency)], 'discountAmount' => ['currency' => $this->currency, 'value' => $this->dataHelper->formatCurrencyValue($this->get_item_discount_amount($cart_item), $this->currency)], 'metadata' => ['order_item_id' => $cart_item->get_id()]];
     108                $mollie_order_item = ['sku' => $this->get_item_reference($product), 'type' => $product->is_virtual() ? 'digital' : 'physical', 'name' => $this->get_item_name($cart_item), 'quantity' => $this->get_item_quantity($cart_item), 'vatRate' => round($this->get_item_vatRate($cart_item, $product), 2), 'unitPrice' => ['currency' => $this->currency, 'value' => $this->dataHelper->formatCurrencyValue($this->get_item_price($cart_item), $this->currency)], 'totalAmount' => ['currency' => $this->currency, 'value' => $this->dataHelper->formatCurrencyValue($this->get_item_total_amount($cart_item), $this->currency)], 'vatAmount' => ['currency' => $this->currency, 'value' => $this->dataHelper->formatCurrencyValue($this->get_item_tax_amount($cart_item), $this->currency)], 'discountAmount' => ['currency' => $this->currency, 'value' => $this->dataHelper->formatCurrencyValue($this->get_item_discount_amount($cart_item), $this->currency)], 'metadata' => ['order_item_id' => $cart_item->get_id()], 'productUrl' => $product->get_permalink()];
     109                if ($product->get_image_id()) {
     110                    $productImage = wp_get_attachment_image_src($product->get_image_id(), 'full');
     111                    if (isset($productImage[0])) {
     112                        $mollie_order_item['imageUrl'] = $productImage[0];
     113                    }
     114                }
    109115                if ($isMealVoucherEnabled && $this->get_item_category($product, $voucherDefaultCategory) != "no_category") {
    110116                    $mollie_order_item['category'] = $this->get_item_category($product, $voucherDefaultCategory);

  • mollie-payments-for-woocommerce/trunk/src/Payment/PaymentCheckoutRedirectService.php

    r3164004 r3262577  
    1919    protected $dataHelper;
    2020    /**
    21      * PaymentService constructor.
     21     * PaymentCheckoutRedirectService constructor.
    2222     */
    2323    public function __construct($dataHelper)

  • mollie-payments-for-woocommerce/trunk/src/Payment/PaymentFactory.php

    r3164004 r3262577  
    1111class PaymentFactory
    1212{
    13     /**
    14      * @var Data
    15      */
    16     protected $dataHelper;
    17     /**
    18      * @var Api
    19      */
    20     protected $apiHelper;
    21     protected $settingsHelper;
    22     /**
    23      * @var string
    24      */
    25     protected $pluginId;
    26     protected $logger;
    27     /**
    28      * @var OrderLines
    29      */
    30     protected $orderLines;
     13    private $mollieOrderFactory;
     14    private $molliePaymentFactory;
    3115    /**
    3216     * PaymentFactory constructor.
    3317     */
    34     public function __construct(Data $dataHelper, Api $apiHelper, Settings $settingsHelper, string $pluginId, $logger, \Mollie\WooCommerce\Payment\OrderLines $orderLines)
     18    public function __construct(callable $mollieOrderFactory, callable $molliePaymentFactory)
    3519    {
    36         $this->dataHelper = $dataHelper;
    37         $this->apiHelper = $apiHelper;
    38         $this->settingsHelper = $settingsHelper;
    39         $this->pluginId = $pluginId;
    40         $this->logger = $logger;
    41         $this->orderLines = $orderLines;
     20        $this->mollieOrderFactory = $mollieOrderFactory;
     21        $this->molliePaymentFactory = $molliePaymentFactory;
    4222    }
    4323    /**
    … …  
    4929    {
    5030        if (!is_object($data) && $data === 'order' || is_string($data) && strpos($data, 'ord_') !== \false || is_object($data) && $data->resource === 'order') {
    51             $refundLineItemsBuilder = new \Mollie\WooCommerce\Payment\RefundLineItemsBuilder($this->dataHelper);
    52             $apiKey = $this->settingsHelper->getApiKey();
    53             $orderItemsRefunded = new \Mollie\WooCommerce\Payment\OrderItemsRefunder($refundLineItemsBuilder, $this->dataHelper, $this->apiHelper->getApiClient($apiKey)->orders);
    54             return new \Mollie\WooCommerce\Payment\MollieOrder($orderItemsRefunded, $data, $this->pluginId, $this->apiHelper, $this->settingsHelper, $this->dataHelper, $this->logger, $this->orderLines);
     31            $mollieOrder = ($this->mollieOrderFactory)();
     32            $mollieOrder->setOrder($data);
     33            return $mollieOrder;
    5534        }
    5635        if (!is_object($data) && $data === 'payment' || !is_object($data) && strpos($data, 'tr_') !== \false || is_object($data) && $data->resource === 'payment') {
    57             return new \Mollie\WooCommerce\Payment\MolliePayment($data, $this->pluginId, $this->apiHelper, $this->settingsHelper, $this->dataHelper, $this->logger);
     36            $molliePayment = ($this->molliePaymentFactory)();
     37            $molliePayment->setPayment($data);
     38            return $molliePayment;
    5839        }
    5940        return \false;

  • mollie-payments-for-woocommerce/trunk/src/Payment/PaymentModule.php

    r3164004 r3262577  
    1010use Mollie\Api\Exceptions\ApiException;
    1111use Mollie\Api\Resources\Refund;
    12 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
    13 use Mollie\WooCommerce\Gateway\MolliePaymentGatewayI;
     12use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
     13use Mollie\WooCommerce\Gateway\Refund\OrderItemsRefunder;
     14use Mollie\WooCommerce\MerchantCapture\Capture\Action\CapturePayment;
     15use Mollie\WooCommerce\PaymentMethods\InstructionStrategies\OrderInstructionsManager;
    1416use Mollie\WooCommerce\SDK\Api;
    1517use Mollie\WooCommerce\SDK\HttpResponse;
    1618use Mollie\WooCommerce\Settings\Settings;
    17 use Mollie\WooCommerce\Shared\Data;
    1819use Mollie\WooCommerce\Shared\SharedDataDictionary;
    1920use Mollie\Psr\Container\ContainerInterface;
    2021use Mollie\Psr\Log\LoggerInterface as Logger;
    21 use Mollie\Psr\Log\LogLevel;
    2222use RuntimeException;
    2323use WC_Order;
    … …  
    4343     */
    4444    protected $gatewayClassnames;
     45    /**
     46     * @var ContainerInterface
     47     */
     48    protected $container;
    4549    public function services(): array
    4650    {
    47         return [\Mollie\WooCommerce\Payment\OrderLines::class => static function (ContainerInterface $container): \Mollie\WooCommerce\Payment\OrderLines {
    48             $data = $container->get('settings.data_helper');
    49             $pluginId = $container->get('shared.plugin_id');
    50             return new \Mollie\WooCommerce\Payment\OrderLines($data, $pluginId);
    51         }, \Mollie\WooCommerce\Payment\PaymentFactory::class => static function (ContainerInterface $container): \Mollie\WooCommerce\Payment\PaymentFactory {
    52             $settingsHelper = $container->get('settings.settings_helper');
    53             assert($settingsHelper instanceof Settings);
    54             $apiHelper = $container->get('SDK.api_helper');
    55             assert($apiHelper instanceof Api);
    56             $data = $container->get('settings.data_helper');
    57             assert($data instanceof Data);
    58             $pluginId = $container->get('shared.plugin_id');
    59             $logger = $container->get(Logger::class);
    60             assert($logger instanceof Logger);
    61             $orderLines = $container->get(\Mollie\WooCommerce\Payment\OrderLines::class);
    62             return new \Mollie\WooCommerce\Payment\PaymentFactory($data, $apiHelper, $settingsHelper, $pluginId, $logger, $orderLines);
    63         }, \Mollie\WooCommerce\Payment\MollieObject::class => static function (ContainerInterface $container): \Mollie\WooCommerce\Payment\MollieObject {
    64             $logger = $container->get(Logger::class);
    65             assert($logger instanceof Logger);
    66             $data = $container->get('settings.data_helper');
    67             assert($data instanceof Data);
    68             $apiHelper = $container->get('SDK.api_helper');
    69             assert($apiHelper instanceof Api);
    70             $pluginId = $container->get('shared.plugin_id');
    71             $paymentFactory = $container->get(\Mollie\WooCommerce\Payment\PaymentFactory::class);
    72             assert($paymentFactory instanceof \Mollie\WooCommerce\Payment\PaymentFactory);
    73             $settingsHelper = $container->get('settings.settings_helper');
    74             assert($settingsHelper instanceof Settings);
    75             return new \Mollie\WooCommerce\Payment\MollieObject($data, $logger, $paymentFactory, $apiHelper, $settingsHelper, $pluginId);
    76         }];
     51        static $services;
     52        if ($services === null) {
     53            $services = require_once __DIR__ . '/inc/services.php';
     54        }
     55        return $services();
    7756    }
    7857    public function run(ContainerInterface $container): bool
    … …  
    8867        $this->pluginId = $container->get('shared.plugin_id');
    8968        $this->gatewayClassnames = $container->get('gateway.classnames');
     69        $this->container = $container;
    9070        // Listen to return URL call
    91         add_action('woocommerce_api_mollie_return', [$this, 'onMollieReturn']);
    92         add_action('template_redirect', [$this, 'mollieReturnRedirect']);
     71        add_action('woocommerce_api_mollie_return', function () use ($container) {
     72            $this->onMollieReturn($container);
     73        }, 10, 1);
     74        add_action('template_redirect', function () use ($container) {
     75            $this->mollieReturnRedirect($container);
     76        });
    9377        // Show Mollie instructions on order details page
    94         add_action('woocommerce_order_details_after_order_table', [$this, 'onOrderDetails'], 10, 1);
     78        add_action('woocommerce_order_details_after_order_table', function (WC_Order $order) use ($container) {
     79            $this->onOrderDetails($order, $container);
     80        }, 10, 1);
    9581        // Cancel order at Mollie (for Orders API/Klarna)
    9682        add_action('woocommerce_order_status_cancelled', [$this, 'cancelOrderAtMollie']);
    … …  
    10288            $this->handleExpiryDateCancelation($paymentMethods);
    10389        }, 10, 2);
    104         add_action(\Mollie\WooCommerce\Payment\OrderItemsRefunder::ACTION_AFTER_REFUND_ORDER_ITEMS, [$this, 'addOrderNoteForRefundCreated'], 10, 3);
    105         add_action(\Mollie\WooCommerce\Payment\OrderItemsRefunder::ACTION_AFTER_CANCELED_ORDER_ITEMS, [$this, 'addOrderNoteForCancelledLineItems'], 10, 2);
     90        add_action(OrderItemsRefunder::ACTION_AFTER_REFUND_ORDER_ITEMS, [$this, 'addOrderNoteForRefundCreated'], 10, 3);
     91        add_action(OrderItemsRefunder::ACTION_AFTER_CANCELED_ORDER_ITEMS, [$this, 'addOrderNoteForCancelledLineItems'], 10, 2);
    10692        return \true;
    10793    }
    … …  
    184170     *
    185171     */
    186     public function onMollieReturn()
     172    public function onMollieReturn($container)
    187173    {
    188174        try {
    … …  
    195181        $gateway = wc_get_payment_gateway_by_order($order);
    196182        $orderId = $order->get_id();
     183        $oldGatewayInstances = $container->get('__deprecated.gateway_helpers');
     184        $mollieGatewayHelper = $oldGatewayInstances[$gateway->id];
    197185        if (!$gateway) {
    198186            $gatewayName = $order->get_payment_method();
    … …  
    201189            return;
    202190        }
    203         if (!$gateway instanceof MolliePaymentGateway) {
     191        if (!mollieWooCommerceIsMollieGateway($gateway->id)) {
    204192            $this->httpResponse->setHttpResponseCode(400);
    205             $this->logger->debug(__METHOD__ . ": Invalid gateway {get_class({$gateway})} for this plugin. Order {$orderId}.");
    206             return;
    207         }
    208         $redirect_url = $gateway->getReturnRedirectUrlForOrder($order);
     193            $gatewayClass = get_class($gateway);
     194            $this->logger->debug(__METHOD__ . ": Invalid gateway {$gatewayClass} for this plugin. Order {$orderId}.");
     195            return;
     196        }
     197        $redirect_url = $mollieGatewayHelper->getReturnRedirectUrlForOrder($order);
    209198        // Add utm_nooverride query string
    210199        $redirect_url = add_query_arg(['utm_nooverride' => 1], $redirect_url);
    … …  
    217206     *
    218207     */
    219     public function mollieReturnRedirect()
     208    public function mollieReturnRedirect($container)
    220209    {
    221210        if (isset($_GET['filter_flag'])) {
    222211            $filterFlag = sanitize_text_field(wp_unslash($_GET['filter_flag']));
    223212            if ($filterFlag === 'onMollieReturn') {
    224                 self::onMollieReturn();
     213                self::onMollieReturn($container);
    225214            }
    226215        }
    … …  
    229218     * @param WC_Order $order
    230219     */
    231     public function onOrderDetails(WC_Order $order)
     220    public function onOrderDetails(WC_Order $order, ContainerInterface $container)
    232221    {
    233222        if (is_order_received_page()) {
    … …  
    236225             * Instructions already displayed on top of order received page by $gateway->thankyou_page()
    237226             *
    238              * @see MolliePaymentGateway::thankyou_page
     227             * @see MolliePaymentGatewayHandler::thankyou_page
    239228             */
    240229            return;
    241230        }
    242231        $gateway = wc_get_payment_gateway_by_order($order);
    243         if (!$gateway || !$gateway instanceof MolliePaymentGateway) {
    244             return;
    245         }
    246         /** @var MolliePaymentGatewayI $gateway */
    247         $gateway->displayInstructions($order);
     232        if (!$gateway || !mollieWooCommerceIsMollieGateway($gateway->id)) {
     233            return;
     234        }
     235        assert($gateway instanceof \WC_Payment_Gateway);
     236        $instructionsManager = $container->get(OrderInstructionsManager::class);
     237        $oldGatewayInstances = $container->get('__deprecated.gateway_helpers');
     238        $mollieGatewayHelper = $oldGatewayInstances[$gateway->id];
     239        $instructionsManager->displayInstructions($gateway, $mollieGatewayHelper, $order);
    248240    }
    249241    /**
    … …  
    264256        }
    265257        $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - Try to process completed order for a potential capture at Mollie.');
    266         // Does WooCommerce order contain a Mollie Order?
    267         $mollie_order_id = ($mollie_order_id = $order->get_meta('_mollie_order_id', \true)) ? $mollie_order_id : \false;
    268         // Is it a payment? you cannot ship a payment
    269         if ($mollie_order_id === \false || substr($mollie_order_id, 0, 3) === 'tr_') {
    270             $message = _x('Processing a payment, no capture needed', 'Order note info', 'mollie-payments-for-woocommerce');
     258        $mollie_transaction_id = ($mollie_transaction_id = $order->get_meta('_mollie_order_id', \true)) ? $mollie_transaction_id : \false;
     259        if (!$mollie_transaction_id) {
     260            $mollie_transaction_id = ($mollie_transaction_id = $order->get_meta('_mollie_payment_id', \true)) ? $mollie_transaction_id : \false;
     261        }
     262        if (empty($mollie_transaction_id)) {
     263            $message = _x('Order contains Mollie payment method, but not a valid Mollie Transaction ID. Processing shipment & capture failed.', 'Order note info', 'mollie-payments-for-woocommerce');
    271264            $order->add_order_note($message);
    272             $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - Processing a payment, no capture needed.');
    273             return;
     265            $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' Order contains Mollie payment method, but not a valid Mollie Transaction ID. Processing shipment & capture failed.');
    274266        }
    275267        $apiKey = $this->settingsHelper->getApiKey();
    276268        try {
    277             // Get the order from the Mollie API
    278             $mollie_order = $this->apiHelper->getApiClient($apiKey)->orders->get($mollie_order_id);
     269            // Get the order or payment from the Mollie API
     270            if (substr($mollie_transaction_id, 0, 3) === 'tr_') {
     271                $mollie_transaction = $this->apiHelper->getApiClient($apiKey)->payments->get($mollie_transaction_id);
     272                $mollie_transaction_type = 'Payment';
     273            } else {
     274                $mollie_transaction = $this->apiHelper->getApiClient($apiKey)->orders->get($mollie_transaction_id);
     275                $mollie_transaction_type = 'Order';
     276            }
    279277            // Check that order is Paid or Authorized and can be captured
    280             if ($mollie_order->isCanceled()) {
    281                 $message = _x('Order already canceled at Mollie, can not be shipped/captured.', 'Order note info', 'mollie-payments-for-woocommerce');
     278            if ($mollie_transaction->isCanceled()) {
     279                $message = _x('Transaction already canceled at Mollie, can not be shipped/captured.', 'Order note info', 'mollie-payments-for-woocommerce');
    282280                $order->add_order_note($message);
    283                 $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - Order already canceled at Mollie, can not be shipped/captured.');
     281                $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - ' . $mollie_transaction_type . ' already canceled at Mollie, can not be shipped/captured.');
    284282                return;
    285283            }
    286             if ($mollie_order->isCompleted()) {
    287                 $message = _x('Order already completed at Mollie, can not be shipped/captured.', 'Order note info', 'mollie-payments-for-woocommerce');
     284            if (method_exists($mollie_transaction, 'isCompleted') && $mollie_transaction->isCompleted()) {
     285                $message = _x('Transaction already completed at Mollie, can not be shipped/captured.', 'Order note info', 'mollie-payments-for-woocommerce');
    288286                $order->add_order_note($message);
    289                 $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - Order already completed at Mollie, can not be shipped/captured.');
     287                $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - ' . $mollie_transaction_type . ' already completed at Mollie, can not be shipped/captured.');
    290288                return;
    291289            }
    292             if ($mollie_order->isPaid() || $mollie_order->isAuthorized()) {
    293                 $this->apiHelper->getApiClient($apiKey)->orders->get($mollie_order_id)->shipAll();
     290            if ($mollie_transaction->isPaid() || $mollie_transaction->isAuthorized()) {
     291                if (substr($mollie_transaction_id, 0, 3) === 'tr_') {
     292                    if ($mollie_transaction->isAuthorized()) {
     293                        $this->container->get(CapturePayment::class)($order_id);
     294                    } else {
     295                        $message = _x('Payment status is already paid at Mollie, can not be captured.', 'Order note info', 'mollie-payments-for-woocommerce');
     296                        $order->add_order_note($message);
     297                        $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - Payment already completed at Mollie, can not be captured.');
     298                    }
     299                    return;
     300                }
     301                $this->apiHelper->getApiClient($apiKey)->orders->get($mollie_transaction_id)->shipAll();
    294302                $message = _x('Order successfully updated to shipped at Mollie, capture of funds underway.', 'Order note info', 'mollie-payments-for-woocommerce');
    295303                $order->add_order_note($message);
    … …  
    297305                return;
    298306            }
    299             $message = _x('Order not paid or authorized at Mollie yet, can not be shipped.', 'Order note info', 'mollie-payments-for-woocommerce');
     307            $message = _x('Transaction not paid or authorized at Mollie yet, can not be shipped.', 'Order note info', 'mollie-payments-for-woocommerce');
    300308            $order->add_order_note($message);
    301             $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - Order not paid or authorized at Mollie yet, can not be shipped.');
     309            $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - ' . $mollie_transaction_type . ' not paid or authorized at Mollie yet, can not be shipped.');
    302310        } catch (ApiException $e) {
    303311            $this->logger->debug(__METHOD__ . ' - ' . $order_id . ' - Processing shipment & capture failed, error: ' . $e->getMessage());

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/AbstractPaymentMethod.php

    r3226701 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods;
    55
    6 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
     6use Mollie\Inpsyde\PaymentGateway\Icon;
     7use Mollie\Inpsyde\PaymentGateway\IconProviderInterface;
     8use Mollie\Inpsyde\PaymentGateway\Method\CustomSettingsFields;
     9use Mollie\Inpsyde\PaymentGateway\Method\CustomSettingsFieldsDefinition;
     10use Mollie\Inpsyde\PaymentGateway\Method\DefaultPaymentMethodDefinitionTrait;
     11use Mollie\Inpsyde\PaymentGateway\Method\PaymentMethodDefinition;
     12use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
     13use Mollie\Inpsyde\PaymentGateway\PaymentProcessorInterface;
     14use Mollie\Inpsyde\PaymentGateway\PaymentRequestValidatorInterface;
     15use Mollie\Inpsyde\PaymentGateway\RefundProcessorInterface;
     16use Mollie\Inpsyde\PaymentGateway\StaticIconProvider;
    717use Mollie\WooCommerce\Gateway\Surcharge;
    8 use Mollie\WooCommerce\Payment\PaymentFieldsService;
    9 use Mollie\WooCommerce\Settings\Settings;
     18use Mollie\WooCommerce\Payment\PaymentProcessor;
     19use Mollie\WooCommerce\Settings\General\MultiCountrySettingsField;
    1020use Mollie\WooCommerce\Shared\SharedDataDictionary;
    11 abstract class AbstractPaymentMethod implements \Mollie\WooCommerce\PaymentMethods\PaymentMethodI
     21use Mollie\Psr\Container\ContainerInterface;
     22use Mollie\WooCommerce\PaymentMethods\Icon\GatewayIconsRenderer;
     23use Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\NoopPaymentFieldsRenderer;
     24use Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\DefaultFieldsStrategy;
     25abstract class AbstractPaymentMethod implements \Mollie\WooCommerce\PaymentMethods\PaymentMethodI, PaymentMethodDefinition
    1226{
    13     /**
    14      * @var string
    15      */
    16     protected $id;
     27    use DefaultPaymentMethodDefinitionTrait;
    1728    /**
    1829     * @var string[]
    … …  
    2334     */
    2435    protected $settings = [];
    25     /**
    26      * @var IconFactory
    27      */
    28     protected $iconFactory;
    29     /**
    30      * @var Settings
    31      */
    32     protected $settingsHelper;
    33     /**
    34      * @var PaymentFieldsService
    35      */
    36     protected $paymentFieldsService;
    37     /**
    38      * @var Surcharge
    39      */
    4036    protected $surcharge;
    4137    /**
    42      * @var array
    43      */
    44     private $apiPaymentMethod;
    45     /**
    4638     * @var bool
    4739     */
    4840    protected bool $translationsInitialized = \false;
    49     public function __construct(\Mollie\WooCommerce\PaymentMethods\IconFactory $iconFactory, Settings $settingsHelper, PaymentFieldsService $paymentFieldsService, Surcharge $surcharge, array $apiPaymentMethod)
    50     {
    51         $this->id = $this->getIdFromConfig();
    52         $this->iconFactory = $iconFactory;
    53         $this->settingsHelper = $settingsHelper;
    54         $this->paymentFieldsService = $paymentFieldsService;
    55         $this->surcharge = $surcharge;
     41    public function __construct()
     42    {
    5643        $this->config = $this->getConfig();
    5744        $this->settings = $this->getSettings();
    58         $this->apiPaymentMethod = $apiPaymentMethod;
    59         add_action('init', [$this, 'initializeTranslations']);
    60         add_action('init', [$this, 'updateSettingsWithDefaults']);
    61     }
    62     public function title(): string
    63     {
    64         $useApiTitle = apply_filters('mollie_wc_gateway_use_api_title', $this->isUseApiTitleChecked(), $this->id);
     45        $this->surcharge = new Surcharge();
     46    }
     47    public function title(ContainerInterface $container): string
     48    {
     49        $useApiTitle = apply_filters('mollie_wc_gateway_use_api_title', $this->isUseApiTitleChecked(), $this->getIdFromConfig());
    6550        $title = $this->getProperty('title');
    6651        //new installations should use the api title
    6752        if ($useApiTitle || $title === \false) {
    68             return $this->getApiTitle();
     53            return $this->getApiTitle($container);
    6954        }
    7055        return $title;
    … …  
    7661    public function getIdFromConfig(): string
    7762    {
    78         return $this->getConfig()['id'];
     63        $config = $this->getConfig();
     64        return $config['id'];
    7965    }
    8066    public function getUploadedImage()
    … …  
    11399    }
    114100    /**
    115      * Payment method custom icon url
    116      * @return string
    117      */
    118     public function getIconUrl(): string
    119     {
    120         if ($uploadedImageUrl = $this->getUploadedImage()) {
    121             return $this->iconFactory->getExternalIconHtml($uploadedImageUrl);
    122         }
    123         $useAPIImage = apply_filters('mollie_wc_gateway_use_api_icon', $this->isUseApiTitleChecked(), $this->id);
    124         if (isset($this->apiPaymentMethod["image"]) && property_exists($this->apiPaymentMethod["image"], "svg") && !$this->isCreditCardSelectorEnabled() && $useAPIImage) {
    125             return $this->iconFactory->getExternalIconHtml($this->apiPaymentMethod["image"]->svg);
    126         }
    127         return $this->iconFactory->getIconUrl($this->getIdFromConfig());
    128     }
    129     /**
    130101     * Check if payment method should show any icon
    131102     * @return bool
    … …  
    135106        $defaultIconSetting = \true;
    136107        return $this->hasProperty('display_logo') ? $this->getProperty('display_logo') === 'yes' : $defaultIconSetting;
    137     }
    138     /**
    139      * Settings that apply to all payment methods
    140      * @return array
    141      */
    142     public function getSharedFormFields()
    143     {
    144         $defaultTitle = $this->getApiTitle();
    145         return $this->settingsHelper->generalFormFields($defaultTitle, $this->config['defaultDescription'], $this->config['confirmationDelayed']);
    146     }
    147     /**
    148      * Settings specific to every payment method
    149      * @return mixed
    150      */
    151     public function getAllFormFields()
    152     {
    153         return $this->getFormFields($this->getSharedFormFields());
    154     }
    155     /**
    156      * Sets the gateway's payment fields strategy based on payment method
    157      * @param $gateway
    158      * @return void
    159      */
    160     public function paymentFieldsStrategy($gateway)
    161     {
    162         $this->paymentFieldsService->setStrategy($this);
    163         $this->paymentFieldsService->executeStrategy($gateway);
    164     }
    165     /**
    166      * @return PaymentFieldsService
    167      */
    168     public function paymentFieldsService(): PaymentFieldsService
    169     {
    170         return $this->paymentFieldsService;
    171108    }
    172109    /**
    … …  
    194131    public function getSettings(): array
    195132    {
    196         $optionName = 'mollie_wc_gateway_' . $this->id . '_settings';
     133        $optionName = 'mollie_wc_gateway_' . $this->getIdFromConfig() . '_settings';
    197134        $settings = get_option($optionName, \false);
    198135        if (!$settings) {
    … …  
    205142     * @return array
    206143     */
    207     public function updateSettingsWithDefaults(): array
    208     {
    209         $optionName = 'mollie_wc_gateway_' . $this->id . '_settings';
     144    public function updateSettingsWithDefaults(ContainerInterface $container): array
     145    {
     146        $optionName = 'mollie_wc_gateway_' . $this->getIdFromConfig() . '_settings';
    210147        $settings = get_option($optionName, \false);
    211148        if (!$settings) {
    212             $settings = $this->defaultSettings();
     149            $settings = $this->defaultSettings($container);
    213150            update_option($optionName, $settings, \true);
    214151        }
    215152        return $settings;
    216     }
    217     /**
    218      * Order status for cancelled payments setting
    219      *
    220      * @return string|null
    221      */
    222     public function getOrderStatusCancelledPayments()
    223     {
    224         return $this->settingsHelper->getOrderStatusCancelledPayments();
    225153    }
    226154    /**
    … …  
    268196     * @return array
    269197     */
    270     public function defaultSettings(): array
    271     {
    272         $fields = $this->getAllFormFields();
     198    public function defaultSettings(ContainerInterface $container): array
     199    {
     200        $defaultTitle = $this->getApiTitle($container);
     201        $settingsHelper = $container->get('settings.settings_helper');
     202        $generalFormFields = $settingsHelper->generalFormFields($defaultTitle, $this->config['defaultDescription'], $this->config['confirmationDelayed']);
     203        $fields = $this->getFormFields($generalFormFields);
    273204        //remove setting title fields
    274205        $fields = array_filter($fields, static function ($field) {
    … …  
    280211        return array_combine(array_keys($fields), array_column($fields, 'default')) ?: [];
    281212    }
    282     /**
    283      * Update the payment method's settings
    284      * @param string $optionName
    285      * @param string $newValue
    286      * @return void
    287      */
    288     public function updateMethodOption(string $optionName, string $newValue)
    289     {
    290         $settingName = 'mollie_wc_gateway_' . $this->id . '_settings';
    291         $settings = get_option($settingName, \false);
    292         $settings[$optionName] = $newValue;
    293         update_option($settingName, $settings, \true);
    294     }
    295     private function getApiTitle()
    296     {
    297         $apiTitle = $this->apiPaymentMethod['description'] ?? null;
     213    private function getApiTitle(ContainerInterface $container): string
     214    {
     215        $apiMethod = $container->get('gateway.getPaymentMethodsAfterFeatureFlag')[$this->getIdFromConfig()];
     216        $apiTitle = $apiMethod['description'] ?? null;
    298217        return $apiTitle ?: $this->config['defaultTitle'];
    299218    }
    … …  
    310229        return $savedTitle === $this->config['defaultTitle'];
    311230    }
     231    public function id(): string
     232    {
     233        return 'mollie_wc_gateway_' . $this->getIdFromConfig();
     234    }
     235    public function paymentProcessor(ContainerInterface $container): PaymentProcessorInterface
     236    {
     237        return $container->get(PaymentProcessor::class);
     238    }
     239    public function paymentRequestValidator(ContainerInterface $container): PaymentRequestValidatorInterface
     240    {
     241        return $container->get('payment_gateways.noop_payment_request_validator');
     242    }
     243    public function methodTitle(ContainerInterface $container): string
     244    {
     245        return 'Mollie - ' . $this->title($container);
     246    }
     247    public function description(ContainerInterface $container): string
     248    {
     249        $description = $this->getProcessedDescription();
     250        return empty($description) ? '' : $description;
     251    }
     252    public function methodDescription(ContainerInterface $container): string
     253    {
     254        return $this->getProperty('settingsDescription');
     255    }
     256    /**
     257     * @inheritDoc
     258     */
     259    public function availabilityCallback(ContainerInterface $container): callable
     260    {
     261        $gatewayInstances = $container->get('__deprecated.gateway_helpers');
     262        $gatewayId = $this->id();
     263        return static function ($gateway) use ($gatewayInstances, $gatewayId) {
     264            return $gatewayInstances[$gatewayId]->is_available($gateway);
     265        };
     266    }
     267    public function supports(ContainerInterface $container): array
     268    {
     269        $supports = $this->getProperty('supports');
     270        $isSepa = $this->getProperty('SEPA') === \true;
     271        $isSubscription = $this->getProperty('Subscription') === \true;
     272        $subscriptionHooks = $container->get('gateway.subscriptionsSupports');
     273        if ($isSepa || $isSubscription) {
     274            $supports = array_merge($supports, $subscriptionHooks);
     275        }
     276        return $supports;
     277    }
     278    public function refundProcessor(ContainerInterface $container): RefundProcessorInterface
     279    {
     280        $supports = $this->getProperty('supports');
     281        $supportsRefunds = $supports && in_array('refunds', $supports, \true);
     282        if ($supportsRefunds) {
     283            return $container->get('payment_gateway.getRefundProcessor')($this->getIdFromConfig());
     284        }
     285        return $container->get('payment_gateways.noop_refund_processor');
     286    }
     287    public function paymentMethodIconProvider(ContainerInterface $container): IconProviderInterface
     288    {
     289        $iconFactory = $container->get(\Mollie\WooCommerce\PaymentMethods\IconFactory::class);
     290        $url = $iconFactory->getIconUrl($this->getIdFromConfig());
     291        if ($uploadedImageUrl = $this->getUploadedImage()) {
     292            $url = $iconFactory->getExternalIconHtml($uploadedImageUrl);
     293        }
     294        $useAPIImage = apply_filters('mollie_wc_gateway_use_api_icon', $this->isUseApiTitleChecked(), $this->getIdFromConfig());
     295        if (isset($this->apiPaymentMethod["image"]) && property_exists($this->apiPaymentMethod["image"], "svg") && !$this->isCreditCardSelectorEnabled() && $useAPIImage) {
     296            $url = $iconFactory->getExternalIconHtml($this->apiPaymentMethod["image"]->svg);
     297        }
     298        $alt = $this->getIdFromConfig() . ' icon';
     299        $icon = new Icon($this->getIdFromConfig(), $url, $alt);
     300        return new StaticIconProvider($icon);
     301    }
     302    public function gatewayIconsRenderer(ContainerInterface $container): \Mollie\Inpsyde\PaymentGateway\GatewayIconsRendererInterface
     303    {
     304        return new GatewayIconsRenderer($this, $this->paymentMethodIconProvider($container));
     305    }
     306    public function paymentFieldsRenderer(ContainerInterface $container): PaymentFieldsRendererInterface
     307    {
     308        $oldGatewayInstances = $container->get('__deprecated.gateway_helpers');
     309        //not all payment methods have a gateway
     310        if (!isset($oldGatewayInstances[$this->id()])) {
     311            return new NoopPaymentFieldsRenderer();
     312        }
     313        $gatewayDescription = $container->get('payment_gateway.' . $this->id() . '.description');
     314        $dataHelper = $container->get('settings.data_helper');
     315        $deprecatedGatewayHelper = $oldGatewayInstances[$this->id()];
     316        if (!$this->getProperty('paymentFields')) {
     317            return new DefaultFieldsStrategy($deprecatedGatewayHelper, $gatewayDescription, $dataHelper);
     318        } else {
     319            $className = 'Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\\' . ucfirst($this->getIdFromConfig()) . 'FieldsStrategy';
     320            return class_exists($className) ? new $className($deprecatedGatewayHelper, $gatewayDescription, $dataHelper) : new DefaultFieldsStrategy($deprecatedGatewayHelper, $gatewayDescription, $dataHelper);
     321        }
     322    }
     323    public function hasFields(ContainerInterface $container): bool
     324    {
     325        $hasFields = $this->hasPaymentFields();
     326        if ($hasFields) {
     327            return \true;
     328        }
     329        /* Override show issuers dropdown? */
     330        $dropdownEnabled = $this->getProperty('issuers_dropdown_shown') === 'yes';
     331        if ($dropdownEnabled) {
     332            return \true;
     333        }
     334        return \false;
     335    }
     336    public function formFields(ContainerInterface $container): array
     337    {
     338        $defaultTitle = $this->getApiTitle($container);
     339        $settingsHelper = $container->get('settings.settings_helper');
     340        $generalFormFields = $settingsHelper->generalFormFields($defaultTitle, $this->config['defaultDescription'], $this->config['confirmationDelayed']);
     341        return $this->getFormFields($generalFormFields);
     342    }
     343    public function optionKey(ContainerInterface $container): string
     344    {
     345        return $this->id() . '_settings';
     346    }
     347    public function registerBlocks(ContainerInterface $container): bool
     348    {
     349        //we handle it outside for the moment
     350        return \false;
     351    }
     352    public function orderButtonText(ContainerInterface $container): string
     353    {
     354        return '';
     355    }
     356    public function customSettings(): CustomSettingsFieldsDefinition
     357    {
     358        return new CustomSettingsFields(['multi_select_countries' => function () {
     359            return new MultiCountrySettingsField($this);
     360        }], []);
     361    }
     362    public function icon(ContainerInterface $container): string
     363    {
     364        return '';
     365    }
    312366}

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/Alma.php

    r3226701 r3262577  
    88    protected function getConfig(): array
    99    {
    10         return ['id' => 'alma', 'defaultTitle' => 'Alma', 'settingsDescription' => '', 'defaultDescription' => '', 'paymentFields' => \false, 'instructions' => \false, 'supports' => ['products', 'refunds'], 'filtersOnBuild' => \false, 'confirmationDelayed' => \false, 'SEPA' => \false, 'paymentAPIfields' => ['billingAddress', 'shippingAddress'], 'docs' => 'https://www.mollie.com/gb/payments/alma'];
     10        return ['id' => 'alma', 'defaultTitle' => 'Alma', 'settingsDescription' => '', 'defaultDescription' => '', 'paymentFields' => \false, 'instructions' => \false, 'supports' => ['products', 'refunds'], 'filtersOnBuild' => \false, 'confirmationDelayed' => \false, 'SEPA' => \false, 'paymentAPIfields' => ['AddressMiddleware'], 'docs' => 'https://www.mollie.com/gb/payments/alma'];
    1111    }
    1212    // Replace translatable strings after the 'after_setup_theme' hook

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/Applepay.php

    r3226701 r3262577  
    2424        $checkout_page_id = wc_get_page_id('checkout');
    2525        $edit_checkout_page_link = get_edit_post_link($checkout_page_id);
    26         $notice = ['notice' => ['title' => sprintf(
    27             /* translators: Placeholder 1: link url */
    28             __('<p>The appearance of the Apple Pay button can be controlled in the <a href="%1$s">Checkout page editor</a>.</p>', 'mollie-payments-for-woocommerce'),
    29             esc_url($edit_checkout_page_link)
    30         ), 'type' => 'title', 'class' => 'notice notice-warning', 'css' => 'padding:20px;']];
     26        if ($edit_checkout_page_link) {
     27            $notice = ['notice' => ['title' => sprintf(
     28                /* translators: Placeholder 1: link url */
     29                __('<p>The appearance of the Apple Pay button can be controlled in the <a href="%1$s">Checkout page editor</a>.</p>', 'mollie-payments-for-woocommerce'),
     30                esc_url($edit_checkout_page_link)
     31            ), 'type' => 'title', 'class' => 'notice notice-warning', 'css' => 'padding:20px;']];
     32        } else {
     33            $notice = [];
     34        }
    3135        $paymentMethodFormFieds = ['mollie_apple_pay_button_enabled_cart' => ['title' => __('Enable Apple Pay Button on Cart page', 'mollie-payments-for-woocommerce'), 'desc' => __('Enable the Apple Pay direct buy button on the Cart page', 'mollie-payments-for-woocommerce'), 'type' => 'checkbox', 'default' => 'no'], 'mollie_apple_pay_button_enabled_product' => ['title' => __('Enable Apple Pay Button on Product page', 'mollie-payments-for-woocommerce'), 'desc' => __('Enable the Apple Pay direct buy button on the Product page', 'mollie-payments-for-woocommerce'), 'type' => 'checkbox', 'default' => 'no'], 'mollie_apple_pay_button_enabled_express_checkout' => ['title' => __('Enable Apple Pay Express Button on Checkout page', 'mollie-payments-for-woocommerce'), 'desc' => __('Enable the Apple Pay direct buy button on the Express Buttons section of the Checkout page', 'mollie-payments-for-woocommerce'), 'type' => 'checkbox', 'default' => 'no']];
    3236        return array_merge($notice, $generalFormFields, $paymentMethodFormFieds);

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/Billie.php

    r3226701 r3262577  
    1818    protected function getConfig(): array
    1919    {
    20         return ['id' => 'billie', 'defaultTitle' => 'Billie', 'settingsDescription' => 'To accept payments via Billie, all default WooCommerce checkout fields should be enabled and required.', 'defaultDescription' => '', 'paymentFields' => \true, 'instructions' => \false, 'supports' => ['products', 'refunds'], 'filtersOnBuild' => \true, 'confirmationDelayed' => \false, 'SEPA' => \false, 'orderMandatory' => \true, 'errorMessage' => 'Company field is empty. The company field is required.', 'companyPlaceholder' => 'Please enter your company name here.', 'docs' => 'https://www.mollie.com/gb/payments/billie'];
     20        return ['id' => 'billie', 'defaultTitle' => 'Billie', 'settingsDescription' => 'To accept payments via Billie, all default WooCommerce checkout fields should be enabled and required.', 'defaultDescription' => '', 'paymentFields' => \true, 'instructions' => \false, 'supports' => ['products', 'refunds'], 'filtersOnBuild' => \true, 'confirmationDelayed' => \false, 'SEPA' => \false, 'orderMandatory' => !apply_filters('inpsyde.feature-flags.mollie-woocommerce.billie_payments_api', \true), 'paymentCaptureMode' => 'manual', 'errorMessage' => 'Company field is empty. The company field is required.', 'companyPlaceholder' => 'Please enter your company name here.', 'docs' => 'https://www.mollie.com/gb/payments/billie'];
    2121    }
    2222    // Replace translatable strings after the 'after_setup_theme' hook

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/Klarna.php

    r3226701 r3262577  
    88    protected function getConfig(): array
    99    {
    10         return ['id' => 'klarna', 'defaultTitle' => 'Pay with Klarna', 'settingsDescription' => 'To accept payments via Klarna, all default WooCommerce checkout fields should be enabled and required.', 'defaultDescription' => '', 'paymentFields' => \false, 'instructions' => \false, 'supports' => ['products', 'refunds'], 'filtersOnBuild' => \false, 'confirmationDelayed' => \false, 'SEPA' => \false, 'orderMandatory' => \true, 'docs' => 'https://www.mollie.com/gb/payments/klarna'];
     10        return ['id' => 'klarna', 'defaultTitle' => 'Pay with Klarna', 'settingsDescription' => 'To accept payments via Klarna, all default WooCommerce checkout fields should be enabled and required.', 'defaultDescription' => '', 'paymentFields' => \false, 'instructions' => \false, 'supports' => ['products', 'refunds'], 'confirmationDelayed' => \false, 'SEPA' => \false, 'orderMandatory' => !apply_filters('inpsyde.feature-flags.mollie-woocommerce.klarna_payments_api', \true), 'paymentCaptureMode' => 'manual', 'docs' => 'https://www.mollie.com/gb/payments/klarna'];
    1111    }
    1212    public function initializeTranslations(): void

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
    55
    6 class BancomatpayFieldsStrategy implements \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategyI
     6use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
     7class BancomatpayFieldsStrategy extends \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
    78{
    89    const FIELD_PHONE = "billing_phone_bancomatpay";
    9     public function execute($gateway, $dataHelper)
     10    public function renderFields(): string
    1011    {
    1112        $showPhoneField = \false;
    … …  
    2122        }
    2223        if ($showPhoneField) {
    23             $this->phoneNumber($phoneValue);
     24            return $this->gatewayDescription . $this->phoneNumber($phoneValue);
    2425        }
     26        return $this->gatewayDescription;
    2527    }
    2628    protected function getOrderIdOnPayForOrderPage()
    … …  
    3335    {
    3436        $phoneValue = $phoneValue ?: '';
    35         ?>
    36         <p class="form-row form-row-wide" id="billing_phone_field">
    37             <label for="<?php
    38         echo esc_attr(self::FIELD_PHONE);
    39         ?>" class=""><?php
    40         echo esc_html__('Phone', 'mollie-payments-for-woocommerce');
    41         ?>
    42                 <abbr class="required" title="required">*</abbr>
    43             </label>
    44             <span class="woocommerce-input-wrapper">
    45         <input type="tel" class="input-text " name="<?php
    46         echo esc_attr(self::FIELD_PHONE);
    47         ?>" id="<?php
    48         echo esc_attr(self::FIELD_PHONE);
    49         ?>"
    50                placeholder="+39xxxxxxxxx"
    51                value="<?php
    52         echo esc_attr($phoneValue);
    53         ?>" autocomplete="phone">
    54         </span>
    55         </p>
    56         <?php
     37        return '
     38            <p class="form-row form-row-wide" id="billing_phone_field">
     39                <label for="' . esc_attr(self::FIELD_PHONE) . '" class="">' . esc_html__('Phone', 'mollie-payments-for-woocommerce') . '
     40                    <abbr class="required" title="required">*</abbr>
     41                </label>
     42                <span class="woocommerce-input-wrapper">
     43                    <input type="tel" class="input-text" name="' . esc_attr(self::FIELD_PHONE) . '" id="' . esc_attr(self::FIELD_PHONE) . '"
     44                           placeholder="+39xxxxxxxxx"
     45                           value="' . esc_attr($phoneValue) . '" autocomplete="phone">
     46                </span>
     47            </p>';
    5748    }
    5849    public function getFieldMarkup($gateway, $dataHelper)

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php

    r3226701 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
    55
    6 class BillieFieldsStrategy implements \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategyI
     6use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
     7class BillieFieldsStrategy extends \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
    78{
    89    public const FIELD_COMPANY = 'billing_company_billie';
    9     public function execute($gateway, $dataHelper)
     10    public function renderFields(): string
    1011    {
    1112        $showCompanyField = \false;
    … …  
    2021        }
    2122        if ($showCompanyField) {
    22             $this->company();
     23            return $this->gatewayDescription . $this->company();
    2324        }
     25        return $this->gatewayDescription;
    2426    }
    2527    protected function getOrderIdOnPayForOrderPage()
    … …  
    3133    protected function company()
    3234    {
    33         ?>
    34         <p class="form-row form-row-wide" id="billing_company_field">
    35             <label for="<?php
    36         echo esc_attr(self::FIELD_COMPANY);
    37         ?>" class=""><?php
    38         echo esc_html__('Company', 'mollie-payments-for-woocommerce');
    39         ?>
    40                 <abbr class="required" title="required">*</abbr>
    41             </label>
    42             <span class="woocommerce-input-wrapper">
    43         <input type="tel" class="input-text " name="<?php
    44         echo esc_attr(self::FIELD_COMPANY);
    45         ?>" id="<?php
    46         echo esc_attr(self::FIELD_COMPANY);
    47         ?>"
    48                placeholder="Company name"
    49                value="" autocomplete="organization">
     35        return '
     36    <p class="form-row form-row-wide" id="billing_company_field">
     37        <label for="' . esc_attr(self::FIELD_COMPANY) . '" class="">' . esc_html__('Company', 'mollie-payments-for-woocommerce') . '
     38            <abbr class="required" title="required">*</abbr>
     39        </label>
     40        <span class="woocommerce-input-wrapper">
     41            <input type="tel" class="input-text" name="' . esc_attr(self::FIELD_COMPANY) . '" id="' . esc_attr(self::FIELD_COMPANY) . '"
     42                   placeholder="Company name"
     43                   value="" autocomplete="organization">
    5044        </span>
    51         </p>
    52         <?php
     45    </p>';
    5346    }
    5447    public function getFieldMarkup($gateway, $dataHelper)
    5548    {
    56         return "";
     49        return '';
    5750    }
    5851    /**

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/CreditcardFieldsStrategy.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
    55
     6use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
    67use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
    7 class CreditcardFieldsStrategy implements \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategyI
     8class CreditcardFieldsStrategy extends \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
    89{
    9     public function execute($gateway, $dataHelper)
     10    public function renderFields(): string
    1011    {
    11         if (!$this->isMollieComponentsEnabled($gateway->paymentMethod())) {
    12             return;
     12        if (!$this->isMollieComponentsEnabled($this->deprecatedHelperGateway->paymentMethod())) {
     13            return $this->gatewayDescription;
    1314        }
    14         $gateway->has_fields = \true;
    1515        $allowedHtml = $this->svgAllowedHtml();
    16         ?>
    17         <div class="mollie-components"></div>
    18         <p class="mollie-components-description">
    19             <?php
    20         printf(
    21             /* translators: Placeholder 1: Lock icon. Placeholder 2: Mollie logo. */
    22             esc_html(__('%1$s Secure payments provided by %2$s', 'mollie-payments-for-woocommerce')),
    23             wp_kses($this->lockIcon($dataHelper), $allowedHtml),
    24             wp_kses($this->mollieLogo($dataHelper), $allowedHtml)
    25         );
    26         ?>
    27         </p>
    28         <?php
     16        $output = $this->gatewayDescription;
     17        $output .= '<div class="mollie-components"></div>';
     18        $output .= '<p class="mollie-components-description">';
     19        $output .= sprintf(esc_html__('%1$s Secure payments provided by %2$s', 'mollie-payments-for-woocommerce'), wp_kses($this->lockIcon($this->dataHelper), $allowedHtml), wp_kses($this->mollieLogo($this->dataHelper), $allowedHtml));
     20        $output .= '</p>';
     21        return $output;
    2922    }
    3023    public function getFieldMarkup($gateway, $dataHelper)
    … …  
    4033    protected function isMollieComponentsEnabled(PaymentMethodI $paymentMethod): bool
    4134    {
    42         return $paymentMethod->hasPaymentFields();
     35        $hasComponentsEnabled = $paymentMethod->getProperty('mollie_components_enabled');
     36        return $hasComponentsEnabled === 'yes';
    4337    }
    4438    protected function lockIcon($dataHelper)

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/DefaultFieldsStrategy.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
    55
    6 class DefaultFieldsStrategy implements \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategyI
     6use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
     7class DefaultFieldsStrategy extends \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
    78{
    8     public function execute($gateway, $dataHelper)
     9    public function renderFields(): string
    910    {
     11        return $this->gatewayDescription;
    1012    }
    1113    public function getFieldMarkup($gateway, $dataHelper)
    1214    {
     15        return '';
    1316    }
    1417}

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/GiftcardFieldsStrategy.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
    55
    6 class GiftcardFieldsStrategy implements \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategyI
     6use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
     7class GiftcardFieldsStrategy extends \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
    78{
    89    use \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\IssuersDropdownBehavior;
    9     public function execute($gateway, $dataHelper)
     10    public function renderFields(): string
    1011    {
    11         if (!$this->dropDownEnabled($gateway)) {
    12             return;
     12        if (!$this->dropDownEnabled($this->deprecatedHelperGateway)) {
     13            return $this->gatewayDescription;
    1314        }
    14         $issuers = $this->getIssuers($gateway, $dataHelper);
     15        $issuers = $this->getIssuers($this->deprecatedHelperGateway, $this->dataHelper);
    1516        if (empty($issuers)) {
    16             return;
     17            return $this->gatewayDescription;
    1718        }
    18         $selectedIssuer = $gateway->getSelectedIssuer();
     19        $selectedIssuer = $this->getSelectedIssuer($this->deprecatedHelperGateway);
    1920        $html = '';
    2021        // If only one gift card issuers is available, show it without a dropdown
    … …  
    2829            }
    2930            //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
    30             echo wpautop(wptexturize($html));
    31             return;
     31            return $this->gatewayDescription . wpautop(wptexturize($html));
    3232        }
    33         $this->renderIssuers($gateway, $issuers, $selectedIssuer);
     33        return $this->gatewayDescription . $this->renderIssuers($this->deprecatedHelperGateway, $issuers, $selectedIssuer);
    3434    }
    3535    public function getFieldMarkup($gateway, $dataHelper)
    … …  
    3939        }
    4040        $issuers = $this->getIssuers($gateway, $dataHelper);
    41         $selectedIssuer = $gateway->getSelectedIssuer();
     41        $selectedIssuer = $this->getSelectedIssuer($gateway);
    4242        $markup = $this->dropdownOptions($gateway, $issuers, $selectedIssuer);
    4343        return $markup;

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
    55
    6 class In3FieldsStrategy implements \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategyI
     6use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
     7class In3FieldsStrategy extends \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
    78{
    89    use \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategiesTrait;
    910    const FIELD_BIRTHDATE = "billing_birthdate_in3";
    1011    const FIELD_PHONE = "billing_phone_in3";
    11     public function execute($gateway, $dataHelper)
     12    public function renderFields(): string
    1213    {
    1314        $showBirthdateField = \false;
    … …  
    1617        $phoneValue = \false;
    1718        $birthValue = \false;
     19        $html = $this->gatewayDescription;
    1820        if (is_checkout_pay_page()) {
    1921            $showBirthdateField = \true;
    … …  
    3032        }
    3133        if ($showPhoneField) {
    32             $this->phoneNumber($phoneValue);
     34            $html .= $this->phoneNumber($phoneValue);
    3335        }
    3436        if ($showBirthdateField) {
    35             $this->dateOfBirth($birthValue);
     37            $html .= $this->dateOfBirth($birthValue);
    3638        }
     39        return $html;
    3740    }
    3841    protected function phoneNumber($phoneValue)
    3942    {
    4043        $phoneValue = $phoneValue ?: '';
    41         ?>
    42         <p class="form-row form-row-wide" id="billing_phone_field">
    43             <label for="<?php
    44         echo esc_attr(self::FIELD_PHONE);
    45         ?>" class=""><?php
    46         echo esc_html__('Phone', 'mollie-payments-for-woocommerce');
    47         ?>
    48             </label>
    49             <span class="woocommerce-input-wrapper">
    50         <input type="tel" class="input-text " name="<?php
    51         echo esc_attr(self::FIELD_PHONE);
    52         ?>" id="<?php
    53         echo esc_attr(self::FIELD_PHONE);
    54         ?>"
    55                placeholder="+316xxxxxxxx"
    56                value="<?php
    57         echo esc_attr($phoneValue);
    58         ?>" autocomplete="phone">
    59         </span>
    60         </p>
    61         <?php
     44        $html = '<p class="form-row form-row-wide" id="billing_phone_field">';
     45        $html .= '<label for="' . esc_attr(self::FIELD_PHONE) . '" class="">' . esc_html__('Phone', 'mollie-payments-for-woocommerce') . '</label>';
     46        $html .= '<span class="woocommerce-input-wrapper">';
     47        $html .= '<input type="tel" class="input-text " name="' . esc_attr(self::FIELD_PHONE) . '" id="' . esc_attr(self::FIELD_PHONE) . '" placeholder="+316xxxxxxxx" value="' . esc_attr($phoneValue) . '" autocomplete="phone">';
     48        $html .= '</span></p>';
     49        return $html;
    6250    }
    6351    public function getFieldMarkup($gateway, $dataHelper)

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/IssuersDropdownBehavior.php

    r3164004 r3262577  
    2121        return $dataHelper->getMethodIssuers($apiKey, $testMode, $gateway->paymentMethod()->getProperty('id'));
    2222    }
     23    /**
     24     * @return string|NULL
     25     */
     26    public function getSelectedIssuer($gateway): ?string
     27    {
     28        $issuer_id = 'mollie-payments-for-woocommerce' . '_issuer_' . $gateway->paymentMethod()->getIdFromConfig();
     29        //phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
     30        $postedIssuer = wc_clean(wp_unslash($_POST[$issuer_id] ?? ''));
     31        return !empty($postedIssuer) ? $postedIssuer : null;
     32    }
    2333    public function renderIssuers($gateway, $issuers, $selectedIssuer)
    2434    {
    2535        $html = $this->issuersDropdownMarkup($gateway, $issuers, $selectedIssuer);
    26         echo wp_kses($html, ['select' => ['name' => [], 'id' => [], 'class' => []], 'option' => ['value' => [], 'selected' => []]]);
     36        return wp_kses($html, ['select' => ['name' => [], 'id' => [], 'class' => []], 'option' => ['value' => [], 'selected' => []]]);
    2737    }
    2838    /**

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/KbcFieldsStrategy.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
    55
    6 class KbcFieldsStrategy implements \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategyI
     6use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
     7class KbcFieldsStrategy extends \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
    78{
    89    use \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\IssuersDropdownBehavior;
    9     public function execute($gateway, $dataHelper)
     10    public function renderFields(): string
    1011    {
    11         if (!$this->dropDownEnabled($gateway)) {
    12             return;
     12        if (!$this->dropDownEnabled($this->deprecatedHelperGateway)) {
     13            return $this->gatewayDescription;
    1314        }
    14         $issuers = $this->getIssuers($gateway, $dataHelper);
    15         $selectedIssuer = $gateway->getSelectedIssuer();
    16         $this->renderIssuers($gateway, $issuers, $selectedIssuer);
     15        $issuers = $this->getIssuers($this->deprecatedHelperGateway, $this->dataHelper);
     16        $selectedIssuer = $this->getSelectedIssuer($this->deprecatedHelperGateway);
     17        return $this->gatewayDescription . $this->renderIssuers($this->deprecatedHelperGateway, $issuers, $selectedIssuer);
    1718    }
    1819    public function getFieldMarkup($gateway, $dataHelper)
    1920    {
    2021        if (!$this->dropDownEnabled($gateway)) {
    21             return "";
     22            return '';
    2223        }
    2324        $issuers = $this->getIssuers($gateway, $dataHelper);
    24         $selectedIssuer = $gateway->getSelectedIssuer();
     25        $selectedIssuer = $this->getSelectedIssuer($gateway);
    2526        $markup = $this->dropdownOptions($gateway, $issuers, $selectedIssuer);
    2627        return $markup;

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategiesTrait.php

    r3164004 r3262577  
    1414    {
    1515        $birthValue = $birthValue ?: '';
    16         ?>
    17         <p class="form-row form-row-wide" id="billing_birthdate_field">
    18             <label for="<?php
    19         echo esc_attr(self::FIELD_BIRTHDATE);
    20         ?>" class=""><?php
    21         echo esc_html__('Birthdate', 'mollie-payments-for-woocommerce');
    22         ?>
    23             </label>
    24             <span class="woocommerce-input-wrapper">
    25                 <input type="date" class="input-text " name="<?php
    26         echo esc_attr(self::FIELD_BIRTHDATE);
    27         ?>"
    28                        id="<?php
    29         echo esc_attr(self::FIELD_BIRTHDATE);
    30         ?>" value="<?php
    31         echo esc_attr($birthValue);
    32         ?>"
    33                        autocomplete="birthdate"></span>
    34         </p>
    35         <?php
     16        $html = '<p class="form-row form-row-wide" id="billing_birthdate_field">';
     17        $html .= '<label for="' . esc_attr(self::FIELD_BIRTHDATE) . '" class="">' . esc_html__('Birthdate', 'mollie-payments-for-woocommerce') . '</label>';
     18        $html .= '<span class="woocommerce-input-wrapper">';
     19        $html .= '<input type="date" class="input-text " name="' . esc_attr(self::FIELD_BIRTHDATE) . '" id="' . esc_attr(self::FIELD_BIRTHDATE) . '" value="' . esc_attr($birthValue) . '" autocomplete="birthdate">';
     20        $html .= '</span></p>';
     21        return $html;
    3622    }
    3723}

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategyI.php

    r3164004 r3262577  
    66interface PaymentFieldsStrategyI
    77{
    8     public function execute($gateway, $dataHelper);
     8    public function execute($deprecatedHelperDeprecatedHelperGateway, $gatewayDescription, $dataHelper): string;
    99}

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
    55
    6 class RivertyFieldsStrategy implements \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategyI
     6use Mollie\Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
     7class RivertyFieldsStrategy extends \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
    78{
    89    use \Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies\PaymentFieldsStrategiesTrait;
    910    const FIELD_BIRTHDATE = "billing_birthdate_riverty";
    1011    const FIELD_PHONE = "billing_phone_riverty";
    11     public function execute($gateway, $dataHelper)
     12    public function renderFields(): string
    1213    {
    1314        $showBirthdateField = \false;
    … …  
    1617        $phoneValue = \false;
    1718        $birthValue = \false;
     19        $html = $this->gatewayDescription;
    1820        if (is_checkout_pay_page()) {
    1921            $showBirthdateField = \true;
    … …  
    3032        }
    3133        if ($showPhoneField) {
    32             $this->phoneNumber($phoneValue);
     34            $html .= $this->phoneNumber($phoneValue);
    3335        }
    3436        if ($showBirthdateField) {
    35             $this->dateOfBirth($birthValue);
     37            $html .= $this->dateOfBirth($birthValue);
    3638        }
     39        return $html;
    3740    }
    3841    protected function phoneNumber($phoneValue)
    … …  
    4245        $countryCodes = ['BE' => '+32xxxxxxxxx', 'NL' => '+316xxxxxxxx', 'DE' => '+49xxxxxxxxx', 'AT' => '+43xxxxxxxxx'];
    4346        $placeholder = in_array($country, array_keys($countryCodes)) ? $countryCodes[$country] : $countryCodes['NL'];
    44         ?>
    45         <p class="form-row form-row-wide" id="billing_phone_field">
    46             <label for="<?php
    47         echo esc_attr(self::FIELD_PHONE);
    48         ?>" class=""><?php
    49         echo esc_html__('Phone', 'mollie-payments-for-woocommerce');
    50         ?>
    51             </label>
    52             <span class="woocommerce-input-wrapper">
    53         <input type="tel" class="input-text " name="<?php
    54         echo esc_attr(self::FIELD_PHONE);
    55         ?>" id="<?php
    56         echo esc_attr(self::FIELD_PHONE);
    57         ?>"
    58                placeholder="<?php
    59         echo esc_attr($placeholder);
    60         ?>"
    61                value="<?php
    62         echo esc_attr($phoneValue);
    63         ?>" autocomplete="phone">
    64         </span>
    65         </p>
    66         <?php
     47        $html = '<p class="form-row form-row-wide" id="billing_phone_field">';
     48        $html .= '<label for="' . esc_attr(self::FIELD_PHONE) . '" class="">' . esc_html__('Phone', 'mollie-payments-for-woocommerce') . '</label>';
     49        $html .= '<span class="woocommerce-input-wrapper">';
     50        $html .= '<input type="tel" class="input-text " name="' . esc_attr(self::FIELD_PHONE) . '" id="' . esc_attr(self::FIELD_PHONE) . '" placeholder="' . esc_attr($placeholder) . '" value="' . esc_attr($phoneValue) . '" autocomplete="phone">';
     51        $html .= '</span></p>';
     52        return $html;
    6753    }
    6854    public function getFieldMarkup($gateway, $dataHelper)

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentMethodI.php

    r3164004 r3262577  
    44namespace Mollie\WooCommerce\PaymentMethods;
    55
    6 use Mollie\WooCommerce\Payment\PaymentFieldsService;
     6use Mollie\Psr\Container\ContainerInterface;
    77interface PaymentMethodI
    88{
    99    public function getProperty(string $propertyName);
    1010    public function hasProperty(string $propertyName): bool;
    11     public function title(): string;
    12     public function hasPaymentFields(): bool;
    13     public function getProcessedDescriptionForBlock(): string;
    14     public function paymentFieldsService(): PaymentFieldsService;
    15     public function hasSurcharge(): bool;
    1611}

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/PaymentMethodsIconUrl.php

    r3191126 r3262577  
    9696            return \false;
    9797        }
    98         if (!isset($gatewaySettings['iconFileUrl']) && !is_string($gatewaySettings['iconFileUrl'])) {
     98        if (!isset($gatewaySettings['iconFileUrl']) || !is_string($gatewaySettings['iconFileUrl'])) {
    9999            return \false;
    100100        }

  • mollie-payments-for-woocommerce/trunk/src/PaymentMethods/Riverty.php

    r3226701 r3262577  
    99    protected function getConfig(): array
    1010    {
    11         return ['id' => 'riverty', 'defaultTitle' => 'Riverty', 'settingsDescription' => 'To accept payments via Riverty, all default WooCommerce checkout fields should be enabled and required.', 'defaultDescription' => '', 'paymentFields' => \true, 'additionalFields' => ['birthdate', 'phone'], 'instructions' => \false, 'supports' => ['products', 'refunds'], 'filtersOnBuild' => \true, 'confirmationDelayed' => \false, 'SEPA' => \false, 'orderMandatory' => \true, 'phonePlaceholder' => 'Please enter your phone here. +316xxxxxxxx', 'mollie-payments-for-woocommerce', 'birthdatePlaceholder' => 'Please enter your birthdate here.', 'mollie-payments-for-woocommerce', 'docs' => 'https://www.mollie.com/gb/payments/riverty'];
     11        return ['id' => 'riverty', 'defaultTitle' => 'Riverty', 'settingsDescription' => 'To accept payments via Riverty, all default WooCommerce checkout fields should be enabled and required.', 'defaultDescription' => '', 'paymentFields' => \true, 'additionalFields' => ['birthdate', 'phone'], 'instructions' => \false, 'supports' => ['products', 'refunds'], 'filtersOnBuild' => \true, 'confirmationDelayed' => \false, 'SEPA' => \false, 'orderMandatory' => !apply_filters('inpsyde.feature-flags.mollie-woocommerce.riverty_payments_api', \true), 'paymentCaptureMode' => 'manual', 'phonePlaceholder' => 'Please enter your phone here. +316xxxxxxxx', 'mollie-payments-for-woocommerce', 'birthdatePlaceholder' => 'Please enter your birthdate here.', 'mollie-payments-for-woocommerce', 'docs' => 'https://www.mollie.com/gb/payments/riverty'];
    1212    }
    1313    // Replace translatable strings after the 'after_setup_theme' hook

  • mollie-payments-for-woocommerce/trunk/src/Settings/General/MollieGeneralSettings.php

    r3164004 r3262577  
    33namespace Mollie\WooCommerce\Settings\General;
    44
    5 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
     5use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
    66use Mollie\WooCommerce\Gateway\Surcharge;
    77use Mollie\WooCommerce\Shared\SharedDataDictionary;
    … …  
    2626            __('Payment method description that the customer will see on your checkout. Default <code>%s</code>', 'mollie-payments-for-woocommerce'),
    2727            $defaultDescription
    28         ), 'default' => $defaultDescription, 'desc_tip' => \true], 'sales' => ['id' => $defaultTitle . '_' . 'title', 'title' => __('Sales countries', 'mollie-payments-for-woocommerce'), 'type' => 'title'], 'allowed_countries' => ['title' => __('Sell to specific countries', 'mollie-payments-for-woocommerce'), 'desc' => '', 'css' => 'min-width: 350px;', 'default' => [], 'type' => 'multi_select_countries'], 'surcharge' => ['id' => $defaultTitle . '_' . 'surcharge', 'title' => sprintf(
     28        ), 'default' => $defaultDescription, 'desc_tip' => \true], 'sales' => ['id' => $defaultTitle . '_' . 'title', 'title' => __('Sales countries', 'mollie-payments-for-woocommerce'), 'type' => 'title'], 'allowed_countries' => ['title' => __('Sell to specific countries', 'mollie-payments-for-woocommerce'), 'desc' => '', 'css' => 'min-width: 350px;', 'default' => [], 'type' => 'multi_select_countries', 'sanitize_callback' => static function ($value) {
     29            return is_array($value) ? array_map('wc_clean', array_map('stripslashes', $value)) : '';
     30        }], 'surcharge' => ['id' => $defaultTitle . '_' . 'surcharge', 'title' => sprintf(
    2931            /* translators: Placeholder 1: Gateway title */
    3032            __('%s surcharge', 'mollie-payments-for-woocommerce'),

  • mollie-payments-for-woocommerce/trunk/src/Settings/MollieSettingsPage.php

    r3226701 r3262577  
    1010use Mollie\WooCommerce\Settings\Page\PagePaymentMethods;
    1111use Mollie\WooCommerce\Shared\Data;
     12use Mollie\Psr\Container\ContainerInterface;
    1213use WC_Admin_Settings;
    1314use WC_Settings_Page;
    … …  
    2122    protected bool $isTestModeEnabled;
    2223    protected Data $dataHelper;
    23     public function __construct(\Mollie\WooCommerce\Settings\Settings $settings, string $pluginPath, string $pluginUrl, array $mollieGateways, array $paymentMethods, bool $isTestModeEnabled, Data $dataHelper)
     24    protected ContainerInterface $container;
     25    public function __construct(\Mollie\WooCommerce\Settings\Settings $settings, string $pluginPath, string $pluginUrl, array $mollieGateways, array $paymentMethods, bool $isTestModeEnabled, Data $dataHelper, ContainerInterface $container)
    2426    {
    2527        $this->id = 'mollie_settings';
    … …  
    3234        $this->dataHelper = $dataHelper;
    3335        $this->paymentMethods = $paymentMethods;
     36        $this->container = $container;
    3437        $this->registerContentFieldType();
    3538        $this->outputSections();
    … …  
    105108        foreach ($this->pages() as $pageClass) {
    106109            /** @var AbstractPage $page */
    107             $page = new $pageClass($this->settings, $this->pluginUrl, $this->pages(), $defaultSection, $connectionStatus, $this->isTestModeEnabled, $this->mollieGateways, $this->paymentMethods, $this->dataHelper);
     110            $page = new $pageClass($this->settings, $this->pluginUrl, $this->pages(), $defaultSection, $connectionStatus, $this->isTestModeEnabled, $this->mollieGateways, $this->paymentMethods, $this->dataHelper, $this->container);
    108111            if ($page::slug() === $defaultSection) {
    109112                $mollieSettings = $this->hideKeysIntoStars($page->settings());

  • mollie-payments-for-woocommerce/trunk/src/Settings/Page/AbstractPage.php

    r3191126 r3262577  
    77use Mollie\WooCommerce\Settings\Settings;
    88use Mollie\WooCommerce\Shared\Data;
     9use Mollie\Psr\Container\ContainerInterface;
    910abstract class AbstractPage
    1011{
    … …  
    1819    protected array $paymentMethods;
    1920    protected Data $dataHelper;
    20     public function __construct(Settings $settings, string $pluginUrl, array $pages, string $currentSection, bool $connectionStatus, bool $testModeEnabled, array $mollieGateways, array $paymentMethods, Data $dataHelper)
     21    protected ContainerInterface $container;
     22    public function __construct(Settings $settings, string $pluginUrl, array $pages, string $currentSection, bool $connectionStatus, bool $testModeEnabled, array $mollieGateways, array $paymentMethods, Data $dataHelper, ContainerInterface $container)
    2123    {
    2224        $this->settings = $settings;
    … …  
    2931        $this->paymentMethods = $paymentMethods;
    3032        $this->dataHelper = $dataHelper;
     33        $this->container = $container;
    3134    }
    3235    abstract public static function isTab(): bool;
    … …  
    4649        foreach ($this->sections() as $sectionClass) {
    4750            /** @var AbstractSection $section */
    48             $section = new $sectionClass($this->settings, $this->pluginUrl, $this->pages, $this->currentSection, $this->connectionStatus, $this->testModeEnabled, $this->mollieGateways, $this->paymentMethods, $this->dataHelper);
     51            $section = new $sectionClass($this->settings, $this->pluginUrl, $this->pages, $this->currentSection, $this->connectionStatus, $this->testModeEnabled, $this->mollieGateways, $this->paymentMethods, $this->dataHelper, $this->container);
    4952            foreach ($section->config() as $field) {
    5053                $settings[] = $field;

  • mollie-payments-for-woocommerce/trunk/src/Settings/Page/Section/AbstractSection.php

    r3191126 r3262577  
    66use Mollie\WooCommerce\Settings\Settings;
    77use Mollie\WooCommerce\Shared\Data;
     8use Mollie\Psr\Container\ContainerInterface;
    89abstract class AbstractSection
    910{
    … …  
    1718    protected array $paymentMethods;
    1819    protected Data $dataHelper;
    19     public function __construct(Settings $settings, string $pluginUrl, array $pages, string $currentSection, bool $connectionStatus, bool $testModeEnabled, array $mollieGateways, array $paymentMethods, Data $dataHelper)
     20    protected ContainerInterface $container;
     21    public function __construct(Settings $settings, string $pluginUrl, array $pages, string $currentSection, bool $connectionStatus, bool $testModeEnabled, array $mollieGateways, array $paymentMethods, Data $dataHelper, ContainerInterface $container)
    2022    {
    2123        $this->settings = $settings;
    … …  
    2830        $this->paymentMethods = $paymentMethods;
    2931        $this->dataHelper = $dataHelper;
     32        $this->container = $container;
    3033    }
    3134    abstract public function config(): array;

  • mollie-payments-for-woocommerce/trunk/src/Settings/Page/Section/Advanced.php

    r3191126 r3262577  
    55
    66use Mollie\WooCommerce\Shared\SharedDataDictionary;
    7 use Mollie\WooCommerce\Payment\PaymentService;
     7use Mollie\WooCommerce\Payment\PaymentProcessor;
    88class Advanced extends \Mollie\WooCommerce\Settings\Page\Section\AbstractSection
    99{
    … …  
    2121            strtolower(__('Enabled', 'mollie-payments-for-woocommerce')),
    2222            __('Single Click Payments', 'mollie-payments-for-woocommerce')
    23         ), 'type' => 'checkbox', 'default' => 'yes'], ['id' => $this->settings->getSettingId('api_switch'), 'title' => __('Select API Method', 'mollie-payments-for-woocommerce'), 'type' => 'select', 'options' => [PaymentService::PAYMENT_METHOD_TYPE_ORDER => ucfirst(PaymentService::PAYMENT_METHOD_TYPE_ORDER) . ' (' . __('default', 'mollie-payments-for-woocommerce') . ')', PaymentService::PAYMENT_METHOD_TYPE_PAYMENT => ucfirst(PaymentService::PAYMENT_METHOD_TYPE_PAYMENT)], 'default' => PaymentService::PAYMENT_METHOD_TYPE_ORDER, 'desc' => sprintf(
     23        ), 'type' => 'checkbox', 'default' => 'yes'], ['id' => $this->settings->getSettingId('api_switch'), 'title' => __('Select API Method', 'mollie-payments-for-woocommerce'), 'type' => 'select', 'options' => [PaymentProcessor::PAYMENT_METHOD_TYPE_ORDER => ucfirst(PaymentProcessor::PAYMENT_METHOD_TYPE_ORDER) . ' (' . __('default', 'mollie-payments-for-woocommerce') . ')', PaymentProcessor::PAYMENT_METHOD_TYPE_PAYMENT => ucfirst(PaymentProcessor::PAYMENT_METHOD_TYPE_PAYMENT)], 'default' => PaymentProcessor::PAYMENT_METHOD_TYPE_ORDER, 'desc' => sprintf(
    2424            /* translators: Placeholder 1: opening link tag, placeholder 2: closing link tag */
    2525            __('Click %1$shere%2$s to read more about the differences between the Payments and Orders API', 'mollie-payments-for-woocommerce'),

  • mollie-payments-for-woocommerce/trunk/src/Settings/Page/Section/Notices.php

    r3226701 r3262577  
    44namespace Mollie\WooCommerce\Settings\Page\Section;
    55
     6use Mollie\WooCommerce\PaymentMethods\AbstractPaymentMethod;
    67use Mollie\WooCommerce\PaymentMethods\Constants;
    78use WC_Gateway_BACS;
    … …  
    3940    protected function warnDirectDebitStatus(): string
    4041    {
     42        if (!$this->paymentMethods["directdebit"] instanceof AbstractPaymentMethod) {
     43            return '';
     44        }
    4145        $hasCustomSepaSettings = $this->paymentMethods["directdebit"]->getProperty('enabled') !== \false;
    4246        $isSepaEnabled = !$hasCustomSepaSettings || $this->paymentMethods["directdebit"]->getProperty('enabled') === 'yes';

  • mollie-payments-for-woocommerce/trunk/src/Settings/Page/Section/PaymentMethods.php

    r3242448 r3262577  
    182182            $button = '<a class="button-secondary" href="https://my.mollie.com/dashboard/settings/profiles?utm_source=woocommerce&utm_medium=plugin&utm_campaign=partner" target="_blank">' . esc_html(__('Activate Payment Method', 'mollie-payments-for-woocommerce')) . '</a>';
    183183        }
     184        $iconProvider = $paymentMethod->paymentMethodIconProvider($this->container);
     185        $icon = $iconProvider->provideIcons()[0];
    184186        ob_start();
    185187        ?>
    186188        <div class="mollie-settings-pm__single">
    187189            <?php
    188         echo $paymentMethod->getIconUrl();
     190        echo $icon->src();
    189191        // phpcs:ignore XSS ok.
    190192        ?>
    191193            <?php
    192         echo esc_html($paymentMethod->title());
     194        echo esc_html($paymentMethod->title($this->container));
    193195        ?>
    194196            <?php

  • mollie-payments-for-woocommerce/trunk/src/Settings/Settings.php

    r3191126 r3262577  
    77use DateTime;
    88use Mollie\Api\Exceptions\ApiException;
     9use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
    910use Mollie\WooCommerce\Gateway\Surcharge;
    1011use Mollie\WooCommerce\Notice\AdminNotice;
    11 use Mollie\WooCommerce\Payment\PaymentService;
     12use Mollie\WooCommerce\Payment\PaymentProcessor;
    1213use Mollie\WooCommerce\Settings\General\MollieGeneralSettings;
    1314use Mollie\WooCommerce\Shared\SharedDataDictionary;
    … …  
    4849        return $generalSettings->gatewayFormFields($defaultTitle, $defaultDescription, $paymentConfirmation);
    4950    }
    50     public function processSettings(WC_Payment_Gateway $gateway)
     51    public function processSettings(string $gatewayId)
    5152    {
    5253        $nonce = filter_input(\INPUT_POST, '_wpnonce', \FILTER_SANITIZE_SPECIAL_CHARS);
    … …  
    5657        }
    5758        if (isset($_POST['save'])) {
    58             $this->processAdminOptionCustomLogo($gateway);
    59             $this->processAdminOptionSurcharge($gateway);
     59            $this->processAdminOptionCustomLogo($gatewayId);
     60            $this->processAdminOptionSurcharge($gatewayId);
    6061            //only credit cards have a selector
    61             if ($gateway->id === 'mollie_wc_gateway_creditcard') {
     62            if ($gatewayId === 'mollie_wc_gateway_creditcard') {
    6263                $this->processAdminOptionCreditcardSelector();
    6364            }
    6465        }
    6566    }
    66     public function processAdminOptionCustomLogo(WC_Payment_Gateway $gateway)
     67    public function processAdminOptionCustomLogo(string $gatewayId)
    6768    {
    6869        $nonce = filter_input(\INPUT_POST, '_wpnonce', \FILTER_SANITIZE_SPECIAL_CHARS);
    … …  
    7172            return;
    7273        }
    73         $enabledLogoOptionName = $gateway->id . '_enable_custom_logo';
    74         $gatewaySettings = get_option(sprintf('%s_settings', $gateway->id), []);
     74        $enabledLogoOptionName = 'woocommerce_' . $gatewayId . '_enable_custom_logo';
     75        $gatewaySettings = get_option(sprintf('%s_settings', $gatewayId), []);
    7576        if (!isset($_POST[$enabledLogoOptionName])) {
    7677            $gatewaySettings["iconFileUrl"] = null;
    7778            $gatewaySettings["iconFilePath"] = null;
    78             update_option(sprintf('%s_settings', $gateway->id), $gatewaySettings);
     79            update_option(sprintf('%s_settings', $gatewayId), $gatewaySettings);
    7980            return;
    8081        }
    81         $fileOptionName = $gateway->id . '_upload_logo';
     82        $fileOptionName = 'woocommerce_' . $gatewayId . '_upload_logo';
    8283        if (!empty($_FILES[$fileOptionName]['size']) && !empty($_FILES[$fileOptionName]['name']) && is_string($_FILES[$fileOptionName]['name']) && !empty($_FILES[$fileOptionName]['tmp_name']) && is_string($_FILES[$fileOptionName]['tmp_name'])) {
    8384            $name = filter_var(wp_unslash($_FILES[$fileOptionName]['name']), \FILTER_SANITIZE_FULL_SPECIAL_CHARS);
    … …  
    8788                return;
    8889            }
    89             $this->processUploadedFile($name, $tempName, $gateway);
    90         }
    91     }
    92     public function processAdminOptionSurcharge(WC_Payment_Gateway $gateway)
     90            $this->processUploadedFile($name, $tempName, $gatewayId);
     91        }
     92    }
     93    public function processAdminOptionSurcharge(string $gatewayId)
    9394    {
    9495        $nonce = filter_input(\INPUT_POST, '_wpnonce', \FILTER_SANITIZE_SPECIAL_CHARS);
    … …  
    9798            return;
    9899        }
    99         $paymentSurcharge = $gateway->id . '_payment_surcharge';
     100        $paymentSurcharge = $gatewayId . '_payment_surcharge';
    100101        if (isset($_POST[$paymentSurcharge]) && $_POST[$paymentSurcharge] !== Surcharge::NO_FEE) {
    101102            $surchargeFields = ['_fixed_fee', '_percentage', '_surcharge_limit'];
    102103            foreach ($surchargeFields as $field) {
    103                 $optionName = $gateway->id . $field;
     104                $optionName = $gatewayId . $field;
    104105                $validatedValue = isset($_POST[$optionName]) && $_POST[$optionName] > 0 && $_POST[$optionName] < 999;
    105106                if (!$validatedValue) {
    … …  
    109110        }
    110111    }
    111     public function adminOptions(WC_Payment_Gateway $gateway)
    112     {
    113         if (!$gateway->enabled && count($gateway->errors)) {
    114             echo '<div class="inline error"><p><strong>' . esc_html(__('Gateway Disabled', 'mollie-payments-for-woocommerce')) . '</strong>: ' . wp_kses_post(implode('<br/>', $gateway->errors)) . '</p></div>';
    115             return;
    116         }
    117         $html = '';
    118         foreach ($gateway->get_form_fields() as $k => $v) {
    119             $type = $gateway->get_field_type($v);
    120             if ($type === 'multi_select_countries') {
    121                 $html .= $this->multiSelectCountry($gateway);
    122             } elseif (method_exists($gateway, 'generate_' . $type . '_html')) {
    123                 $html .= $gateway->{'generate_' . $type . '_html'}($k, $v);
    124             } else {
    125                 $html .= $gateway->generate_text_html($k, $v);
    126             }
    127         }
    128         echo '<h2>' . esc_html($gateway->get_method_title());
    129         wc_back_link(__('Return to payments', 'mollie-payments-for-woocommerce'), admin_url('admin.php?page=wc-settings&tab=checkout'));
    130         echo '</h2>';
    131         echo wp_kses_post(wpautop($gateway->get_method_description()));
    132         echo '<table class="form-table">' . $html . '</table>';
    133     }
    134     public function multiSelectCountry($gateway)
    135     {
    136         $selections = (array) $gateway->get_option('allowed_countries', []);
    137         $gatewayId = $gateway->paymentMethod()->getProperty('id');
    138         $id = 'mollie_wc_gateway_' . $gatewayId . '_allowed_countries';
    139         $title = __('Sell to specific countries', 'mollie-payments-for-woocommerce');
    140         $countries = WC()->countries->countries;
    141         asort($countries);
    142         ob_start();
    143         ?>
    144         <tr valign="top">
    145             <th scope="row" class="titledesc">
    146                 <label for="<?php
    147         echo esc_attr($id);
    148         ?>"><?php
    149         echo esc_html($title);
    150         ?> </label>
    151             </th>
    152             <td class="forminp">
    153                 <select multiple="multiple" name="<?php
    154         echo esc_attr($id);
    155         ?>[]" style="width:350px"
    156                         data-placeholder="<?php
    157         esc_attr_e('Choose countries&hellip;', 'mollie-payments-for-woocommerce');
    158         ?>"
    159                         aria-label="<?php
    160         esc_attr_e('Country', 'mollie-payments-for-woocommerce');
    161         ?>" class="wc-enhanced-select">
    162                     <?php
    163         if (!empty($countries)) {
    164             foreach ($countries as $key => $val) {
    165                 echo '<option value="' . esc_attr($key) . '"' . esc_attr(wc_selected($key, $selections)) . '>' . esc_html($val) . '</option>';
    166             }
    167         }
    168         ?>
    169                 </select><br/><a class="select_all button" href="#"><?php
    170         esc_html_e('Select all', 'mollie-payments-for-woocommerce');
    171         ?></a>
    172                 <a class="select_none button" href="#"><?php
    173         esc_html_e('Select none', 'mollie-payments-for-woocommerce');
    174         ?></a>
    175             </td>
    176         </tr>
    177         <?php
    178         return ob_get_clean();
    179     }
    180112    /**
    181113     * @return bool
    … …  
    193125    {
    194126        $orderApiSetting = get_option($this->getSettingId('api_switch'));
    195         return !$orderApiSetting || is_string($orderApiSetting) && trim($orderApiSetting) === PaymentService::PAYMENT_METHOD_TYPE_ORDER;
     127        return !$orderApiSetting || is_string($orderApiSetting) && trim($orderApiSetting) === PaymentProcessor::PAYMENT_METHOD_TYPE_ORDER;
    196128    }
    197129    /**
    … …  
    564496        return \true;
    565497    }
    566     protected function processUploadedFile(string $name, string $tempName, WC_Payment_Gateway $gateway)
     498    protected function processUploadedFile(string $name, string $tempName, string $gatewayId)
    567499    {
    568500        $fileName = preg_replace('#\s+#', '_', $name);
    … …  
    572504        $upload_overrides = ['test_form' => \false];
    573505        // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
    574         $file = isset($_FILES[$gateway->id . '_upload_logo']) ? wp_unslash($_FILES[$gateway->id . '_upload_logo']) : [];
     506        $file = isset($_FILES['woocommerce_' . $gatewayId . '_upload_logo']) ? wp_unslash($_FILES['woocommerce_' . $gatewayId . '_upload_logo']) : [];
    575507        if (!empty($file)) {
    576508            $file = ['name' => $file['name'], 'type' => $file['type'], 'tmp_name' => $file['tmp_name'], 'error' => $file['error'], 'size' => $file['size']];
    577509            $movefile = wp_handle_upload($file, $upload_overrides);
    578510            if ($movefile) {
     511                $gatewaySettings = get_option(sprintf('%s_settings', $gatewayId), []);
    579512                $gatewaySettings["iconFileUrl"] = $movefile['url'];
    580513                $gatewaySettings["iconFilePath"] = $movefile['file'];
    581                 update_option(sprintf('%s_settings', $gateway->id), $gatewaySettings);
     514                update_option(sprintf('%s_settings', $gatewayId), $gatewaySettings);
    582515            }
    583516        }

  • mollie-payments-for-woocommerce/trunk/src/Settings/SettingsModule.php

    r3226701 r3262577  
    119119            $this->maybeTestModeNotice();
    120120        });
    121         $gateways = $container->get('gateway.instances');
     121        $gateways = $container->get('__deprecated.gateway_helpers');
    122122        $isSDDGatewayEnabled = $container->get('gateway.isSDDGatewayEnabled');
    123         $this->initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $pluginUrl, $paymentMethods);
     123        $this->initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $pluginUrl, $paymentMethods, $container);
    124124        add_action('woocommerce_admin_settings_sanitize_option', [$this->settingsHelper, 'updateMerchantIdOnApiKeyChanges'], 10, 2);
    125125        add_action('update_option_mollie-payments-for-woocommerce_live_api_key', [$this->settingsHelper, 'updateMerchantIdAfterApiKeyChanges'], 10, 3);
    … …  
    189189     * @param $pluginUrl
    190190     * @param $paymentMethods
     191     * @param $container
    191192     * @return void
    192193     */
    193     protected function initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $pluginUrl, $paymentMethods): void
     194    protected function initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $pluginUrl, $paymentMethods, $container): void
    194195    {
    195196        if (!$isSDDGatewayEnabled) {
    … …  
    197198            unset($gateways['mollie_wc_gateway_directdebit']);
    198199        }
    199         add_filter('woocommerce_get_settings_pages', function ($settings) use ($pluginPath, $pluginUrl, $gateways, $paymentMethods) {
    200             $settings[] = new \Mollie\WooCommerce\Settings\MollieSettingsPage($this->settingsHelper, $pluginPath, $pluginUrl, $gateways, $paymentMethods, $this->isTestModeEnabled, $this->dataHelper);
     200        add_filter('woocommerce_get_settings_pages', function ($settings) use ($pluginPath, $pluginUrl, $gateways, $paymentMethods, $container) {
     201            $settings[] = new \Mollie\WooCommerce\Settings\MollieSettingsPage($this->settingsHelper, $pluginPath, $pluginUrl, $gateways, $paymentMethods, $this->isTestModeEnabled, $this->dataHelper, $container);
    201202            return $settings;
    202203        });

  • mollie-payments-for-woocommerce/trunk/src/Shared/Data.php

    r3191126 r3262577  
    104104        $this->settingsHelper->processSettings($gateway);
    105105    }
    106     public function processAdminOptions($gateway)
    107     {
    108         $this->settingsHelper->adminOptions($gateway);
    109     }
    110106    public function getPaymentLocale()
    111107    {

  • mollie-payments-for-woocommerce/trunk/src/Subscription/SubscriptionModule.php

    r3164004 r3262577  
    88use Mollie\Inpsyde\Modularity\Module\ExecutableModule;
    99use Mollie\Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
    10 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
     10use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
    1111use Mollie\WooCommerce\Settings\Settings;
    1212use Mollie\WooCommerce\Shared\Data;
    … …  
    3838        $this->settingsHelper = $container->get('settings.settings_helper');
    3939        assert($this->settingsHelper instanceof Settings);
    40         $this->maybeFixSubscriptions();
    4140        $this->schedulePendingPaymentOrdersExpirationCheck();
    4241        return \true;
    43     }
    44     /**
    45      * See MOL-322, MOL-405
    46      */
    47     public function maybeFixSubscriptions()
    48     {
    49         $fixer = new \Mollie\WooCommerce\Subscription\MaybeFixSubscription();
    50         $fixer->maybeFix();
    5142    }
    5243    /**

  • mollie-payments-for-woocommerce/trunk/vendor/autoload.php

    r3226701 r3262577  
    2323require_once __DIR__ . '/composer/autoload_real.php';
    2424
    25 return ComposerAutoloaderInitc0778a800f6c5eb39482522e8993a1d5::getLoader();
     25return ComposerAutoloaderInitb1e8936703aa6cff296fa891dd9ccf25::getLoader();

  • mollie-payments-for-woocommerce/trunk/vendor/composer/autoload_classmap.php

    r3242448 r3262577  
    154154    'Mollie\\Api\\Types\\SubscriptionStatus' => $vendorDir . '/mollie/mollie-api-php/src/Types/SubscriptionStatus.php',
    155155    'Mollie\\Api\\Types\\TerminalStatus' => $vendorDir . '/mollie/mollie-api-php/src/Types/TerminalStatus.php',
     156    'Mollie\\Dhii\\Services\\Extension' => $vendorDir . '/dhii/services/src/Extension.php',
     157    'Mollie\\Dhii\\Services\\Extensions\\ArrayExtension' => $vendorDir . '/dhii/services/src/Extensions/ArrayExtension.php',
     158    'Mollie\\Dhii\\Services\\Factories\\Alias' => $vendorDir . '/dhii/services/src/Factories/Alias.php',
     159    'Mollie\\Dhii\\Services\\Factories\\Constructor' => $vendorDir . '/dhii/services/src/Factories/Constructor.php',
     160    'Mollie\\Dhii\\Services\\Factories\\FuncService' => $vendorDir . '/dhii/services/src/Factories/FuncService.php',
     161    'Mollie\\Dhii\\Services\\Factories\\GlobalVar' => $vendorDir . '/dhii/services/src/Factories/GlobalVar.php',
     162    'Mollie\\Dhii\\Services\\Factories\\ServiceList' => $vendorDir . '/dhii/services/src/Factories/ServiceList.php',
     163    'Mollie\\Dhii\\Services\\Factories\\StringService' => $vendorDir . '/dhii/services/src/Factories/StringService.php',
     164    'Mollie\\Dhii\\Services\\Factories\\Value' => $vendorDir . '/dhii/services/src/Factories/Value.php',
     165    'Mollie\\Dhii\\Services\\Factory' => $vendorDir . '/dhii/services/src/Factory.php',
     166    'Mollie\\Dhii\\Services\\ResolveKeysCapableTrait' => $vendorDir . '/dhii/services/src/ResolveKeysCapableTrait.php',
     167    'Mollie\\Dhii\\Services\\Service' => $vendorDir . '/dhii/services/src/Service.php',
    156168    'Mollie\\Inpsyde\\EnvironmentChecker\\ConstraintsCollectionFactory' => $baseDir . '/pluginEnvironmentChecker/ConstraintsCollectionFactory.php',
    157169    'Mollie\\Inpsyde\\EnvironmentChecker\\ConstraintsCollectionFactoryInterface' => $baseDir . '/pluginEnvironmentChecker/ConstraintsCollectionFactoryInterface.php',
    … …  
    182194    'Mollie\\Inpsyde\\Modularity\\Properties\\Properties' => $vendorDir . '/inpsyde/modularity/src/Properties/Properties.php',
    183195    'Mollie\\Inpsyde\\Modularity\\Properties\\ThemeProperties' => $vendorDir . '/inpsyde/modularity/src/Properties/ThemeProperties.php',
     196    'Mollie\\Inpsyde\\PaymentGateway\\DefaultIconsRenderer' => $baseDir . '/lib/payment-gateway/src/DefaultIconsRenderer.php',
     197    'Mollie\\Inpsyde\\PaymentGateway\\Fields\\ContentField' => $baseDir . '/lib/payment-gateway/src/Fields/ContentField.php',
     198    'Mollie\\Inpsyde\\PaymentGateway\\GatewayIconsRendererInterface' => $baseDir . '/lib/payment-gateway/src/GatewayIconsRendererInterface.php',
     199    'Mollie\\Inpsyde\\PaymentGateway\\I18n' => $baseDir . '/lib/payment-gateway/src/I18n.php',
     200    'Mollie\\Inpsyde\\PaymentGateway\\Icon' => $baseDir . '/lib/payment-gateway/src/Icon.php',
     201    'Mollie\\Inpsyde\\PaymentGateway\\IconProviderInterface' => $baseDir . '/lib/payment-gateway/src/IconProviderInterface.php',
     202    'Mollie\\Inpsyde\\PaymentGateway\\Method\\CustomSettingsFields' => $baseDir . '/lib/payment-gateway/src/Method/CustomSettingsFields.php',
     203    'Mollie\\Inpsyde\\PaymentGateway\\Method\\CustomSettingsFieldsDefinition' => $baseDir . '/lib/payment-gateway/src/Method/CustomSettingsFieldsDefinition.php',
     204    'Mollie\\Inpsyde\\PaymentGateway\\Method\\DefaultPaymentMethodDefinitionTrait' => $baseDir . '/lib/payment-gateway/src/Method/DefaultPaymentMethodDefinitionTrait.php',
     205    'Mollie\\Inpsyde\\PaymentGateway\\Method\\PaymentMethodDefinition' => $baseDir . '/lib/payment-gateway/src/Method/PaymentMethodDefinition.php',
     206    'Mollie\\Inpsyde\\PaymentGateway\\NoopPaymentProcessor' => $baseDir . '/lib/payment-gateway/src/NoopPaymentProcessor.php',
     207    'Mollie\\Inpsyde\\PaymentGateway\\NoopPaymentRequestValidator' => $baseDir . '/lib/payment-gateway/src/NoopPaymentRequestValidator.php',
     208    'Mollie\\Inpsyde\\PaymentGateway\\NoopRefundProcessor' => $baseDir . '/lib/payment-gateway/src/NoopRefundProcessor.php',
     209    'Mollie\\Inpsyde\\PaymentGateway\\PaymentFieldsRendererInterface' => $baseDir . '/lib/payment-gateway/src/PaymentFieldsRendererInterface.php',
     210    'Mollie\\Inpsyde\\PaymentGateway\\PaymentGateway' => $baseDir . '/lib/payment-gateway/src/PaymentGateway.php',
     211    'Mollie\\Inpsyde\\PaymentGateway\\PaymentGatewayBlocks' => $baseDir . '/lib/payment-gateway/src/PaymentGatewayBlocks.php',
     212    'Mollie\\Inpsyde\\PaymentGateway\\PaymentGatewayModule' => $baseDir . '/lib/payment-gateway/src/PaymentGatewayModule.php',
     213    'Mollie\\Inpsyde\\PaymentGateway\\PaymentGatewayValidator' => $baseDir . '/lib/payment-gateway/src/PaymentGatewayValidator.php',
     214    'Mollie\\Inpsyde\\PaymentGateway\\PaymentMethodServiceProviderTrait' => $baseDir . '/lib/payment-gateway/src/PaymentMethodServiceProviderTrait.php',
     215    'Mollie\\Inpsyde\\PaymentGateway\\PaymentProcessorInterface' => $baseDir . '/lib/payment-gateway/src/PaymentProcessorInterface.php',
     216    'Mollie\\Inpsyde\\PaymentGateway\\PaymentRequestValidatorInterface' => $baseDir . '/lib/payment-gateway/src/PaymentRequestValidatorInterface.php',
     217    'Mollie\\Inpsyde\\PaymentGateway\\RefundProcessorInterface' => $baseDir . '/lib/payment-gateway/src/RefundProcessorInterface.php',
     218    'Mollie\\Inpsyde\\PaymentGateway\\ServiceKeyGenerator' => $baseDir . '/lib/payment-gateway/src/ServiceKeyGenerator.php',
     219    'Mollie\\Inpsyde\\PaymentGateway\\SettingsFieldRendererInterface' => $baseDir . '/lib/payment-gateway/src/SettingsFieldRendererInterface.php',
     220    'Mollie\\Inpsyde\\PaymentGateway\\SettingsFieldSanitizerInterface' => $baseDir . '/lib/payment-gateway/src/SettingsFieldSanitizerInterface.php',
     221    'Mollie\\Inpsyde\\PaymentGateway\\StaticIconProvider' => $baseDir . '/lib/payment-gateway/src/StaticIconProvider.php',
    184222    'Mollie\\Psr\\Container\\ContainerExceptionInterface' => $vendorDir . '/psr/container/src/ContainerExceptionInterface.php',
    185223    'Mollie\\Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',
    … …  
    217255    'Mollie\\WooCommerce\\Components\\ComponentsStyles' => $baseDir . '/src/Components/ComponentsStyles.php',
    218256    'Mollie\\WooCommerce\\Components\\StylesPropertiesDictionary' => $baseDir . '/src/Components/StylesPropertiesDictionary.php',
     257    'Mollie\\WooCommerce\\Gateway\\DeprecatedGatewayBuilder' => $baseDir . '/src/Gateway/DeprecatedGatewayBuilder.php',
    219258    'Mollie\\WooCommerce\\Gateway\\GatewayModule' => $baseDir . '/src/Gateway/GatewayModule.php',
    220     'Mollie\\WooCommerce\\Gateway\\MolliePaymentGateway' => $baseDir . '/src/Gateway/MolliePaymentGateway.php',
    221     'Mollie\\WooCommerce\\Gateway\\MolliePaymentGatewayI' => $baseDir . '/src/Gateway/MolliePaymentGatewayI.php',
     259    'Mollie\\WooCommerce\\Gateway\\MolliePaymentGatewayHandler' => $baseDir . '/src/Gateway/MolliePaymentGatewayHandler.php',
    222260    'Mollie\\WooCommerce\\Gateway\\OrderMandatoryGatewayDisabler' => $baseDir . '/src/Gateway/OrderMandatoryGatewayDisabler.php',
     261    'Mollie\\WooCommerce\\Gateway\\Refund\\OrderItemsRefunder' => $baseDir . '/src/Gateway/Refund/OrderItemsRefunder.php',
     262    'Mollie\\WooCommerce\\Gateway\\Refund\\OrderLineStatus' => $baseDir . '/src/Gateway/Refund/OrderLineStatus.php',
     263    'Mollie\\WooCommerce\\Gateway\\Refund\\PartialRefundException' => $baseDir . '/src/Gateway/Refund/PartialRefundException.php',
     264    'Mollie\\WooCommerce\\Gateway\\Refund\\RefundLineItemsBuilder' => $baseDir . '/src/Gateway/Refund/RefundLineItemsBuilder.php',
     265    'Mollie\\WooCommerce\\Gateway\\Refund\\RefundProcessor' => $baseDir . '/src/Gateway/Refund/RefundProcessor.php',
    223266    'Mollie\\WooCommerce\\Gateway\\Surcharge' => $baseDir . '/src/Gateway/Surcharge.php',
    224267    'Mollie\\WooCommerce\\Gateway\\Voucher\\MaybeDisableGateway' => $baseDir . '/src/Gateway/Voucher/MaybeDisableGateway.php',
    … …  
    258301    'Mollie\\WooCommerce\\PaymentMethods\\Giropay' => $baseDir . '/src/PaymentMethods/Giropay.php',
    259302    'Mollie\\WooCommerce\\PaymentMethods\\IconFactory' => $baseDir . '/src/PaymentMethods/IconFactory.php',
     303    'Mollie\\WooCommerce\\PaymentMethods\\Icon\\GatewayIconsRenderer' => $baseDir . '/src/PaymentMethods/Icon/GatewayIconsRenderer.php',
    260304    'Mollie\\WooCommerce\\PaymentMethods\\Ideal' => $baseDir . '/src/PaymentMethods/Ideal.php',
    261305    'Mollie\\WooCommerce\\PaymentMethods\\In3' => $baseDir . '/src/PaymentMethods/In3.php',
    … …  
    269313    'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\InstructionStrategyI' => $baseDir . '/src/PaymentMethods/InstructionStrategies/InstructionStrategyI.php',
    270314    'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\MybankInstructionStrategy' => $baseDir . '/src/PaymentMethods/InstructionStrategies/MybankInstructionStrategy.php',
     315    'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\OrderInstructionsManager' => $baseDir . '/src/PaymentMethods/InstructionStrategies/OrderInstructionsManager.php',
    271316    'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\PaypalInstructionStrategy' => $baseDir . '/src/PaymentMethods/InstructionStrategies/PaypalInstructionStrategy.php',
    272317    'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\Przelewy24InstructionStrategy' => $baseDir . '/src/PaymentMethods/InstructionStrategies/Przelewy24InstructionStrategy.php',
    … …  
    282327    'Mollie\\WooCommerce\\PaymentMethods\\Paybybank' => $baseDir . '/src/PaymentMethods/Paybybank.php',
    283328    'Mollie\\WooCommerce\\PaymentMethods\\Payconiq' => $baseDir . '/src/PaymentMethods/Payconiq.php',
     329    'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\AbstractPaymentFieldsRenderer' => $baseDir . '/src/PaymentMethods/PaymentFieldsStrategies/AbstractPaymentFieldsRenderer.php',
    284330    'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\BancomatpayFieldsStrategy' => $baseDir . '/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php',
    285331    'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\BillieFieldsStrategy' => $baseDir . '/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php',
    … …  
    290336    'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\IssuersDropdownBehavior' => $baseDir . '/src/PaymentMethods/PaymentFieldsStrategies/IssuersDropdownBehavior.php',
    291337    'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\KbcFieldsStrategy' => $baseDir . '/src/PaymentMethods/PaymentFieldsStrategies/KbcFieldsStrategy.php',
     338    'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\NoopPaymentFieldsRenderer' => $baseDir . '/src/PaymentMethods/PaymentFieldsStrategies/NoopPaymentFieldsRenderer.php',
    292339    'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\PaymentFieldsStrategiesTrait' => $baseDir . '/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategiesTrait.php',
    293340    'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\PaymentFieldsStrategyI' => $baseDir . '/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategyI.php',
    … …  
    313360    'Mollie\\WooCommerce\\Payment\\MolliePayment' => $baseDir . '/src/Payment/MolliePayment.php',
    314361    'Mollie\\WooCommerce\\Payment\\MollieSubscription' => $baseDir . '/src/Payment/MollieSubscription.php',
    315     'Mollie\\WooCommerce\\Payment\\OrderInstructionsService' => $baseDir . '/src/Payment/OrderInstructionsService.php',
    316     'Mollie\\WooCommerce\\Payment\\OrderItemsRefunder' => $baseDir . '/src/Payment/OrderItemsRefunder.php',
    317     'Mollie\\WooCommerce\\Payment\\OrderLineStatus' => $baseDir . '/src/Payment/OrderLineStatus.php',
    318362    'Mollie\\WooCommerce\\Payment\\OrderLines' => $baseDir . '/src/Payment/OrderLines.php',
    319     'Mollie\\WooCommerce\\Payment\\PartialRefundException' => $baseDir . '/src/Payment/PartialRefundException.php',
    320363    'Mollie\\WooCommerce\\Payment\\PaymentCheckoutRedirectService' => $baseDir . '/src/Payment/PaymentCheckoutRedirectService.php',
    321364    'Mollie\\WooCommerce\\Payment\\PaymentFactory' => $baseDir . '/src/Payment/PaymentFactory.php',
    322     'Mollie\\WooCommerce\\Payment\\PaymentFieldsService' => $baseDir . '/src/Payment/PaymentFieldsService.php',
     365    'Mollie\\WooCommerce\\Payment\\PaymentLines' => $baseDir . '/src/Payment/PaymentLines.php',
    323366    'Mollie\\WooCommerce\\Payment\\PaymentModule' => $baseDir . '/src/Payment/PaymentModule.php',
    324     'Mollie\\WooCommerce\\Payment\\PaymentService' => $baseDir . '/src/Payment/PaymentService.php',
    325     'Mollie\\WooCommerce\\Payment\\RefundLineItemsBuilder' => $baseDir . '/src/Payment/RefundLineItemsBuilder.php',
     367    'Mollie\\WooCommerce\\Payment\\PaymentProcessor' => $baseDir . '/src/Payment/PaymentProcessor.php',
     368    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\AddCustomRequestFieldsMiddleware' => $baseDir . '/src/Payment/Request/Middleware/AddCustomRequestFieldsMiddleware.php',
     369    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\AddSequenceTypeForSubscriptionsMiddleware' => $baseDir . '/src/Payment/Request/Middleware/AddSequenceTypeForSubscriptionsMiddleware.php',
     370    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\AddressMiddleware' => $baseDir . '/src/Payment/Request/Middleware/AddressMiddleware.php',
     371    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\ApplePayTokenMiddleware' => $baseDir . '/src/Payment/Request/Middleware/ApplePayTokenMiddleware.php',
     372    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\CaptureModeMiddleware' => $baseDir . '/src/Payment/Request/Middleware/CaptureModeMiddleware.php',
     373    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\CardTokenMiddleware' => $baseDir . '/src/Payment/Request/Middleware/CardTokenMiddleware.php',
     374    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\CustomerBirthdateMiddleware' => $baseDir . '/src/Payment/Request/Middleware/CustomerBirthdateMiddleware.php',
     375    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\MiddlewareHandler' => $baseDir . '/src/Payment/Request/Middleware/MiddlewareHandler.php',
     376    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\OrderLinesMiddleware' => $baseDir . '/src/Payment/Request/Middleware/OrderLinesMiddleware.php',
     377    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\PaymentDescriptionMiddleware' => $baseDir . '/src/Payment/Request/Middleware/PaymentDescriptionMiddleware.php',
     378    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\RequestMiddlewareInterface' => $baseDir . '/src/Payment/Request/Middleware/RequestMiddlewareInterface.php',
     379    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\SelectedIssuerMiddleware' => $baseDir . '/src/Payment/Request/Middleware/SelectedIssuerMiddleware.php',
     380    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\StoreCustomerMiddleware' => $baseDir . '/src/Payment/Request/Middleware/StoreCustomerMiddleware.php',
     381    'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\UrlMiddleware' => $baseDir . '/src/Payment/Request/Middleware/UrlMiddleware.php',
     382    'Mollie\\WooCommerce\\Payment\\Request\\RequestFactory' => $baseDir . '/src/Payment/Request/RequestFactory.php',
     383    'Mollie\\WooCommerce\\Payment\\Request\\Strategies\\OrderRequestStrategy' => $baseDir . '/src/Payment/Request/Strategies/OrderRequestStrategy.php',
     384    'Mollie\\WooCommerce\\Payment\\Request\\Strategies\\PaymentRequestStrategy' => $baseDir . '/src/Payment/Request/Strategies/PaymentRequestStrategy.php',
     385    'Mollie\\WooCommerce\\Payment\\Request\\Strategies\\RequestStrategyInterface' => $baseDir . '/src/Payment/Request/Strategies/RequestStrategyInterface.php',
    326386    'Mollie\\WooCommerce\\SDK\\Api' => $baseDir . '/src/SDK/Api.php',
    327387    'Mollie\\WooCommerce\\SDK\\CouldNotConnectToMollie' => $baseDir . '/src/SDK/CouldNotConnectToMollie.php',
    … …  
    333393    'Mollie\\WooCommerce\\SDK\\WordPressHttpAdapterPicker' => $baseDir . '/src/SDK/WordPressHttpAdapterPicker.php',
    334394    'Mollie\\WooCommerce\\Settings\\General\\MollieGeneralSettings' => $baseDir . '/src/Settings/General/MollieGeneralSettings.php',
     395    'Mollie\\WooCommerce\\Settings\\General\\MultiCountrySettingsField' => $baseDir . '/src/Settings/General/MultiCountrySettingsField.php',
    335396    'Mollie\\WooCommerce\\Settings\\MollieSettingsPage' => $baseDir . '/src/Settings/MollieSettingsPage.php',
    336397    'Mollie\\WooCommerce\\Settings\\Page\\AbstractPage' => $baseDir . '/src/Settings/Page/AbstractPage.php',
    … …  
    359420    'Mollie\\WooCommerce\\Shared\\SharedModule' => $baseDir . '/src/Shared/SharedModule.php',
    360421    'Mollie\\WooCommerce\\Shared\\Status' => $baseDir . '/src/Shared/Status.php',
    361     'Mollie\\WooCommerce\\Subscription\\MaybeFixSubscription' => $baseDir . '/src/Subscription/MaybeFixSubscription.php',
    362     'Mollie\\WooCommerce\\Subscription\\MollieSepaRecurringGateway' => $baseDir . '/src/Subscription/MollieSepaRecurringGateway.php',
    363     'Mollie\\WooCommerce\\Subscription\\MollieSubscriptionGateway' => $baseDir . '/src/Subscription/MollieSubscriptionGateway.php',
     422    'Mollie\\WooCommerce\\Subscription\\MollieSepaRecurringGatewayHandler' => $baseDir . '/src/Subscription/MollieSepaRecurringGatewayHandler.php',
     423    'Mollie\\WooCommerce\\Subscription\\MollieSubscriptionGatewayHandler' => $baseDir . '/src/Subscription/MollieSubscriptionGatewayHandler.php',
    364424    'Mollie\\WooCommerce\\Subscription\\SubscriptionModule' => $baseDir . '/src/Subscription/SubscriptionModule.php',
    365425    'Mollie\\WooCommerce\\Uninstall\\CleanDb' => $baseDir . '/src/Uninstall/CleanDb.php',

  • mollie-payments-for-woocommerce/trunk/vendor/composer/autoload_psr4.php

    r3164004 r3262577  
    1010    'Mollie\\Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
    1111    'Mollie\\Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     12    'Mollie\\Inpsyde\\PaymentGateway\\' => array($baseDir . '/lib/payment-gateway/src'),
    1213    'Mollie\\Inpsyde\\Modularity\\' => array($vendorDir . '/inpsyde/modularity/src'),
    1314    'Mollie\\Inpsyde\\EnvironmentChecker\\' => array($baseDir . '/pluginEnvironmentChecker'),
     15    'Mollie\\Dhii\\Services\\' => array($vendorDir . '/dhii/services/src'),
    1416    'Mollie\\Api\\' => array($vendorDir . '/mollie/mollie-api-php/src'),
    1517    'Composer\\CaBundle\\' => array($vendorDir . '/composer/ca-bundle/src'),

  • mollie-payments-for-woocommerce/trunk/vendor/composer/autoload_real.php

    r3226701 r3262577  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInitc0778a800f6c5eb39482522e8993a1d5
     5class ComposerAutoloaderInitb1e8936703aa6cff296fa891dd9ccf25
    66{
    77    private static $loader;
    … …  
    2525        require __DIR__ . '/platform_check.php';
    2626
    27         spl_autoload_register(array('ComposerAutoloaderInitc0778a800f6c5eb39482522e8993a1d5', 'loadClassLoader'), true, true);
     27        spl_autoload_register(array('ComposerAutoloaderInitb1e8936703aa6cff296fa891dd9ccf25', 'loadClassLoader'), true, true);
    2828        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
    29         spl_autoload_unregister(array('ComposerAutoloaderInitc0778a800f6c5eb39482522e8993a1d5', 'loadClassLoader'));
     29        spl_autoload_unregister(array('ComposerAutoloaderInitb1e8936703aa6cff296fa891dd9ccf25', 'loadClassLoader'));
    3030
    3131        require __DIR__ . '/autoload_static.php';
    32         call_user_func(\Composer\Autoload\ComposerStaticInitc0778a800f6c5eb39482522e8993a1d5::getInitializer($loader));
     32        call_user_func(\Composer\Autoload\ComposerStaticInitb1e8936703aa6cff296fa891dd9ccf25::getInitializer($loader));
    3333
    3434        $loader->register(true);

  • mollie-payments-for-woocommerce/trunk/vendor/composer/autoload_static.php

    r3242448 r3262577  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInitc0778a800f6c5eb39482522e8993a1d5
     7class ComposerStaticInitb1e8936703aa6cff296fa891dd9ccf25
    88{
    99    public static $prefixLengthsPsr4 = array (
    … …  
    1313            'Mollie\\Psr\\Log\\' => 15,
    1414            'Mollie\\Psr\\Container\\' => 21,
     15            'Mollie\\Inpsyde\\PaymentGateway\\' => 30,
    1516            'Mollie\\Inpsyde\\Modularity\\' => 26,
    1617            'Mollie\\Inpsyde\\EnvironmentChecker\\' => 34,
     18            'Mollie\\Dhii\\Services\\' => 21,
    1719            'Mollie\\Api\\' => 11,
    1820        ),
    … …  
    3638            0 => __DIR__ . '/..' . '/psr/container/src',
    3739        ),
     40        'Mollie\\Inpsyde\\PaymentGateway\\' =>
     41        array (
     42            0 => __DIR__ . '/../..' . '/lib/payment-gateway/src',
     43        ),
    3844        'Mollie\\Inpsyde\\Modularity\\' =>
    3945        array (
    … …  
    4349        array (
    4450            0 => __DIR__ . '/../..' . '/pluginEnvironmentChecker',
     51        ),
     52        'Mollie\\Dhii\\Services\\' =>
     53        array (
     54            0 => __DIR__ . '/..' . '/dhii/services/src',
    4555        ),
    4656        'Mollie\\Api\\' =>
    … …  
    202212        'Mollie\\Api\\Types\\SubscriptionStatus' => __DIR__ . '/..' . '/mollie/mollie-api-php/src/Types/SubscriptionStatus.php',
    203213        'Mollie\\Api\\Types\\TerminalStatus' => __DIR__ . '/..' . '/mollie/mollie-api-php/src/Types/TerminalStatus.php',
     214        'Mollie\\Dhii\\Services\\Extension' => __DIR__ . '/..' . '/dhii/services/src/Extension.php',
     215        'Mollie\\Dhii\\Services\\Extensions\\ArrayExtension' => __DIR__ . '/..' . '/dhii/services/src/Extensions/ArrayExtension.php',
     216        'Mollie\\Dhii\\Services\\Factories\\Alias' => __DIR__ . '/..' . '/dhii/services/src/Factories/Alias.php',
     217        'Mollie\\Dhii\\Services\\Factories\\Constructor' => __DIR__ . '/..' . '/dhii/services/src/Factories/Constructor.php',
     218        'Mollie\\Dhii\\Services\\Factories\\FuncService' => __DIR__ . '/..' . '/dhii/services/src/Factories/FuncService.php',
     219        'Mollie\\Dhii\\Services\\Factories\\GlobalVar' => __DIR__ . '/..' . '/dhii/services/src/Factories/GlobalVar.php',
     220        'Mollie\\Dhii\\Services\\Factories\\ServiceList' => __DIR__ . '/..' . '/dhii/services/src/Factories/ServiceList.php',
     221        'Mollie\\Dhii\\Services\\Factories\\StringService' => __DIR__ . '/..' . '/dhii/services/src/Factories/StringService.php',
     222        'Mollie\\Dhii\\Services\\Factories\\Value' => __DIR__ . '/..' . '/dhii/services/src/Factories/Value.php',
     223        'Mollie\\Dhii\\Services\\Factory' => __DIR__ . '/..' . '/dhii/services/src/Factory.php',
     224        'Mollie\\Dhii\\Services\\ResolveKeysCapableTrait' => __DIR__ . '/..' . '/dhii/services/src/ResolveKeysCapableTrait.php',
     225        'Mollie\\Dhii\\Services\\Service' => __DIR__ . '/..' . '/dhii/services/src/Service.php',
    204226        'Mollie\\Inpsyde\\EnvironmentChecker\\ConstraintsCollectionFactory' => __DIR__ . '/../..' . '/pluginEnvironmentChecker/ConstraintsCollectionFactory.php',
    205227        'Mollie\\Inpsyde\\EnvironmentChecker\\ConstraintsCollectionFactoryInterface' => __DIR__ . '/../..' . '/pluginEnvironmentChecker/ConstraintsCollectionFactoryInterface.php',
    … …  
    230252        'Mollie\\Inpsyde\\Modularity\\Properties\\Properties' => __DIR__ . '/..' . '/inpsyde/modularity/src/Properties/Properties.php',
    231253        'Mollie\\Inpsyde\\Modularity\\Properties\\ThemeProperties' => __DIR__ . '/..' . '/inpsyde/modularity/src/Properties/ThemeProperties.php',
     254        'Mollie\\Inpsyde\\PaymentGateway\\DefaultIconsRenderer' => __DIR__ . '/../..' . '/lib/payment-gateway/src/DefaultIconsRenderer.php',
     255        'Mollie\\Inpsyde\\PaymentGateway\\Fields\\ContentField' => __DIR__ . '/../..' . '/lib/payment-gateway/src/Fields/ContentField.php',
     256        'Mollie\\Inpsyde\\PaymentGateway\\GatewayIconsRendererInterface' => __DIR__ . '/../..' . '/lib/payment-gateway/src/GatewayIconsRendererInterface.php',
     257        'Mollie\\Inpsyde\\PaymentGateway\\I18n' => __DIR__ . '/../..' . '/lib/payment-gateway/src/I18n.php',
     258        'Mollie\\Inpsyde\\PaymentGateway\\Icon' => __DIR__ . '/../..' . '/lib/payment-gateway/src/Icon.php',
     259        'Mollie\\Inpsyde\\PaymentGateway\\IconProviderInterface' => __DIR__ . '/../..' . '/lib/payment-gateway/src/IconProviderInterface.php',
     260        'Mollie\\Inpsyde\\PaymentGateway\\Method\\CustomSettingsFields' => __DIR__ . '/../..' . '/lib/payment-gateway/src/Method/CustomSettingsFields.php',
     261        'Mollie\\Inpsyde\\PaymentGateway\\Method\\CustomSettingsFieldsDefinition' => __DIR__ . '/../..' . '/lib/payment-gateway/src/Method/CustomSettingsFieldsDefinition.php',
     262        'Mollie\\Inpsyde\\PaymentGateway\\Method\\DefaultPaymentMethodDefinitionTrait' => __DIR__ . '/../..' . '/lib/payment-gateway/src/Method/DefaultPaymentMethodDefinitionTrait.php',
     263        'Mollie\\Inpsyde\\PaymentGateway\\Method\\PaymentMethodDefinition' => __DIR__ . '/../..' . '/lib/payment-gateway/src/Method/PaymentMethodDefinition.php',
     264        'Mollie\\Inpsyde\\PaymentGateway\\NoopPaymentProcessor' => __DIR__ . '/../..' . '/lib/payment-gateway/src/NoopPaymentProcessor.php',
     265        'Mollie\\Inpsyde\\PaymentGateway\\NoopPaymentRequestValidator' => __DIR__ . '/../..' . '/lib/payment-gateway/src/NoopPaymentRequestValidator.php',
     266        'Mollie\\Inpsyde\\PaymentGateway\\NoopRefundProcessor' => __DIR__ . '/../..' . '/lib/payment-gateway/src/NoopRefundProcessor.php',
     267        'Mollie\\Inpsyde\\PaymentGateway\\PaymentFieldsRendererInterface' => __DIR__ . '/../..' . '/lib/payment-gateway/src/PaymentFieldsRendererInterface.php',
     268        'Mollie\\Inpsyde\\PaymentGateway\\PaymentGateway' => __DIR__ . '/../..' . '/lib/payment-gateway/src/PaymentGateway.php',
     269        'Mollie\\Inpsyde\\PaymentGateway\\PaymentGatewayBlocks' => __DIR__ . '/../..' . '/lib/payment-gateway/src/PaymentGatewayBlocks.php',
     270        'Mollie\\Inpsyde\\PaymentGateway\\PaymentGatewayModule' => __DIR__ . '/../..' . '/lib/payment-gateway/src/PaymentGatewayModule.php',
     271        'Mollie\\Inpsyde\\PaymentGateway\\PaymentGatewayValidator' => __DIR__ . '/../..' . '/lib/payment-gateway/src/PaymentGatewayValidator.php',
     272        'Mollie\\Inpsyde\\PaymentGateway\\PaymentMethodServiceProviderTrait' => __DIR__ . '/../..' . '/lib/payment-gateway/src/PaymentMethodServiceProviderTrait.php',
     273        'Mollie\\Inpsyde\\PaymentGateway\\PaymentProcessorInterface' => __DIR__ . '/../..' . '/lib/payment-gateway/src/PaymentProcessorInterface.php',
     274        'Mollie\\Inpsyde\\PaymentGateway\\PaymentRequestValidatorInterface' => __DIR__ . '/../..' . '/lib/payment-gateway/src/PaymentRequestValidatorInterface.php',
     275        'Mollie\\Inpsyde\\PaymentGateway\\RefundProcessorInterface' => __DIR__ . '/../..' . '/lib/payment-gateway/src/RefundProcessorInterface.php',
     276        'Mollie\\Inpsyde\\PaymentGateway\\ServiceKeyGenerator' => __DIR__ . '/../..' . '/lib/payment-gateway/src/ServiceKeyGenerator.php',
     277        'Mollie\\Inpsyde\\PaymentGateway\\SettingsFieldRendererInterface' => __DIR__ . '/../..' . '/lib/payment-gateway/src/SettingsFieldRendererInterface.php',
     278        'Mollie\\Inpsyde\\PaymentGateway\\SettingsFieldSanitizerInterface' => __DIR__ . '/../..' . '/lib/payment-gateway/src/SettingsFieldSanitizerInterface.php',
     279        'Mollie\\Inpsyde\\PaymentGateway\\StaticIconProvider' => __DIR__ . '/../..' . '/lib/payment-gateway/src/StaticIconProvider.php',
    232280        'Mollie\\Psr\\Container\\ContainerExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerExceptionInterface.php',
    233281        'Mollie\\Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',
    … …  
    265313        'Mollie\\WooCommerce\\Components\\ComponentsStyles' => __DIR__ . '/../..' . '/src/Components/ComponentsStyles.php',
    266314        'Mollie\\WooCommerce\\Components\\StylesPropertiesDictionary' => __DIR__ . '/../..' . '/src/Components/StylesPropertiesDictionary.php',
     315        'Mollie\\WooCommerce\\Gateway\\DeprecatedGatewayBuilder' => __DIR__ . '/../..' . '/src/Gateway/DeprecatedGatewayBuilder.php',
    267316        'Mollie\\WooCommerce\\Gateway\\GatewayModule' => __DIR__ . '/../..' . '/src/Gateway/GatewayModule.php',
    268         'Mollie\\WooCommerce\\Gateway\\MolliePaymentGateway' => __DIR__ . '/../..' . '/src/Gateway/MolliePaymentGateway.php',
    269         'Mollie\\WooCommerce\\Gateway\\MolliePaymentGatewayI' => __DIR__ . '/../..' . '/src/Gateway/MolliePaymentGatewayI.php',
     317        'Mollie\\WooCommerce\\Gateway\\MolliePaymentGatewayHandler' => __DIR__ . '/../..' . '/src/Gateway/MolliePaymentGatewayHandler.php',
    270318        'Mollie\\WooCommerce\\Gateway\\OrderMandatoryGatewayDisabler' => __DIR__ . '/../..' . '/src/Gateway/OrderMandatoryGatewayDisabler.php',
     319        'Mollie\\WooCommerce\\Gateway\\Refund\\OrderItemsRefunder' => __DIR__ . '/../..' . '/src/Gateway/Refund/OrderItemsRefunder.php',
     320        'Mollie\\WooCommerce\\Gateway\\Refund\\OrderLineStatus' => __DIR__ . '/../..' . '/src/Gateway/Refund/OrderLineStatus.php',
     321        'Mollie\\WooCommerce\\Gateway\\Refund\\PartialRefundException' => __DIR__ . '/../..' . '/src/Gateway/Refund/PartialRefundException.php',
     322        'Mollie\\WooCommerce\\Gateway\\Refund\\RefundLineItemsBuilder' => __DIR__ . '/../..' . '/src/Gateway/Refund/RefundLineItemsBuilder.php',
     323        'Mollie\\WooCommerce\\Gateway\\Refund\\RefundProcessor' => __DIR__ . '/../..' . '/src/Gateway/Refund/RefundProcessor.php',
    271324        'Mollie\\WooCommerce\\Gateway\\Surcharge' => __DIR__ . '/../..' . '/src/Gateway/Surcharge.php',
    272325        'Mollie\\WooCommerce\\Gateway\\Voucher\\MaybeDisableGateway' => __DIR__ . '/../..' . '/src/Gateway/Voucher/MaybeDisableGateway.php',
    … …  
    306359        'Mollie\\WooCommerce\\PaymentMethods\\Giropay' => __DIR__ . '/../..' . '/src/PaymentMethods/Giropay.php',
    307360        'Mollie\\WooCommerce\\PaymentMethods\\IconFactory' => __DIR__ . '/../..' . '/src/PaymentMethods/IconFactory.php',
     361        'Mollie\\WooCommerce\\PaymentMethods\\Icon\\GatewayIconsRenderer' => __DIR__ . '/../..' . '/src/PaymentMethods/Icon/GatewayIconsRenderer.php',
    308362        'Mollie\\WooCommerce\\PaymentMethods\\Ideal' => __DIR__ . '/../..' . '/src/PaymentMethods/Ideal.php',
    309363        'Mollie\\WooCommerce\\PaymentMethods\\In3' => __DIR__ . '/../..' . '/src/PaymentMethods/In3.php',
    … …  
    317371        'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\InstructionStrategyI' => __DIR__ . '/../..' . '/src/PaymentMethods/InstructionStrategies/InstructionStrategyI.php',
    318372        'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\MybankInstructionStrategy' => __DIR__ . '/../..' . '/src/PaymentMethods/InstructionStrategies/MybankInstructionStrategy.php',
     373        'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\OrderInstructionsManager' => __DIR__ . '/../..' . '/src/PaymentMethods/InstructionStrategies/OrderInstructionsManager.php',
    319374        'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\PaypalInstructionStrategy' => __DIR__ . '/../..' . '/src/PaymentMethods/InstructionStrategies/PaypalInstructionStrategy.php',
    320375        'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\Przelewy24InstructionStrategy' => __DIR__ . '/../..' . '/src/PaymentMethods/InstructionStrategies/Przelewy24InstructionStrategy.php',
    … …  
    330385        'Mollie\\WooCommerce\\PaymentMethods\\Paybybank' => __DIR__ . '/../..' . '/src/PaymentMethods/Paybybank.php',
    331386        'Mollie\\WooCommerce\\PaymentMethods\\Payconiq' => __DIR__ . '/../..' . '/src/PaymentMethods/Payconiq.php',
     387        'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\AbstractPaymentFieldsRenderer' => __DIR__ . '/../..' . '/src/PaymentMethods/PaymentFieldsStrategies/AbstractPaymentFieldsRenderer.php',
    332388        'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\BancomatpayFieldsStrategy' => __DIR__ . '/../..' . '/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php',
    333389        'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\BillieFieldsStrategy' => __DIR__ . '/../..' . '/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php',
    … …  
    338394        'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\IssuersDropdownBehavior' => __DIR__ . '/../..' . '/src/PaymentMethods/PaymentFieldsStrategies/IssuersDropdownBehavior.php',
    339395        'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\KbcFieldsStrategy' => __DIR__ . '/../..' . '/src/PaymentMethods/PaymentFieldsStrategies/KbcFieldsStrategy.php',
     396        'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\NoopPaymentFieldsRenderer' => __DIR__ . '/../..' . '/src/PaymentMethods/PaymentFieldsStrategies/NoopPaymentFieldsRenderer.php',
    340397        'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\PaymentFieldsStrategiesTrait' => __DIR__ . '/../..' . '/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategiesTrait.php',
    341398        'Mollie\\WooCommerce\\PaymentMethods\\PaymentFieldsStrategies\\PaymentFieldsStrategyI' => __DIR__ . '/../..' . '/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategyI.php',
    … …  
    361418        'Mollie\\WooCommerce\\Payment\\MolliePayment' => __DIR__ . '/../..' . '/src/Payment/MolliePayment.php',
    362419        'Mollie\\WooCommerce\\Payment\\MollieSubscription' => __DIR__ . '/../..' . '/src/Payment/MollieSubscription.php',
    363         'Mollie\\WooCommerce\\Payment\\OrderInstructionsService' => __DIR__ . '/../..' . '/src/Payment/OrderInstructionsService.php',
    364         'Mollie\\WooCommerce\\Payment\\OrderItemsRefunder' => __DIR__ . '/../..' . '/src/Payment/OrderItemsRefunder.php',
    365         'Mollie\\WooCommerce\\Payment\\OrderLineStatus' => __DIR__ . '/../..' . '/src/Payment/OrderLineStatus.php',
    366420        'Mollie\\WooCommerce\\Payment\\OrderLines' => __DIR__ . '/../..' . '/src/Payment/OrderLines.php',
    367         'Mollie\\WooCommerce\\Payment\\PartialRefundException' => __DIR__ . '/../..' . '/src/Payment/PartialRefundException.php',
    368421        'Mollie\\WooCommerce\\Payment\\PaymentCheckoutRedirectService' => __DIR__ . '/../..' . '/src/Payment/PaymentCheckoutRedirectService.php',
    369422        'Mollie\\WooCommerce\\Payment\\PaymentFactory' => __DIR__ . '/../..' . '/src/Payment/PaymentFactory.php',
    370         'Mollie\\WooCommerce\\Payment\\PaymentFieldsService' => __DIR__ . '/../..' . '/src/Payment/PaymentFieldsService.php',
     423        'Mollie\\WooCommerce\\Payment\\PaymentLines' => __DIR__ . '/../..' . '/src/Payment/PaymentLines.php',
    371424        'Mollie\\WooCommerce\\Payment\\PaymentModule' => __DIR__ . '/../..' . '/src/Payment/PaymentModule.php',
    372         'Mollie\\WooCommerce\\Payment\\PaymentService' => __DIR__ . '/../..' . '/src/Payment/PaymentService.php',
    373         'Mollie\\WooCommerce\\Payment\\RefundLineItemsBuilder' => __DIR__ . '/../..' . '/src/Payment/RefundLineItemsBuilder.php',
     425        'Mollie\\WooCommerce\\Payment\\PaymentProcessor' => __DIR__ . '/../..' . '/src/Payment/PaymentProcessor.php',
     426        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\AddCustomRequestFieldsMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/AddCustomRequestFieldsMiddleware.php',
     427        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\AddSequenceTypeForSubscriptionsMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/AddSequenceTypeForSubscriptionsMiddleware.php',
     428        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\AddressMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/AddressMiddleware.php',
     429        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\ApplePayTokenMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/ApplePayTokenMiddleware.php',
     430        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\CaptureModeMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/CaptureModeMiddleware.php',
     431        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\CardTokenMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/CardTokenMiddleware.php',
     432        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\CustomerBirthdateMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/CustomerBirthdateMiddleware.php',
     433        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\MiddlewareHandler' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/MiddlewareHandler.php',
     434        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\OrderLinesMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/OrderLinesMiddleware.php',
     435        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\PaymentDescriptionMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/PaymentDescriptionMiddleware.php',
     436        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\RequestMiddlewareInterface' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/RequestMiddlewareInterface.php',
     437        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\SelectedIssuerMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/SelectedIssuerMiddleware.php',
     438        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\StoreCustomerMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/StoreCustomerMiddleware.php',
     439        'Mollie\\WooCommerce\\Payment\\Request\\Middleware\\UrlMiddleware' => __DIR__ . '/../..' . '/src/Payment/Request/Middleware/UrlMiddleware.php',
     440        'Mollie\\WooCommerce\\Payment\\Request\\RequestFactory' => __DIR__ . '/../..' . '/src/Payment/Request/RequestFactory.php',
     441        'Mollie\\WooCommerce\\Payment\\Request\\Strategies\\OrderRequestStrategy' => __DIR__ . '/../..' . '/src/Payment/Request/Strategies/OrderRequestStrategy.php',
     442        'Mollie\\WooCommerce\\Payment\\Request\\Strategies\\PaymentRequestStrategy' => __DIR__ . '/../..' . '/src/Payment/Request/Strategies/PaymentRequestStrategy.php',
     443        'Mollie\\WooCommerce\\Payment\\Request\\Strategies\\RequestStrategyInterface' => __DIR__ . '/../..' . '/src/Payment/Request/Strategies/RequestStrategyInterface.php',
    374444        'Mollie\\WooCommerce\\SDK\\Api' => __DIR__ . '/../..' . '/src/SDK/Api.php',
    375445        'Mollie\\WooCommerce\\SDK\\CouldNotConnectToMollie' => __DIR__ . '/../..' . '/src/SDK/CouldNotConnectToMollie.php',
    … …  
    381451        'Mollie\\WooCommerce\\SDK\\WordPressHttpAdapterPicker' => __DIR__ . '/../..' . '/src/SDK/WordPressHttpAdapterPicker.php',
    382452        'Mollie\\WooCommerce\\Settings\\General\\MollieGeneralSettings' => __DIR__ . '/../..' . '/src/Settings/General/MollieGeneralSettings.php',
     453        'Mollie\\WooCommerce\\Settings\\General\\MultiCountrySettingsField' => __DIR__ . '/../..' . '/src/Settings/General/MultiCountrySettingsField.php',
    383454        'Mollie\\WooCommerce\\Settings\\MollieSettingsPage' => __DIR__ . '/../..' . '/src/Settings/MollieSettingsPage.php',
    384455        'Mollie\\WooCommerce\\Settings\\Page\\AbstractPage' => __DIR__ . '/../..' . '/src/Settings/Page/AbstractPage.php',
    … …  
    407478        'Mollie\\WooCommerce\\Shared\\SharedModule' => __DIR__ . '/../..' . '/src/Shared/SharedModule.php',
    408479        'Mollie\\WooCommerce\\Shared\\Status' => __DIR__ . '/../..' . '/src/Shared/Status.php',
    409         'Mollie\\WooCommerce\\Subscription\\MaybeFixSubscription' => __DIR__ . '/../..' . '/src/Subscription/MaybeFixSubscription.php',
    410         'Mollie\\WooCommerce\\Subscription\\MollieSepaRecurringGateway' => __DIR__ . '/../..' . '/src/Subscription/MollieSepaRecurringGateway.php',
    411         'Mollie\\WooCommerce\\Subscription\\MollieSubscriptionGateway' => __DIR__ . '/../..' . '/src/Subscription/MollieSubscriptionGateway.php',
     480        'Mollie\\WooCommerce\\Subscription\\MollieSepaRecurringGatewayHandler' => __DIR__ . '/../..' . '/src/Subscription/MollieSepaRecurringGatewayHandler.php',
     481        'Mollie\\WooCommerce\\Subscription\\MollieSubscriptionGatewayHandler' => __DIR__ . '/../..' . '/src/Subscription/MollieSubscriptionGatewayHandler.php',
    412482        'Mollie\\WooCommerce\\Subscription\\SubscriptionModule' => __DIR__ . '/../..' . '/src/Subscription/SubscriptionModule.php',
    413483        'Mollie\\WooCommerce\\Uninstall\\CleanDb' => __DIR__ . '/../..' . '/src/Uninstall/CleanDb.php',
    … …  
    418488    {
    419489        return \Closure::bind(function () use ($loader) {
    420             $loader->prefixLengthsPsr4 = ComposerStaticInitc0778a800f6c5eb39482522e8993a1d5::$prefixLengthsPsr4;
    421             $loader->prefixDirsPsr4 = ComposerStaticInitc0778a800f6c5eb39482522e8993a1d5::$prefixDirsPsr4;
    422             $loader->classMap = ComposerStaticInitc0778a800f6c5eb39482522e8993a1d5::$classMap;
     490            $loader->prefixLengthsPsr4 = ComposerStaticInitb1e8936703aa6cff296fa891dd9ccf25::$prefixLengthsPsr4;
     491            $loader->prefixDirsPsr4 = ComposerStaticInitb1e8936703aa6cff296fa891dd9ccf25::$prefixDirsPsr4;
     492            $loader->classMap = ComposerStaticInitb1e8936703aa6cff296fa891dd9ccf25::$classMap;
    423493
    424494        }, null, ClassLoader::class);

  • mollie-payments-for-woocommerce/trunk/vendor/composer/ca-bundle/res/cacert.pem

    r3226701 r3262577  
    22## Bundle of CA Root Certificates
    33##
    4 ## Certificate data from Mozilla as of: Tue Nov 26 13:58:25 2024 GMT
     4## Certificate data from Mozilla as of: Tue Dec 31 04:12:05 2024 GMT
    55##
    66## Find updated versions here: https://curl.se/docs/caextract.html
    … …  
    1717##
    1818## Conversion done with mk-ca-bundle.pl version 1.29.
    19 ## SHA256: 36105b01631f9fc03b1eca779b44a30a1a5890b9bf8dc07ccb001a07301e01cf
     19## SHA256: c99d6d3f8d3d4e47719ba2b648992f5b58b150128d3aca3c05c566d8dc98e116
    2020##
    2121
    … …  
    583583NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
    584584dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
    585 -----END CERTIFICATE-----
    586 
    587 SecureSign RootCA11
    588 ===================
    589 -----BEGIN CERTIFICATE-----
    590 MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
    591 SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
    592 b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
    593 KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
    594 cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
    595 TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
    596 wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
    597 g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
    598 O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
    599 bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
    600 t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
    601 OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
    602 bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
    603 Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
    604 y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
    605 lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
    606585-----END CERTIFICATE-----
    607586
    … …  
    23202299-----END CERTIFICATE-----
    23212300
    2322 Entrust Root Certification Authority - G4
    2323 =========================================
    2324 -----BEGIN CERTIFICATE-----
    2325 MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAwgb4xCzAJBgNV
    2326 BAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3Qu
    2327 bmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1
    2328 dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1
    2329 dGhvcml0eSAtIEc0MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYT
    2330 AlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
    2331 L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhv
    2332 cml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhv
    2333 cml0eSAtIEc0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3D
    2334 umSXbcr3DbVZwbPLqGgZ2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV
    2335 3imz/f3ET+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j5pds
    2336 8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAMC1rlLAHGVK/XqsEQ
    2337 e9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73TDtTUXm6Hnmo9RR3RXRv06QqsYJn7
    2338 ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNXwbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5X
    2339 xNMhIWNlUpEbsZmOeX7m640A2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV
    2340 7rtNOzK+mndmnqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
    2341 dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwlN4y6mACXi0mW
    2342 Hv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNjc0kCAwEAAaNCMEAwDwYDVR0T
    2343 AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9n
    2344 MA0GCSqGSIb3DQEBCwUAA4ICAQAS5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4Q
    2345 jbRaZIxowLByQzTSGwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht
    2346 7LGrhFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/B7NTeLUK
    2347 YvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uIAeV8KEsD+UmDfLJ/fOPt
    2348 jqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbwH5Lk6rWS02FREAutp9lfx1/cH6NcjKF+
    2349 m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKW
    2350 RGhXxNUzzxkvFMSUHHuk2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjA
    2351 JOgc47OlIQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk5F6G
    2352 +TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuYn/PIjhs4ViFqUZPT
    2353 kcpG2om3PVODLAgfi49T3f+sHw==
    2354 -----END CERTIFICATE-----
    2355 
    23562301Microsoft ECC Root Certificate Authority 2017
    23572302=============================================
    … …  
    31713116-----END CERTIFICATE-----
    31723117
    3173 Security Communication RootCA3
    3174 ==============================
    3175 -----BEGIN CERTIFICATE-----
    3176 MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNVBAYTAkpQMSUw
    3177 IwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQDEx5TZWN1cml0eSBD
    3178 b21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQsw
    3179 CQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UE
    3180 AxMeU2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
    3181 MIICCgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4rCmDvu20r
    3182 hvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzAlrenfna84xtSGc4RHwsE
    3183 NPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MGTfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2
    3184 /D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF79+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGm
    3185 npjKIG58u4iFW/vAEGK78vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtY
    3186 XLVqAvO4g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3weGVPK
    3187 p7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst+3A7caoreyYn8xrC
    3188 3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M0V9hvqG8OmpI6iZVIhZdXw3/JzOf
    3189 GAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQT9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0Vcw
    3190 CBEF/VfR2ccCAwEAAaNCMEAwHQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB
    3191 /wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
    3192 YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PAFNr0Y/Dq9HHu
    3193 Tofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd9XbXv8S2gVj/yP9kaWJ5rW4O
    3194 H3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQIUYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASx
    3195 YfQAW0q3nHE3GYV5v4GwxxMOdnE+OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZ
    3196 XSEIx2C/pHF7uNkegr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml
    3197 +LLfiAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUVnuiZIesn
    3198 KwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD2NCcnWXL0CsnMQMeNuE9
    3199 dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm
    3200 6Vwdp6POXiUyK+OVrCoHzrQoeIY8LaadTdJ0MN1kURXbg4NR16/9M51NZg==
    3201 -----END CERTIFICATE-----
    3202 
    32033118Security Communication ECC RootCA1
    32043119==================================

  • mollie-payments-for-woocommerce/trunk/vendor/composer/installed.json

    r3226701 r3262577  
    33        {
    44            "name": "composer\/ca-bundle",
    5             "version": "1.5.4",
    6             "version_normalized": "1.5.4.0",
     5            "version": "1.5.5",
     6            "version_normalized": "1.5.5.0",
    77            "source": {
    88                "type": "git",
    99                "url": "https:\/\/github.com\/composer\/ca-bundle.git",
    10                 "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1"
    11             },
    12             "dist": {
    13                 "type": "zip",
    14                 "url": "https:\/\/api.github.com\/repos\/composer\/ca-bundle\/zipball\/bc0593537a463e55cadf45fd938d23b75095b7e1",
    15                 "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1",
     10                "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6"
     11            },
     12            "dist": {
     13                "type": "zip",
     14                "url": "https:\/\/api.github.com\/repos\/composer\/ca-bundle\/zipball\/08c50d5ec4c6ced7d0271d2862dec8c1033283e6",
     15                "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6",
    1616                "shasum": ""
    1717            },
    … …  
    2727                "symfony\/process": "^4.0 || ^5.0 || ^6.0 || ^7.0"
    2828            },
    29             "time": "2024-11-27T15:35:25+00:00",
     29            "time": "2025-01-08T16:17:16+00:00",
    3030            "type": "library",
    3131            "extra": {
    … …  
    6262                "irc": "irc:\/\/irc.freenode.org\/composer",
    6363                "issues": "https:\/\/github.com\/composer\/ca-bundle\/issues",
    64                 "source": "https:\/\/github.com\/composer\/ca-bundle\/tree\/1.5.4"
     64                "source": "https:\/\/github.com\/composer\/ca-bundle\/tree\/1.5.5"
    6565            },
    6666            "funding": [
    … …  
    7979            ],
    8080            "install-path": ".\/ca-bundle"
     81        },
     82        {
     83            "name": "dhii\/services",
     84            "version": "v0.1.0",
     85            "version_normalized": "0.1.0.0",
     86            "source": {
     87                "type": "git",
     88                "url": "https:\/\/github.com\/Dhii\/services.git",
     89                "reference": "09cad8199a59d2003ad19126213075aefecaf17b"
     90            },
     91            "dist": {
     92                "type": "zip",
     93                "url": "https:\/\/api.github.com\/repos\/Dhii\/services\/zipball\/09cad8199a59d2003ad19126213075aefecaf17b",
     94                "reference": "09cad8199a59d2003ad19126213075aefecaf17b",
     95                "shasum": ""
     96            },
     97            "require": {
     98                "php": "^7.1 | ^8.0",
     99                "psr\/container": "^1.0"
     100            },
     101            "require-dev": {
     102                "codeclimate\/php-test-reporter": "<=0.3.2",
     103                "phpunit\/phpunit": "^7.0 | ^8.0 | ^9.0",
     104                "slevomat\/coding-standard": "^6.0",
     105                "vimeo\/psalm": "^4.0"
     106            },
     107            "time": "2022-01-06T14:57:20+00:00",
     108            "type": "library",
     109            "installation-source": "dist",
     110            "autoload": {
     111                "psr-4": {
     112                    "Mollie\\Dhii\\Services\\": "src"
     113                }
     114            },
     115            "notification-url": "https:\/\/packagist.org\/downloads\/",
     116            "license": [
     117                "MIT"
     118            ],
     119            "authors": [
     120                {
     121                    "name": "Dhii Team",
     122                    "email": "[email protected]"
     123                }
     124            ],
     125            "description": "A collection of useful DI service implementations.",
     126            "support": {
     127                "issues": "https:\/\/github.com\/Dhii\/services\/issues",
     128                "source": "https:\/\/github.com\/Dhii\/services\/tree\/v0.1.0"
     129            },
     130            "install-path": "..\/dhii\/services"
    81131        },
    82132        {
    … …  
    143193        {
    144194            "name": "mollie\/mollie-api-php",
    145             "version": "v2.76.0",
    146             "version_normalized": "2.76.0.0",
     195            "version": "v2.76.1",
     196            "version_normalized": "2.76.1.0",
    147197            "source": {
    148198                "type": "git",
    149199                "url": "https:\/\/github.com\/mollie\/mollie-api-php.git",
    150                 "reference": "b6e9848e4893d1d306fba54da3ac6f4a31a40368"
    151             },
    152             "dist": {
    153                 "type": "zip",
    154                 "url": "https:\/\/api.github.com\/repos\/mollie\/mollie-api-php\/zipball\/b6e9848e4893d1d306fba54da3ac6f4a31a40368",
    155                 "reference": "b6e9848e4893d1d306fba54da3ac6f4a31a40368",
     200                "reference": "2a90a9224e6dcc25569e572edfe57ba75455e435"
     201            },
     202            "dist": {
     203                "type": "zip",
     204                "url": "https:\/\/api.github.com\/repos\/mollie\/mollie-api-php\/zipball\/2a90a9224e6dcc25569e572edfe57ba75455e435",
     205                "reference": "2a90a9224e6dcc25569e572edfe57ba75455e435",
    156206                "shasum": ""
    157207            },
    … …  
    173223                "mollie\/oauth2-mollie-php": "Use OAuth to authenticate with the Mollie API. This is needed for some endpoints. Visit https:\/\/docs.mollie.com\/ for more information."
    174224            },
    175             "time": "2024-12-18T12:26:03+00:00",
     225            "time": "2025-01-24T14:59:44+00:00",
    176226            "type": "library",
    177227            "installation-source": "dist",
    … …  
    232282            "support": {
    233283                "issues": "https:\/\/github.com\/mollie\/mollie-api-php\/issues",
    234                 "source": "https:\/\/github.com\/mollie\/mollie-api-php\/tree\/v2.76.0"
     284                "source": "https:\/\/github.com\/mollie\/mollie-api-php\/tree\/v2.76.1"
    235285            },
    236286            "install-path": "..\/mollie\/mollie-api-php"

  • mollie-payments-for-woocommerce/trunk/vendor/composer/installed.php

    r3242448 r3262577  
    33namespace Mollie;
    44
    5 return array('root' => array('name' => 'mollie/mollie-woocommerce', 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', 'reference' => '4c05485f591d8cdba6a58fd5a9982b258649e4c2', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev' => \false), 'versions' => array('composer/ca-bundle' => array('pretty_version' => '1.5.4', 'version' => '1.5.4.0', 'reference' => 'bc0593537a463e55cadf45fd938d23b75095b7e1', 'type' => 'library', 'install_path' => __DIR__ . '/./ca-bundle', 'aliases' => array(), 'dev_requirement' => \false), 'inpsyde/modularity' => array('pretty_version' => '1.11.0', 'version' => '1.11.0.0', 'reference' => 'c79bb3682f55e1a2ece67f36e70d04fa2ab8c65d', 'type' => 'library', 'install_path' => __DIR__ . '/../inpsyde/modularity', 'aliases' => array(), 'dev_requirement' => \false), 'mollie/mollie-api-php' => array('pretty_version' => 'v2.76.0', 'version' => '2.76.0.0', 'reference' => 'b6e9848e4893d1d306fba54da3ac6f4a31a40368', 'type' => 'library', 'install_path' => __DIR__ . '/../mollie/mollie-api-php', 'aliases' => array(), 'dev_requirement' => \false), 'mollie/mollie-woocommerce' => array('pretty_version' => 'dev-develop', 'version' => 'dev-develop', 'reference' => '4c05485f591d8cdba6a58fd5a9982b258649e4c2', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev_requirement' => \false), 'psr/container' => array('pretty_version' => '1.1.0', 'version' => '1.1.0.0', 'reference' => '9fc7aab7a78057a124384358ebae8a1711b6f6fc', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/container', 'aliases' => array(), 'dev_requirement' => \false), 'psr/log' => array('pretty_version' => '1.1.4', 'version' => '1.1.4.0', 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/log', 'aliases' => array(), 'dev_requirement' => \false), 'sniccowp/php-scoper-wordpress-excludes' => array('pretty_version' => '6.7.1', 'version' => '6.7.1.0', 'reference' => 'd8e6b5fdc9e42300a8ab18b44b775836a7b52363', 'type' => 'library', 'install_path' => __DIR__ . '/../sniccowp/php-scoper-wordpress-excludes', 'aliases' => array(), 'dev_requirement' => \false)));
     5return array('root' => array('name' => 'mollie/mollie-woocommerce', 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', 'reference' => 'f04128ceada3f2294561dce9cc3caa9722c4fbb1', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev' => \false), 'versions' => array('composer/ca-bundle' => array('pretty_version' => '1.5.5', 'version' => '1.5.5.0', 'reference' => '08c50d5ec4c6ced7d0271d2862dec8c1033283e6', 'type' => 'library', 'install_path' => __DIR__ . '/./ca-bundle', 'aliases' => array(), 'dev_requirement' => \false), 'dhii/services' => array('pretty_version' => 'v0.1.0', 'version' => '0.1.0.0', 'reference' => '09cad8199a59d2003ad19126213075aefecaf17b', 'type' => 'library', 'install_path' => __DIR__ . '/../dhii/services', 'aliases' => array(), 'dev_requirement' => \false), 'inpsyde/modularity' => array('pretty_version' => '1.11.0', 'version' => '1.11.0.0', 'reference' => 'c79bb3682f55e1a2ece67f36e70d04fa2ab8c65d', 'type' => 'library', 'install_path' => __DIR__ . '/../inpsyde/modularity', 'aliases' => array(), 'dev_requirement' => \false), 'mollie/mollie-api-php' => array('pretty_version' => 'v2.76.1', 'version' => '2.76.1.0', 'reference' => '2a90a9224e6dcc25569e572edfe57ba75455e435', 'type' => 'library', 'install_path' => __DIR__ . '/../mollie/mollie-api-php', 'aliases' => array(), 'dev_requirement' => \false), 'mollie/mollie-woocommerce' => array('pretty_version' => 'dev-develop', 'version' => 'dev-develop', 'reference' => 'f04128ceada3f2294561dce9cc3caa9722c4fbb1', 'type' => 'wordpress-plugin', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev_requirement' => \false), 'psr/container' => array('pretty_version' => '1.1.0', 'version' => '1.1.0.0', 'reference' => '9fc7aab7a78057a124384358ebae8a1711b6f6fc', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/container', 'aliases' => array(), 'dev_requirement' => \false), 'psr/log' => array('pretty_version' => '1.1.4', 'version' => '1.1.4.0', 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/log', 'aliases' => array(), 'dev_requirement' => \false), 'sniccowp/php-scoper-wordpress-excludes' => array('pretty_version' => '6.7.1', 'version' => '6.7.1.0', 'reference' => 'd8e6b5fdc9e42300a8ab18b44b775836a7b52363', 'type' => 'library', 'install_path' => __DIR__ . '/../sniccowp/php-scoper-wordpress-excludes', 'aliases' => array(), 'dev_requirement' => \false)));

  • mollie-payments-for-woocommerce/trunk/vendor/mollie/mollie-api-php/src/Endpoints/CustomerEndpoint.php

    r3164004 r3262577  
    7676    {
    7777        if (empty($customerId) || strpos($customerId, self::RESOURCE_ID_PREFIX) !== 0) {
    78             throw new ApiException("Invalid order ID: '{$customerId}'. An order ID should start with '" . self::RESOURCE_ID_PREFIX . "'.");
     78            throw new ApiException("Invalid customer ID: '{$customerId}'. A customer ID should start with '" . self::RESOURCE_ID_PREFIX . "'.");
    7979        }
    8080        return parent::rest_update($customerId, $data);

  • mollie-payments-for-woocommerce/trunk/vendor/mollie/mollie-api-php/src/Endpoints/ProfileEndpoint.php

    r3164004 r3262577  
    8282    {
    8383        if (empty($profileId) || strpos($profileId, self::RESOURCE_ID_PREFIX) !== 0) {
    84             throw new ApiException("Invalid profile id: '{$profileId}'. An profile id should start with '" . self::RESOURCE_ID_PREFIX . "'.");
     84            throw new ApiException("Invalid profile ID: '{$profileId}'. A profile ID should start with '" . self::RESOURCE_ID_PREFIX . "'.");
    8585        }
    8686        return parent::rest_update($profileId, $data);

  • mollie-payments-for-woocommerce/trunk/vendor/mollie/mollie-api-php/src/Endpoints/ShipmentEndpoint.php

    r3164004 r3262577  
    111111    {
    112112        if (empty($shipmentId) || strpos($shipmentId, self::RESOURCE_ID_PREFIX) !== 0) {
    113             throw new ApiException("Invalid subscription ID: '{$shipmentId}'. An subscription ID should start with '" . self::RESOURCE_ID_PREFIX . "'.");
     113            throw new ApiException("Invalid shipment ID: '{$shipmentId}'. A shipment ID should start with '" . self::RESOURCE_ID_PREFIX . "'.");
    114114        }
    115115        $this->parentId = $orderId;

  • mollie-payments-for-woocommerce/trunk/vendor/mollie/mollie-api-php/src/Endpoints/SubscriptionEndpoint.php

    r3226701 r3262577  
    8282    {
    8383        if (empty($subscriptionId) || strpos($subscriptionId, self::RESOURCE_ID_PREFIX) !== 0) {
    84             throw new ApiException("Invalid subscription ID: '{$subscriptionId}'. An subscription ID should start with '" . self::RESOURCE_ID_PREFIX . "'.");
     84            throw new ApiException("Invalid subscription ID: '{$subscriptionId}'. A subscription ID should start with '" . self::RESOURCE_ID_PREFIX . "'.");
    8585        }
    8686        $this->parentId = $customerId;

  • mollie-payments-for-woocommerce/trunk/vendor/mollie/mollie-api-php/src/MollieApiClient.php

    r3226701 r3262577  
    5555     * Version of our client.
    5656     */
    57     public const CLIENT_VERSION = "2.76.0";
     57    public const CLIENT_VERSION = "2.76.1";
    5858    /**
    5959     * Endpoint of the remote API.
Note: See TracChangeset for help on using the changeset viewer.