From 2581fabfa28161a21e296f5383e5fd593e73663f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Sat, 25 Oct 2025 09:46:42 +0000 Subject: [PATCH 1/2] Fix typos again --- readme.txt | 6 +++--- .../scss/{unabledButton.scss => disabledButton.scss} | 0 src/Assets/AssetsModule.php | 10 +++++----- src/Payment/MollieOrderService.php | 2 +- src/Payment/Request/Middleware/AddressMiddleware.php | 6 +++--- src/Payment/Webhooks/RestApi.php | 2 +- src/PaymentMethods/Applepay.php | 4 ++-- src/PaymentMethods/Banktransfer.php | 4 ++-- src/PaymentMethods/Kbc.php | 4 ++-- src/PaymentMethods/Paypal.php | 4 ++-- src/PaymentMethods/Voucher.php | 4 ++-- ...yment_statuses_-_block_checkout_credit_card.spec.js | 2 +- tests/php/Functional/Payment/PaymentServiceTest.php | 4 ++-- webpack.config.js | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) rename resources/scss/{unabledButton.scss => disabledButton.scss} (100%) diff --git a/readme.txt b/readme.txt index 72d617dd0..37e4f3ed3 100644 --- a/readme.txt +++ b/readme.txt @@ -266,7 +266,7 @@ Automatic updates should work like a charm; as always though, ensure you backup * Fixed - Surcharge with percentage without max limit configured not working * Fixed - Potential fatal error with getCurrencyFromOrder * Fixed - Compatibility with FunnelKit Upsells -* Fixed - Deprectaion message on plugin uninstall +* Fixed - Deprecation message on plugin uninstall * Removed - unnecessary block checkout surcharge calculation * Removed - Obsolete code that checked if a payment method was exclusive to the Orders API @@ -376,7 +376,7 @@ Automatic updates should work like a charm; as always though, ensure you backup * Feature Flag - Initiative - Alma for WooCommerce Integration - under flag add_filter('inpsyde.feature-flags.mollie-woocommerce.alma_enabled', false); * Feature - Add WooCommerce as required plugin in header -* Fix - Display error for Apple Pay Validation Error in Woocommerce +* Fix - Display error for Apple Pay Validation Error in WooCommerce * Fix - TypeError when WooCommerce Analytics is disabled * Fix - In3 - payment successful with date in the future * Fix - Ensure Smooth Order Processing Despite Rounding Differences @@ -1134,7 +1134,7 @@ Starting with version 4.0, this plugin will require PHP 5.6. If you are using an * Fix - A new customerID was created for every new order where a payment method that supported recurring payments was selected * Fix - When plugin 2.8.0 was used with WooCommerce 2.6 or older, a fatal error would be shown on the return page (because of use of new WooCommerce 3.0 method) -* Fix - Some cancelled payments for cancelled orders where redirected to "Retry payment" instead of "Order received" page, see Github issue #166 +* Fix - Some cancelled payments for cancelled orders where redirected to "Retry payment" instead of "Order received" page, see GitHub issue #166 = 2.8.0 - 09/01/2018 = diff --git a/resources/scss/unabledButton.scss b/resources/scss/disabledButton.scss similarity index 100% rename from resources/scss/unabledButton.scss rename to resources/scss/disabledButton.scss diff --git a/src/Assets/AssetsModule.php b/src/Assets/AssetsModule.php index ff084679a..56fcef200 100644 --- a/src/Assets/AssetsModule.php +++ b/src/Assets/AssetsModule.php @@ -63,7 +63,7 @@ public function registerButtonsBlockScripts(string $pluginUrl, string $pluginPat ) ); $dataToScripts = new DataToPayPal($pluginUrl); - wp_enqueue_style('unabledButton'); + wp_enqueue_style('disabledButton'); wp_enqueue_script('mollie_paypalButtonBlock'); wp_localize_script( 'mollie_paypalButtonBlock', @@ -154,7 +154,7 @@ public function enqueuePayPalButtonScripts(string $pluginUrl): void return; } $dataToScripts = new DataToPayPal($pluginUrl); - wp_enqueue_style('unabledButton'); + wp_enqueue_style('disabledButton'); wp_enqueue_script('mollie_paypalButton'); wp_localize_script( 'mollie_paypalButton', @@ -168,7 +168,7 @@ public function enqueuePayPalButtonScripts(string $pluginUrl): void return; } $dataToScripts = new DataToPayPal($pluginUrl); - wp_enqueue_style('unabledButton'); + wp_enqueue_style('disabledButton'); wp_enqueue_script('mollie_paypalButtonCart'); wp_localize_script( 'mollie_paypalButtonCart', @@ -250,7 +250,7 @@ protected function registerFrontendScripts(string $pluginUrl, string $pluginPath true ); wp_register_style( - 'unabledButton', + 'disabledButton', $this->getPluginUrl($pluginUrl, '/public/css/unabledButton.min.css'), [], (string) filemtime($this->getPluginPath($pluginPath, '/public/css/unabledButton.min.css')), @@ -323,7 +323,7 @@ public function enqueueFrontendScripts($container) if (!$applePayGatewayEnabled || !$isAppleEnabledAtMollie) { return; } - wp_enqueue_style('unabledButton'); + wp_enqueue_style('disabledButton'); wp_enqueue_script('mollie_wc_gateway_applepay'); } diff --git a/src/Payment/MollieOrderService.php b/src/Payment/MollieOrderService.php index 3b01f22fe..c39305e38 100644 --- a/src/Payment/MollieOrderService.php +++ b/src/Payment/MollieOrderService.php @@ -99,7 +99,7 @@ public function onWebhookAction() if (! $orders) { $this->logger->debug(__METHOD__ . ': No orders found for transaction ID: ' . $transactionID . ' fall back to search in meta data'); - //Fallback search order in order mollie oder meta + //Fallback search order in order mollie order meta $orders = wc_get_orders([ 'limit' => 2, 'meta_key' => substr($transactionID, 0, 4) === 'ord_' ? '_mollie_order_id' : '_mollie_payment_id', diff --git a/src/Payment/Request/Middleware/AddressMiddleware.php b/src/Payment/Request/Middleware/AddressMiddleware.php index f5d7af055..24841b9f9 100644 --- a/src/Payment/Request/Middleware/AddressMiddleware.php +++ b/src/Payment/Request/Middleware/AddressMiddleware.php @@ -133,7 +133,7 @@ private function createBillingAddress(WC_Order $order): stdClass $phone = $this->getPhoneNumber($order); $billingAddress->phone = (ctype_space($phone)) ? null - : $this->getFormatedPhoneNumber($phone, $billingAddress->country); + : $this->getFormattedPhoneNumber($phone, $billingAddress->country); return $billingAddress; } @@ -205,7 +205,7 @@ private function createShippingAddress(WC_Order $order): stdClass $shippingPhone = $this->isPhoneValid($order->get_shipping_phone()) ? $order->get_shipping_phone() : ''; $shippingAddress->phone = (ctype_space($order->get_shipping_phone())) ? null - : $this->getFormatedPhoneNumber($shippingPhone, $shippingAddress->country); + : $this->getFormattedPhoneNumber($shippingPhone, $shippingAddress->country); return $shippingAddress; } @@ -263,7 +263,7 @@ private function getPostedPhoneNumber(WC_Order $order): string * @param string $phone The phone number. * @return string|null The formatted phone number. */ - protected function getFormatedPhoneNumber(string $phone, $countryCode): ?string + protected function getFormattedPhoneNumber(string $phone, $countryCode): ?string { //remove whitespaces and all non numerical characters except + $phone = preg_replace('/[^0-9+]+/', '', $phone); diff --git a/src/Payment/Webhooks/RestApi.php b/src/Payment/Webhooks/RestApi.php index 500070564..a33a6ad1f 100644 --- a/src/Payment/Webhooks/RestApi.php +++ b/src/Payment/Webhooks/RestApi.php @@ -78,7 +78,7 @@ public function callback(WP_REST_Request $request) if (! $orders) { $this->logger->debug(__METHOD__ . ': No orders found for transaction ID: ' . $transactionID . ' fall back to search in meta data'); - //Fallback search order in order mollie oder meta + //Fallback search order in order mollie order meta $orders = wc_get_orders([ 'limit' => 2, 'meta_key' => substr($transactionID, 0, 4) === 'ord_' ? '_mollie_order_id' : '_mollie_payment_id', diff --git a/src/PaymentMethods/Applepay.php b/src/PaymentMethods/Applepay.php index 9f72f330a..71163882d 100644 --- a/src/PaymentMethods/Applepay.php +++ b/src/PaymentMethods/Applepay.php @@ -67,7 +67,7 @@ public function getFormFields($generalFormFields): array $notice = []; } - $paymentMethodFormFieds = [ + $paymentMethodFormFields = [ 'mollie_apple_pay_button_enabled_cart' => [ 'title' => __('Enable Apple Pay Button on Cart page', 'mollie-payments-for-woocommerce'), 'desc' => __( @@ -93,6 +93,6 @@ public function getFormFields($generalFormFields): array 'default' => 'no', ], ]; - return array_merge($notice, $generalFormFields, $paymentMethodFormFieds); + return array_merge($notice, $generalFormFields, $paymentMethodFormFields); } } diff --git a/src/PaymentMethods/Banktransfer.php b/src/PaymentMethods/Banktransfer.php index 5f21cc38b..38a69029a 100644 --- a/src/PaymentMethods/Banktransfer.php +++ b/src/PaymentMethods/Banktransfer.php @@ -59,7 +59,7 @@ public function getFormFields($generalFormFields): array { unset($generalFormFields['activate_expiry_days_setting']); unset($generalFormFields['order_dueDate']); - $paymentMethodFormFieds = [ + $paymentMethodFormFields = [ 'activate_expiry_days_setting' => [ 'title' => __('Activate expiry time setting', 'mollie-payments-for-woocommerce'), 'label' => __('Enable expiry time for payments', 'mollie-payments-for-woocommerce'), @@ -87,7 +87,7 @@ public function getFormFields($generalFormFields): array 'default' => 'no', ], ]; - return array_merge($generalFormFields, $paymentMethodFormFieds); + return array_merge($generalFormFields, $paymentMethodFormFields); } public function filtersOnBuild() diff --git a/src/PaymentMethods/Kbc.php b/src/PaymentMethods/Kbc.php index 04943def9..204421ab5 100644 --- a/src/PaymentMethods/Kbc.php +++ b/src/PaymentMethods/Kbc.php @@ -44,7 +44,7 @@ public function getFormFields($generalFormFields): array $index = array_search($searchKey, $keys); $before = array_slice($generalFormFields, 0, $index + 1, true); $after = array_slice($generalFormFields, $index + 1, null, true); - $paymentMethodFormFieds = [ + $paymentMethodFormFields = [ 'issuers_dropdown_shown' => [ 'title' => __( 'Show KBC/CBC banks dropdown', @@ -76,7 +76,7 @@ public function getFormFields($generalFormFields): array 'default' => __('Select your bank', 'mollie-payments-for-woocommerce'), ], ]; - $before = array_merge($before, $paymentMethodFormFieds); + $before = array_merge($before, $paymentMethodFormFields); $formFields = array_merge($before, $after); return $formFields; } diff --git a/src/PaymentMethods/Paypal.php b/src/PaymentMethods/Paypal.php index 1bd4cd0d7..1974ad6ef 100644 --- a/src/PaymentMethods/Paypal.php +++ b/src/PaymentMethods/Paypal.php @@ -38,7 +38,7 @@ public function initializeTranslations(): void public function getFormFields($generalFormFields): array { - $paymentMethodFormFieds = [ + $paymentMethodFormFields = [ 'mollie_paypal_button_enabled_cart' => [ 'type' => 'checkbox', 'title' => __( @@ -90,7 +90,7 @@ public function getFormFields($generalFormFields): array 'desc_tip' => true, ], ]; - return array_merge($generalFormFields, $paymentMethodFormFieds); + return array_merge($generalFormFields, $paymentMethodFormFields); } private function buttonOptions(): array diff --git a/src/PaymentMethods/Voucher.php b/src/PaymentMethods/Voucher.php index 27a3e191b..8073311d0 100644 --- a/src/PaymentMethods/Voucher.php +++ b/src/PaymentMethods/Voucher.php @@ -118,7 +118,7 @@ public function initializeTranslations(): void public function getFormFields($generalFormFields): array { - $paymentMethodFormFieds = [ + $paymentMethodFormFields = [ 'mealvoucher_category_default' => [ 'title' => __('Select the default products categories', 'mollie-payments-for-woocommerce'), 'type' => 'multiselect', @@ -134,7 +134,7 @@ public function getFormFields($generalFormFields): array 'description' => __('In order to process it, all products in the order must have a category. This selector will assign the default categories for the shop products. If orders API is active only the first category will be used!', 'mollie-payments-for-woocommerce'), ], ]; - return array_merge($generalFormFields, $paymentMethodFormFieds); + return array_merge($generalFormFields, $paymentMethodFormFields); } /** diff --git a/tests/e2e/Transaction Scenarios/Payment statuses - Block Checkout/_transaction_scenarios_payment_statuses_-_block_checkout_credit_card.spec.js b/tests/e2e/Transaction Scenarios/Payment statuses - Block Checkout/_transaction_scenarios_payment_statuses_-_block_checkout_credit_card.spec.js index 35fc84406..893874e03 100644 --- a/tests/e2e/Transaction Scenarios/Payment statuses - Block Checkout/_transaction_scenarios_payment_statuses_-_block_checkout_credit_card.spec.js +++ b/tests/e2e/Transaction Scenarios/Payment statuses - Block Checkout/_transaction_scenarios_payment_statuses_-_block_checkout_credit_card.spec.js @@ -107,7 +107,7 @@ test.skip('Validate the submission of an order with Credit Card as payment metho //TestId-C420278 -test.skip('Validate the submission of an order with Credit Card (no 3D secure) as payment method using Mollie Components on block chcekout', async ({ page}) => { +test.skip('Validate the submission of an order with Credit Card (no 3D secure) as payment method using Mollie Components on block checkout', async ({ page}) => { // Your code here... }); diff --git a/tests/php/Functional/Payment/PaymentServiceTest.php b/tests/php/Functional/Payment/PaymentServiceTest.php index ff839dc1d..ac25700b6 100644 --- a/tests/php/Functional/Payment/PaymentServiceTest.php +++ b/tests/php/Functional/Payment/PaymentServiceTest.php @@ -175,7 +175,7 @@ public function processAsMollieOrder_BailsIf_FraudException() $wcOrderId = 1; $wcOrderKey = 'wc_order_hxZniP1zDcnM8'; $wcOrder = $this->wcOrder($wcOrderId, $wcOrderKey); - $cusomerId = 1; + $customerId = 1; $apiKey = 'test_test'; $method = new \ReflectionMethod(PaymentProcessor::class, 'processAsMollieOrder'); $method->setAccessible(true); @@ -186,7 +186,7 @@ public function processAsMollieOrder_BailsIf_FraudException() $testee, $this->helperMocks->mollieOrderMock(), $wcOrder, - $cusomerId, + $customerId, $apiKey ); } diff --git a/webpack.config.js b/webpack.config.js index c461bd7dc..df76f6584 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -61,7 +61,7 @@ module.exports = (env = {}, argv = {}) => { entry: { 'mollie-components.min': './resources/scss/mollie-components.scss', 'mollie-gateway-icons.min': './resources/scss/mollie-gateway-icons.scss', - 'unabledButton.min': './resources/scss/unabledButton.scss', + 'disabledButton.min': './resources/scss/unabledButton.scss', 'mollie-applepaydirect.min': './resources/scss/mollie-applepaydirect.scss', 'mollie-block-custom-field.min': './resources/scss/mollie-block-custom-field.scss', }, From 3a6a6bb1c16c5d51c9df8fa7e351ece56e1894b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Sat, 25 Oct 2025 09:48:37 +0000 Subject: [PATCH 2/2] Fix more "unabled" --- src/Assets/AssetsModule.php | 4 ++-- webpack.config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Assets/AssetsModule.php b/src/Assets/AssetsModule.php index 56fcef200..237cc672a 100644 --- a/src/Assets/AssetsModule.php +++ b/src/Assets/AssetsModule.php @@ -251,9 +251,9 @@ protected function registerFrontendScripts(string $pluginUrl, string $pluginPath ); wp_register_style( 'disabledButton', - $this->getPluginUrl($pluginUrl, '/public/css/unabledButton.min.css'), + $this->getPluginUrl($pluginUrl, '/public/css/disabledButton.min.css'), [], - (string) filemtime($this->getPluginPath($pluginPath, '/public/css/unabledButton.min.css')), + (string) filemtime($this->getPluginPath($pluginPath, '/public/css/disabledButton.min.css')), 'screen' ); wp_register_script( diff --git a/webpack.config.js b/webpack.config.js index df76f6584..95ab528f5 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -61,7 +61,7 @@ module.exports = (env = {}, argv = {}) => { entry: { 'mollie-components.min': './resources/scss/mollie-components.scss', 'mollie-gateway-icons.min': './resources/scss/mollie-gateway-icons.scss', - 'disabledButton.min': './resources/scss/unabledButton.scss', + 'disabledButton.min': './resources/scss/disabledButton.scss', 'mollie-applepaydirect.min': './resources/scss/mollie-applepaydirect.scss', 'mollie-block-custom-field.min': './resources/scss/mollie-block-custom-field.scss', },