Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 =

Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions src/Assets/AssetsModule.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -250,10 +250,10 @@ protected function registerFrontendScripts(string $pluginUrl, string $pluginPath
true
);
wp_register_style(
'unabledButton',
$this->getPluginUrl($pluginUrl, '/public/css/unabledButton.min.css'),
'disabledButton',
$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(
Expand Down Expand Up @@ -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');
}

Expand Down
2 changes: 1 addition & 1 deletion src/Payment/MollieOrderService.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 3 additions & 3 deletions src/Payment/Request/Middleware/AddressMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/Payment/Webhooks/RestApi.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/PaymentMethods/Applepay.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => __(
Expand All @@ -93,6 +93,6 @@ public function getFormFields($generalFormFields): array
'default' => 'no',
],
];
return array_merge($notice, $generalFormFields, $paymentMethodFormFieds);
return array_merge($notice, $generalFormFields, $paymentMethodFormFields);
}
}
4 changes: 2 additions & 2 deletions src/PaymentMethods/Banktransfer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -87,7 +87,7 @@ public function getFormFields($generalFormFields): array
'default' => 'no',
],
];
return array_merge($generalFormFields, $paymentMethodFormFieds);
return array_merge($generalFormFields, $paymentMethodFormFields);
}

public function filtersOnBuild()
Expand Down
4 changes: 2 additions & 2 deletions src/PaymentMethods/Kbc.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/PaymentMethods/Paypal.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function initializeTranslations(): void

public function getFormFields($generalFormFields): array
{
$paymentMethodFormFieds = [
$paymentMethodFormFields = [
'mollie_paypal_button_enabled_cart' => [
'type' => 'checkbox',
'title' => __(
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/PaymentMethods/Voucher.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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...
});

Expand Down
4 changes: 2 additions & 2 deletions tests/php/Functional/Payment/PaymentServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -186,7 +186,7 @@ public function processAsMollieOrder_BailsIf_FraudException()
$testee,
$this->helperMocks->mollieOrderMock(),
$wcOrder,
$cusomerId,
$customerId,
$apiKey
);
}
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/disabledButton.scss',
'mollie-applepaydirect.min': './resources/scss/mollie-applepaydirect.scss',
'mollie-block-custom-field.min': './resources/scss/mollie-block-custom-field.scss',
},
Expand Down