The modified request data.
+ */
+ public function __invoke(array $requestData, WC_Order $order, $context, $next): array
+ {
+ $gateway = wc_get_payment_gateway_by_order($order);
+ if ($gateway) {
+ $returnUrl = $gateway->get_return_url($order);
+ $returnUrl = $this->getReturnUrl($order, $returnUrl);
+ $webhookUrl = $this->getWebhookUrl($order, $gateway->id);
+
+ $requestData['redirectUrl'] = $returnUrl;
+ $requestData['webhookUrl'] = $webhookUrl;
+ }
+ return $next($requestData, $order, $context);
+ }
+
+ /**
+ * Get the URL to return to on Mollie return.
+ * Saves the return redirect and failed redirect, so we save the page language in case there is one set.
+ * For example 'http://mollie-wc.docker.myhost/wc-api/mollie_return/?order_id=89&key=wc_order_eFZyH8jki6fge'.
+ *
+ * @param WC_Order $order The order processed.
+ * @param string $returnUrl The base return URL.
+ * @return string The URL with order ID and key as params.
+ */
+ private function getReturnUrl(WC_Order $order, string $returnUrl): string
+ {
+ $returnUrl = untrailingslashit($returnUrl);
+ $returnUrl = $this->asciiDomainName($returnUrl);
+ $orderId = $order->get_id();
+ $orderKey = $order->get_order_key();
+
+ $onMollieReturn = 'onMollieReturn';
+ $returnUrl = $this->appendOrderArgumentsToUrl(
+ $orderId,
+ $orderKey,
+ $returnUrl,
+ $onMollieReturn
+ );
+ $returnUrl = untrailingslashit($returnUrl);
+ $this->logger->debug(" Order {$orderId} returnUrl: {$returnUrl}", [true]);
+
+ return apply_filters($this->pluginId . '_return_url', $returnUrl, $order);
+ }
+
+ /**
+ * Get the webhook URL.
+ * For example 'http://mollie-wc.docker.myhost/wc-api/mollie_return/mollie_wc_gateway_bancontact/?order_id=89&key=wc_order_eFZyH8jki6fge'.
+ *
+ * @param WC_Order $order The order processed.
+ * @param string $gatewayId The payment gateway ID.
+ * @return string The URL with gateway and order ID and key as params.
+ */
+ public function getWebhookUrl(WC_Order $order, string $gatewayId): string
+ {
+ $webhookUrl = WC()->api_request_url($gatewayId);
+ $webhookUrl = untrailingslashit($webhookUrl);
+ $webhookUrl = $this->asciiDomainName($webhookUrl);
+ $orderId = $order->get_id();
+ $orderKey = $order->get_order_key();
+ $webhookUrl = $this->appendOrderArgumentsToUrl(
+ $orderId,
+ $orderKey,
+ $webhookUrl
+ );
+ $webhookUrl = untrailingslashit($webhookUrl);
+
+ $this->logger->debug(" Order {$orderId} webhookUrl: {$webhookUrl}", [true]);
+
+ return apply_filters($this->pluginId . '_webhook_url', $webhookUrl, $order);
+ }
+
+ /**
+ * Convert the domain name in a URL to ASCII.
+ *
+ * @param string $url The URL to convert.
+ * @return string The URL with the domain name in ASCII.
+ */
+ protected function asciiDomainName(string $url): string
+ {
+ $parsed = wp_parse_url($url);
+ $scheme = isset($parsed['scheme']) ? $parsed['scheme'] : '';
+ $domain = isset($parsed['host']) ? $parsed['host'] : false;
+ $query = isset($parsed['query']) ? $parsed['query'] : '';
+ $path = isset($parsed['path']) ? $parsed['path'] : '';
+ if (!$domain) {
+ return $url;
+ }
+
+ if (function_exists('idn_to_ascii')) {
+ $domain = $this->idnEncodeDomain($domain);
+ $url = $scheme . "://" . $domain . $path . '?' . $query;
+ }
+
+ return $url;
+ }
+
+ /**
+ * Append order arguments to a URL.
+ *
+ * @param int $order_id The order ID.
+ * @param string $order_key The order key.
+ * @param string $webhook_url The base webhook URL.
+ * @param string $filterFlag An optional filter flag.
+ * @return string The URL with appended order arguments.
+ */
+ protected function appendOrderArgumentsToUrl(int $order_id, string $order_key, string $webhook_url, string $filterFlag = ''): string
+ {
+ $webhook_url = add_query_arg(
+ [
+ 'order_id' => $order_id,
+ 'key' => $order_key,
+ 'filter_flag' => $filterFlag,
+ ],
+ $webhook_url
+ );
+ return $webhook_url;
+ }
+
+ /**
+ * Encode a domain name to ASCII.
+ *
+ * @param string $domain The domain name to encode.
+ * @return string The encoded domain name.
+ */
+ protected function idnEncodeDomain(string $domain): string
+ {
+ if (
+ defined('IDNA_NONTRANSITIONAL_TO_ASCII')
+ && defined('INTL_IDNA_VARIANT_UTS46')
+ ) {
+ $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;
+ } else {
+ $domain = idn_to_ascii($domain) ? idn_to_ascii($domain) : $domain;
+ }
+ return $domain;
+ }
+}
diff --git a/src/Payment/Request/RequestFactory.php b/src/Payment/Request/RequestFactory.php
new file mode 100644
index 000000000..1f67f4ce7
--- /dev/null
+++ b/src/Payment/Request/RequestFactory.php
@@ -0,0 +1,54 @@
+container = $container;
+ }
+
+ /**
+ * Create a request based on the type.
+ *
+ * @param string $type The type of request ('order' or 'payment').
+ * @param WC_Order $order The WooCommerce order object.
+ * @param string|null $customerId The customer ID for the request.
+ * @return array The generated request data.
+ * @throws \InvalidArgumentException If the strategy for the given type is invalid.
+ */
+ public function createRequest(string $type, WC_Order $order, $customerId): array
+ {
+ // Use the container to fetch the appropriate strategy.
+ $serviceName = "request.strategy.{$type}";
+ $strategy = $this->container->get($serviceName);
+
+ if (!$strategy instanceof RequestStrategyInterface) {
+ throw new \InvalidArgumentException("Invalid strategy for type: {$type}");
+ }
+
+ return $strategy->createRequest($order, $customerId);
+ }
+}
diff --git a/src/Payment/Request/Strategies/OrderRequestStrategy.php b/src/Payment/Request/Strategies/OrderRequestStrategy.php
new file mode 100644
index 000000000..390c0fc55
--- /dev/null
+++ b/src/Payment/Request/Strategies/OrderRequestStrategy.php
@@ -0,0 +1,93 @@
+dataHelper = $dataHelper;
+ $this->settingsHelper = $settingsHelper;
+ $this->middlewareHandler = $middlewareHandler;
+ }
+
+ /**
+ * Create a payment request for the given order.
+ *
+ * @param WC_Order $order The order to create a request for.
+ * @param string $customerId The customer ID.
+ * @return array The request data.
+ */
+ public function createRequest(WC_Order $order, $customerId): array
+ {
+ $settingsHelper = $this->settingsHelper;
+
+ $gateway = wc_get_payment_gateway_by_order($order);
+
+ if (! $gateway || ! ( mollieWooCommerceIsMollieGateway($gateway->id) )) {
+ return [ 'result' => 'failure' ];
+ }
+
+ $methodId = substr($gateway->id, strrpos($gateway->id, '_') + 1);
+ $paymentLocale = $settingsHelper->getPaymentLocale();
+ $requestData = [
+ 'amount' => [
+ 'currency' => $this->dataHelper->getOrderCurrency($order),
+ 'value' => $this->dataHelper->formatCurrencyValue(
+ $order->get_total(),
+ $this->dataHelper->getOrderCurrency($order)
+ ),
+ ],
+ 'method' => $methodId,
+ 'locale' => $paymentLocale,
+ 'metadata' => apply_filters(
+ $this->dataHelper->getPluginId() . '_payment_object_metadata',
+ [
+ 'order_id' => $order->get_id(),
+ 'order_number' => $order->get_order_number(),
+ ]
+ ),
+ 'orderNumber' => $order->get_order_number(),
+ 'payment' => [
+ 'customerId' => $customerId,
+ ],
+ ];
+
+ $context = 'order';
+ return $this->middlewareHandler->handle($requestData, $order, $context);
+ }
+}
diff --git a/src/Payment/Request/Strategies/PaymentRequestStrategy.php b/src/Payment/Request/Strategies/PaymentRequestStrategy.php
new file mode 100644
index 000000000..749923e21
--- /dev/null
+++ b/src/Payment/Request/Strategies/PaymentRequestStrategy.php
@@ -0,0 +1,90 @@
+dataHelper = $dataHelper;
+ $this->settingsHelper = $settingsHelper;
+ $this->middlewareHandler = $middlewareHandler;
+ }
+
+ /**
+ * Create a payment request for the given order.
+ *
+ * @param WC_Order $order The order to create a request for.
+ * @param string $customerId The customer ID.
+ * @return array The request data.
+ */
+ public function createRequest(WC_Order $order, $customerId): array
+ {
+ $gateway = wc_get_payment_gateway_by_order($order);
+
+ if (!$gateway || !(mollieWooCommerceIsMollieGateway($gateway->id))) {
+ return ['result' => 'failure'];
+ }
+
+ $settingsHelper = $this->settingsHelper;
+ $methodId = substr($gateway->id, strrpos($gateway->id, '_') + 1);
+ $paymentLocale = $settingsHelper->getPaymentLocale();
+
+ $requestData = [
+ 'amount' => [
+ 'currency' => $this->dataHelper->getOrderCurrency($order),
+ 'value' => $this->dataHelper->formatCurrencyValue(
+ $order->get_total(),
+ $this->dataHelper->getOrderCurrency($order)
+ ),
+ ],
+ 'method' => $methodId,
+ 'locale' => $paymentLocale,
+ 'metadata' => apply_filters(
+ $this->dataHelper->getPluginId() . '_payment_object_metadata',
+ [
+ 'order_id' => $order->get_id(),
+ ]
+ ),
+ 'customerId' => $customerId,
+ ];
+
+ $context = 'payment';
+ return $this->middlewareHandler->handle($requestData, $order, $context);
+ }
+}
diff --git a/src/Payment/Request/Strategies/RequestStrategyInterface.php b/src/Payment/Request/Strategies/RequestStrategyInterface.php
new file mode 100644
index 000000000..631ecb75c
--- /dev/null
+++ b/src/Payment/Request/Strategies/RequestStrategyInterface.php
@@ -0,0 +1,24 @@
+ static function (ContainerInterface $container): MollieObject {
+ $logger = $container->get(Logger::class);
+ assert($logger instanceof Logger);
+ $data = $container->get('settings.data_helper');
+ assert($data instanceof Data);
+ $apiHelper = $container->get('SDK.api_helper');
+ assert($apiHelper instanceof Api);
+ $pluginId = $container->get('shared.plugin_id');
+ $paymentFactory = $container->get(PaymentFactory::class);
+ //assert($paymentFactory instanceof PaymentFactory);
+ $settingsHelper = $container->get('settings.settings_helper');
+ assert($settingsHelper instanceof Settings);
+ $requestFactory = $container->get(RequestFactory::class);
+ return new MollieObject($data, $logger, $paymentFactory, $apiHelper, $settingsHelper, $pluginId, $requestFactory);
+ },
+ OrderLines::class => static function (ContainerInterface $container): OrderLines {
+ $data = $container->get('settings.data_helper');
+ $pluginId = $container->get('shared.plugin_id');
+ return new OrderLines($data, $pluginId);
+ },
+
+ PaymentFactory::class => static function (ContainerInterface $container): PaymentFactory {
+ return new PaymentFactory(
+ static function () use ($container) {
+ return new MollieOrder(
+ $container->get(OrderItemsRefunder::class),
+ 'order',
+ $container->get('shared.plugin_id'),
+ $container->get('SDK.api_helper'),
+ $container->get('settings.settings_helper'),
+ $container->get('settings.data_helper'),
+ $container->get(Logger::class),
+ $container->get(OrderLines::class),
+ $container->get(RequestFactory::class)
+ );
+ },
+ static function () use ($container) {
+ return new MolliePayment(
+ 'payment',
+ $container->get('shared.plugin_id'),
+ $container->get('SDK.api_helper'),
+ $container->get('settings.settings_helper'),
+ $container->get('settings.data_helper'),
+ $container->get(Logger::class),
+ $container->get(RequestFactory::class)
+ );
+ }
+ );
+ },
+ RequestFactory::class => static function (ContainerInterface $container): RequestFactory {
+ return new RequestFactory($container);
+ },
+ CustomerBirthdateMiddleware::class => static function (ContainerInterface $container): CustomerBirthdateMiddleware {
+ return new CustomerBirthdateMiddleware($container->get('gateway.paymentMethods'));
+ },
+ ApplePayTokenMiddleware::class => static function (): ApplePayTokenMiddleware {
+ return new ApplePayTokenMiddleware();
+ },
+ CardTokenMiddleware::class => static function (): CardTokenMiddleware {
+ return new CardTokenMiddleware();
+ },
+ StoreCustomerMiddleware::class => static function (ContainerInterface $container): StoreCustomerMiddleware {
+ return new StoreCustomerMiddleware($container->get('settings.settings_helper'));
+ },
+ AddSequenceTypeForSubscriptionsMiddleware::class => static function (ContainerInterface $container): AddSequenceTypeForSubscriptionsMiddleware {
+ $dataHelper = $container->get('settings.data_helper');
+ $pluginId = $container->get('shared.plugin_id');
+ return new AddSequenceTypeForSubscriptionsMiddleware($dataHelper, $pluginId);
+ },
+ OrderLinesMiddleware::class => static function (ContainerInterface $container): OrderLinesMiddleware {
+ $orderLines = $container->get(OrderLines::class);
+ $voucherDefaultCategory = $container->get('voucher.defaultCategory');
+ return new OrderLinesMiddleware($orderLines, $voucherDefaultCategory);
+ },
+ AddressMiddleware::class => static function (): AddressMiddleware {
+ return new AddressMiddleware();
+ },
+ UrlMiddleware::class => static function (ContainerInterface $container): UrlMiddleware {
+ return new UrlMiddleware(
+ $container->get('shared.plugin_id'),
+ $container->get(Logger::class),
+ );
+ },
+ SelectedIssuerMiddleware::class => static function (ContainerInterface $container): SelectedIssuerMiddleware {
+ $pluginId = $container->get('shared.plugin_id');
+ return new SelectedIssuerMiddleware($pluginId);
+ },
+ PaymentDescriptionMiddleware::class => static function (ContainerInterface $container): PaymentDescriptionMiddleware {
+ $dataHelper = $container->get('settings.data_helper');
+ return new PaymentDescriptionMiddleware($dataHelper);
+ },
+ AddCustomRequestFieldsMiddleware::class => static function (ContainerInterface $container): AddCustomRequestFieldsMiddleware {
+ $paymentMethods = $container->get('gateway.paymentMethods');
+ return new AddCustomRequestFieldsMiddleware($paymentMethods, $container);
+ },
+ 'request.strategy.order' => static function (ContainerInterface $container): RequestStrategyInterface {
+ $dataHelper = $container->get('settings.data_helper');
+ $settingsHelper = $container->get('settings.settings_helper');
+ $middlewares = [
+ $container->get(CustomerBirthdateMiddleware::class),
+ $container->get(ApplePayTokenMiddleware::class),
+ $container->get(CardTokenMiddleware::class),
+ $container->get(StoreCustomerMiddleware::class),
+ $container->get(AddSequenceTypeForSubscriptionsMiddleware::class),
+ $container->get(OrderLinesMiddleware::class),
+ $container->get(AddressMiddleware::class),
+ $container->get(UrlMiddleware::class),
+ $container->get(SelectedIssuerMiddleware::class),
+ ];
+ $middlewareHandler = new MiddlewareHandler($middlewares);
+
+ return new OrderRequestStrategy(
+ $dataHelper,
+ $settingsHelper,
+ $middlewareHandler
+ );
+ },
+ 'request.strategy.payment' => static function (ContainerInterface $container): RequestStrategyInterface {
+ $dataHelper = $container->get('settings.data_helper');
+ $settingsHelper = $container->get('settings.settings_helper');
+ $issuer = $container->get(SelectedIssuerMiddleware::class);
+ $url = $container->get(UrlMiddleware::class);
+ $sequenceType = $container->get(AddSequenceTypeForSubscriptionsMiddleware::class);
+ $cardToken = $container->get(CardTokenMiddleware::class);
+ $applePayToken = $container->get(ApplePayTokenMiddleware::class);
+ $storeCustomer = $container->get(StoreCustomerMiddleware::class);
+ $paymentDescription = $container->get(PaymentDescriptionMiddleware::class);
+ $addCustomRequestFields = $container->get(AddCustomRequestFieldsMiddleware::class);
+ $middlewares = [
+ $issuer,
+ $url,
+ $sequenceType,
+ $cardToken,
+ $applePayToken,
+ $storeCustomer,
+ $paymentDescription,
+ $addCustomRequestFields,
+ ];
+ $middlewareHandler = new MiddlewareHandler($middlewares);
+
+ return new PaymentRequestStrategy(
+ $dataHelper,
+ $settingsHelper,
+ $middlewareHandler
+ );
+ },
+ ];
+};
diff --git a/src/PaymentMethods/AbstractPaymentMethod.php b/src/PaymentMethods/AbstractPaymentMethod.php
index a83cee26f..dc5da178b 100644
--- a/src/PaymentMethods/AbstractPaymentMethod.php
+++ b/src/PaymentMethods/AbstractPaymentMethod.php
@@ -4,9 +4,7 @@
namespace Mollie\WooCommerce\PaymentMethods;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
use Mollie\WooCommerce\Gateway\Surcharge;
-use Mollie\WooCommerce\Payment\PaymentFieldsService;
use Mollie\WooCommerce\Settings\Settings;
use Mollie\WooCommerce\Shared\SharedDataDictionary;
@@ -32,10 +30,7 @@ abstract class AbstractPaymentMethod implements PaymentMethodI
* @var Settings
*/
protected $settingsHelper;
- /**
- * @var PaymentFieldsService
- */
- protected $paymentFieldsService;
+
/**
* @var Surcharge
*/
@@ -48,7 +43,6 @@ abstract class AbstractPaymentMethod implements PaymentMethodI
public function __construct(
IconFactory $iconFactory,
Settings $settingsHelper,
- PaymentFieldsService $paymentFieldsService,
Surcharge $surcharge,
array $apiPaymentMethod
) {
@@ -56,7 +50,6 @@ public function __construct(
$this->id = $this->getIdFromConfig();
$this->iconFactory = $iconFactory;
$this->settingsHelper = $settingsHelper;
- $this->paymentFieldsService = $paymentFieldsService;
$this->surcharge = $surcharge;
$this->config = $this->getConfig();
$this->settings = $this->getSettings();
@@ -177,25 +170,6 @@ public function getAllFormFields()
return $this->getFormFields($this->getSharedFormFields());
}
- /**
- * Sets the gateway's payment fields strategy based on payment method
- * @param $gateway
- * @return void
- */
- public function paymentFieldsStrategy($gateway)
- {
- $this->paymentFieldsService->setStrategy($this);
- $this->paymentFieldsService->executeStrategy($gateway);
- }
-
- /**
- * @return PaymentFieldsService
- */
- public function paymentFieldsService(): PaymentFieldsService
- {
- return $this->paymentFieldsService;
- }
-
/**
* Access the payment method processed description, surcharge included
* @return mixed|string
@@ -340,4 +314,15 @@ protected function titleIsDefault(): bool
return $savedTitle === $this->config['defaultTitle'];
}
+
+ /**
+ * @return string|NULL
+ */
+ public function getSelectedIssuer(): ?string
+ {
+ $issuer_id = $this->settingsHelper->getPluginId() . '_issuer_' . $this->id;
+ //phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+ $postedIssuer = wc_clean(wp_unslash($_POST[$issuer_id] ?? ''));
+ return !empty($postedIssuer) ? $postedIssuer : null;
+ }
}
diff --git a/src/PaymentMethods/Alma.php b/src/PaymentMethods/Alma.php
index d127a9864..9139eb17e 100644
--- a/src/PaymentMethods/Alma.php
+++ b/src/PaymentMethods/Alma.php
@@ -23,8 +23,7 @@ protected function getConfig(): array
'confirmationDelayed' => false,
'SEPA' => false,
'paymentAPIfields' => [
- 'billingAddress',
- 'shippingAddress',
+ 'AddressMiddleware',
],
'docs' => 'https://www.mollie.com/gb/payments/alma',
];
diff --git a/src/PaymentMethods/Icon/GatewayIconsRenderer.php b/src/PaymentMethods/Icon/GatewayIconsRenderer.php
new file mode 100644
index 000000000..bd5df4c5f
--- /dev/null
+++ b/src/PaymentMethods/Icon/GatewayIconsRenderer.php
@@ -0,0 +1,34 @@
+gatewayId = $gatewayId;
+ $this->container = $container;
+ }
+ /**
+ * @inheritDoc
+ */
+ public function renderIcons(): string
+ {
+ $paymentMethods = $this->container->get('gateway.paymentMethods');
+ $methodId = substr($this->gatewayId, strrpos($this->gatewayId, '_') + 1);
+ $paymentMethod = $paymentMethods[$methodId];
+ if ($paymentMethod->shouldDisplayIcon()) {
+ $defaultIcon = $paymentMethod->getIconUrl();
+ return apply_filters(
+ $this->gatewayId . '_icon_url',
+ $defaultIcon
+ );
+ }
+ return '';
+ }
+}
diff --git a/src/PaymentMethods/InstructionStrategies/OrderInstructionsManager.php b/src/PaymentMethods/InstructionStrategies/OrderInstructionsManager.php
new file mode 100644
index 000000000..e8f39fb59
--- /dev/null
+++ b/src/PaymentMethods/InstructionStrategies/OrderInstructionsManager.php
@@ -0,0 +1,107 @@
+paymentMethod()->getProperty('instructions')) {
+ $this->strategy = new DefaultInstructionStrategy();
+ } else {
+ $className = 'Mollie\\WooCommerce\\PaymentMethods\\InstructionStrategies\\' . ucfirst($deprecatedGatewayHelper->paymentMethod()->getProperty('id')) . 'InstructionStrategy';
+ $this->strategy = class_exists($className) ? new $className() : new DefaultInstructionStrategy();
+ }
+ }
+
+ public function executeStrategy(
+ $paymentGateway,
+ $payment,
+ $order = null,
+ $admin_instructions = false
+ ) {
+
+ return $this->strategy->execute($paymentGateway, $payment, $order, $admin_instructions);
+ }
+
+ /**
+ * Add content to the WC emails.
+ *
+ * @param WC_Order $order
+ * @param bool $admin_instructions (default: false)
+ * @param bool $plain_text (default: false)
+ *
+ * @return void
+ */
+ public function displayInstructions(
+ $paymentGateway,
+ $deprecatedGatewayHelper,
+ WC_Order $order,
+ $admin_instructions = false,
+ $plain_text = false
+ ) {
+
+ if (
+ ($admin_instructions && !self::$alreadyDisplayedAdminInstructions)
+ || (!$admin_instructions && !self::$alreadyDisplayedCustomerInstructions)
+ ) {
+ $order_payment_method = $order->get_payment_method();
+
+ // Invalid gateway
+ if ($paymentGateway->id !== $order_payment_method) {
+ return;
+ }
+
+ $payment = $deprecatedGatewayHelper->paymentObject()->getActiveMolliePayment(
+ $order->get_id()
+ );
+ $methodId = str_replace('mollie_wc_gateway_', '', $paymentGateway->id);
+ // Mollie payment not found or invalid gateway
+ if (
+ !$payment
+ || $payment->method !== $methodId
+ ) {
+ return;
+ }
+ $this->setStrategy($deprecatedGatewayHelper);
+ $instructions = $this->executeStrategy(
+ $paymentGateway,
+ $payment,
+ $order,
+ $admin_instructions
+ );
+
+ if (!empty($instructions)) {
+ $instructions = wptexturize($instructions);
+ //save instructions in order meta
+ $order->update_meta_data(
+ '_mollie_payment_instructions',
+ $instructions
+ );
+ $order->save();
+
+ if ($plain_text) {
+ echo esc_html($instructions) . PHP_EOL;
+ } else {
+ echo '';
+ echo wp_kses(wpautop($instructions), ['p' => [], 'strong' => [], 'br' => []]) . PHP_EOL;
+ echo '';
+ }
+ }
+ }
+ if ($admin_instructions && !self::$alreadyDisplayedAdminInstructions) {
+ self::$alreadyDisplayedAdminInstructions = true;
+ }
+ if (!$admin_instructions && !self::$alreadyDisplayedCustomerInstructions) {
+ self::$alreadyDisplayedCustomerInstructions = true;
+ }
+ }
+}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/AbstractPaymentFieldsRenderer.php b/src/PaymentMethods/PaymentFieldsStrategies/AbstractPaymentFieldsRenderer.php
new file mode 100644
index 000000000..d2389b774
--- /dev/null
+++ b/src/PaymentMethods/PaymentFieldsStrategies/AbstractPaymentFieldsRenderer.php
@@ -0,0 +1,36 @@
+deprecatedHelperGateway = $deprecatedHelperGateway;
+ $this->gatewayDescription = $gateway;
+ $this->dataHelper = $dataHelper;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function renderFields(): string
+ {
+ return '';
+ }
+}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php
index 77b2704a2..c1c30f4fa 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/BancomatpayFieldsStrategy.php
@@ -4,11 +4,13 @@
namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
-class BancomatpayFieldsStrategy implements PaymentFieldsStrategyI
+use Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
+
+class BancomatpayFieldsStrategy extends AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
{
const FIELD_PHONE = "billing_phone_bancomatpay";
- public function execute($gateway, $dataHelper)
+ public function renderFields(): string
{
$showPhoneField = false;
$isPhoneRequired = get_option('mollie_wc_is_phone_required_flag');
@@ -25,8 +27,9 @@ public function execute($gateway, $dataHelper)
}
if ($showPhoneField) {
- $this->phoneNumber($phoneValue);
+ return $this->phoneNumber($phoneValue);
}
+ return "";
}
protected function getOrderIdOnPayForOrderPage()
@@ -39,18 +42,22 @@ protected function getOrderIdOnPayForOrderPage()
protected function phoneNumber($phoneValue)
{
$phoneValue = $phoneValue ?: '';
- ?>
-
-
-
-
-
-
-
+
+
+
+
+ ';
}
public function getFieldMarkup($gateway, $dataHelper)
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php
index 3b8ac4bf3..adda4a403 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/BillieFieldsStrategy.php
@@ -4,12 +4,15 @@
namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
-class BillieFieldsStrategy implements PaymentFieldsStrategyI
+use Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
+
+class BillieFieldsStrategy extends AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
{
const FIELD_COMPANY = "billing_company";
- public function execute($gateway, $dataHelper)
+ public function renderFields(): string
{
+
$showCompanyField = false;
if (is_checkout_pay_page()) {
@@ -22,8 +25,9 @@ public function execute($gateway, $dataHelper)
}
if ($showCompanyField) {
- $this->company();
+ return $this->company();
}
+ return "";
}
protected function getOrderIdOnPayForOrderPage()
@@ -35,18 +39,22 @@ protected function getOrderIdOnPayForOrderPage()
protected function company()
{
- ?>
-
-
-
-
+ return '
+
+
+
+
-
- ';
}
public function getFieldMarkup($gateway, $dataHelper)
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/CreditcardFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/CreditcardFieldsStrategy.php
index df6828595..aaa586562 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/CreditcardFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/CreditcardFieldsStrategy.php
@@ -4,34 +4,31 @@
namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
+use Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
-class CreditcardFieldsStrategy implements PaymentFieldsStrategyI
+class CreditcardFieldsStrategy extends AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
{
- public function execute($gateway, $dataHelper)
+ public function renderFields(): string
{
- if (!$this->isMollieComponentsEnabled($gateway->paymentMethod())) {
- return;
+ if (!$this->isMollieComponentsEnabled($this->deprecatedHelperGateway->paymentMethod())) {
+ return '';
}
- $gateway->has_fields = true;
- $allowedHtml = $this->svgAllowedHtml()
+ $allowedHtml = $this->svgAllowedHtml();
+
+ $output = '';
+ $output .= '';
+ $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)
+ );
+ $output .= '
';
- ?>
-
-
- lockIcon($dataHelper), $allowedHtml),
- wp_kses($this->mollieLogo($dataHelper), $allowedHtml)
- );
- ?>
-
- gatewayDescription;
}
public function getFieldMarkup($gateway, $dataHelper)
{
+ return "";
}
}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/GiftcardFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/GiftcardFieldsStrategy.php
index 97c0f0e48..dc42a783d 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/GiftcardFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/GiftcardFieldsStrategy.php
@@ -4,21 +4,23 @@
namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
-class GiftcardFieldsStrategy implements PaymentFieldsStrategyI
+use Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
+
+class GiftcardFieldsStrategy extends AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
{
use IssuersDropdownBehavior;
- public function execute($gateway, $dataHelper)
+ public function renderFields(): string
{
- if (!$this->dropDownEnabled($gateway)) {
- return;
+ if (!$this->dropDownEnabled($this->deprecatedHelperGateway)) {
+ return $this->gatewayDescription;
}
- $issuers = $this->getIssuers($gateway, $dataHelper);
+ $issuers = $this->getIssuers($this->deprecatedHelperGateway, $this->dataHelper);
if (empty($issuers)) {
- return;
+ return $this->gatewayDescription;
}
- $selectedIssuer = $gateway->getSelectedIssuer();
+ $selectedIssuer = $this->deprecatedHelperGateway->paymentMethod()->getSelectedIssuer();
$html = '';
@@ -32,12 +34,10 @@ public function execute($gateway, $dataHelper)
$html .= '
' . $issuerName;
}
//phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
- echo wpautop(wptexturize($html));
-
- return;
+ return wpautop(wptexturize($html));
}
- $this->renderIssuers($gateway, $issuers, $selectedIssuer);
+ return $this->renderIssuers($this->deprecatedHelperGateway, $issuers, $selectedIssuer);
}
public function getFieldMarkup($gateway, $dataHelper)
@@ -46,7 +46,7 @@ public function getFieldMarkup($gateway, $dataHelper)
return "";
}
$issuers = $this->getIssuers($gateway, $dataHelper);
- $selectedIssuer = $gateway->getSelectedIssuer();
+ $selectedIssuer = $gateway->paymentMethod()->getSelectedIssuer();
$markup = $this->dropdownOptions($gateway, $issuers, $selectedIssuer);
return $markup;
}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
index 9d0483a5e..137411da3 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/In3FieldsStrategy.php
@@ -4,21 +4,23 @@
namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
-class In3FieldsStrategy implements PaymentFieldsStrategyI
+use Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
+
+class In3FieldsStrategy extends AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
{
use PaymentFieldsStrategiesTrait;
const FIELD_BIRTHDATE = "billing_birthdate_in3";
const FIELD_PHONE = "billing_phone_in3";
- public function execute($gateway, $dataHelper)
+ public function renderFields(): string
{
$showBirthdateField = false;
$showPhoneField = false;
$isPhoneRequired = get_option('mollie_wc_is_phone_required_flag');
$phoneValue = false;
$birthValue = false;
-
+ $html = '';
if (is_checkout_pay_page()) {
$showBirthdateField = true;
$showPhoneField = true;
@@ -35,28 +37,29 @@ public function execute($gateway, $dataHelper)
}
if ($showPhoneField) {
- $this->phoneNumber($phoneValue);
+ $html .= $this->phoneNumber($phoneValue);
}
if ($showBirthdateField) {
- $this->dateOfBirth($birthValue);
+ $html .= $this->dateOfBirth($birthValue);
}
+ return $html;
}
protected function phoneNumber($phoneValue)
{
$phoneValue = $phoneValue ?: '';
- ?>
-
-
-
-
-
-
- ';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+ $html .= '
';
+ return $html;
}
public function getFieldMarkup($gateway, $dataHelper)
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/IssuersDropdownBehavior.php b/src/PaymentMethods/PaymentFieldsStrategies/IssuersDropdownBehavior.php
index 3ccbd4564..e50ed0db5 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/IssuersDropdownBehavior.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/IssuersDropdownBehavior.php
@@ -35,7 +35,7 @@ public function renderIssuers($gateway, $issuers, $selectedIssuer)
$issuers,
$selectedIssuer
);
- echo wp_kses($html, [
+ return wp_kses($html, [
'select' => [
'name' => [],
'id' => [],
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/KbcFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/KbcFieldsStrategy.php
index 2b0a1d083..479b157ac 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/KbcFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/KbcFieldsStrategy.php
@@ -4,21 +4,23 @@
namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
-class KbcFieldsStrategy implements PaymentFieldsStrategyI
+use Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
+
+class KbcFieldsStrategy extends AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
{
use IssuersDropdownBehavior;
- public function execute($gateway, $dataHelper)
+ public function renderFields(): string
{
- if (!$this->dropDownEnabled($gateway)) {
- return;
+ if (!$this->dropDownEnabled($this->deprecatedHelperGateway)) {
+ return '';
}
- $issuers = $this->getIssuers($gateway, $dataHelper);
+ $issuers = $this->getIssuers($this->deprecatedHelperGateway, $this->dataHelper);
- $selectedIssuer = $gateway->getSelectedIssuer();
+ $selectedIssuer = $this->deprecatedHelperGateway->paymentMethod()->getSelectedIssuer();
- $this->renderIssuers($gateway, $issuers, $selectedIssuer);
+ return $this->renderIssuers($this->deprecatedHelperGateway, $issuers, $selectedIssuer);
}
public function getFieldMarkup($gateway, $dataHelper)
@@ -27,7 +29,7 @@ public function getFieldMarkup($gateway, $dataHelper)
return "";
}
$issuers = $this->getIssuers($gateway, $dataHelper);
- $selectedIssuer = $gateway->getSelectedIssuer();
+ $selectedIssuer = $gateway->paymentMethod()->getSelectedIssuer();
$markup = $this->dropdownOptions($gateway, $issuers, $selectedIssuer);
return $markup;
}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/NoopPaymentFieldsRenderer.php b/src/PaymentMethods/PaymentFieldsStrategies/NoopPaymentFieldsRenderer.php
new file mode 100644
index 000000000..0e08599a6
--- /dev/null
+++ b/src/PaymentMethods/PaymentFieldsStrategies/NoopPaymentFieldsRenderer.php
@@ -0,0 +1,16 @@
+
-
-
-
-
-
- ';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+ return $html;
}
}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategyI.php b/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategyI.php
index c0b54bd71..81e60c264 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategyI.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/PaymentFieldsStrategyI.php
@@ -6,5 +6,5 @@
interface PaymentFieldsStrategyI
{
- public function execute($gateway, $dataHelper);
+ public function execute($deprecatedHelperDeprecatedHelperGateway, $gatewayDescription, $dataHelper): string;
}
diff --git a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
index b98f536a7..ddfb46583 100644
--- a/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
+++ b/src/PaymentMethods/PaymentFieldsStrategies/RivertyFieldsStrategy.php
@@ -4,21 +4,23 @@
namespace Mollie\WooCommerce\PaymentMethods\PaymentFieldsStrategies;
-class RivertyFieldsStrategy implements PaymentFieldsStrategyI
+use Inpsyde\PaymentGateway\PaymentFieldsRendererInterface;
+
+class RivertyFieldsStrategy extends AbstractPaymentFieldsRenderer implements PaymentFieldsRendererInterface
{
use PaymentFieldsStrategiesTrait;
const FIELD_BIRTHDATE = "billing_birthdate_riverty";
const FIELD_PHONE = "billing_phone_riverty";
- public function execute($gateway, $dataHelper)
+ public function renderFields(): string
{
$showBirthdateField = false;
$showPhoneField = false;
$isPhoneRequired = get_option('mollie_wc_is_phone_required_flag');
$phoneValue = false;
$birthValue = false;
-
+ $html = '';
if (is_checkout_pay_page()) {
$showBirthdateField = true;
$showPhoneField = true;
@@ -35,12 +37,14 @@ public function execute($gateway, $dataHelper)
}
if ($showPhoneField) {
- $this->phoneNumber($phoneValue);
+ $html .= $this->phoneNumber($phoneValue);
}
if ($showBirthdateField) {
- $this->dateOfBirth($birthValue);
+ $html .= $this->dateOfBirth($birthValue);
}
+
+ return $html;
}
protected function phoneNumber($phoneValue)
@@ -48,23 +52,20 @@ protected function phoneNumber($phoneValue)
$phoneValue = $phoneValue ?: '';
$country = WC()->customer->get_billing_country();
$countryCodes = [
- 'BE' => '+32xxxxxxxxx',
- 'NL' => '+316xxxxxxxx',
- 'DE' => '+49xxxxxxxxx',
- 'AT' => '+43xxxxxxxxx',
+ 'BE' => '+32xxxxxxxxx',
+ 'NL' => '+316xxxxxxxx',
+ 'DE' => '+49xxxxxxxxx',
+ 'AT' => '+43xxxxxxxxx',
];
$placeholder = in_array($country, array_keys($countryCodes)) ? $countryCodes[$country] : $countryCodes['NL'];
- ?>
-
-
-
-
-
-
- ';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+
+ return $html;
}
public function getFieldMarkup($gateway, $dataHelper)
diff --git a/src/PaymentMethods/PaymentMethodI.php b/src/PaymentMethods/PaymentMethodI.php
index cd40adbf4..3f6a0d9e9 100644
--- a/src/PaymentMethods/PaymentMethodI.php
+++ b/src/PaymentMethods/PaymentMethodI.php
@@ -4,8 +4,6 @@
namespace Mollie\WooCommerce\PaymentMethods;
-use Mollie\WooCommerce\Payment\PaymentFieldsService;
-
interface PaymentMethodI
{
public function getProperty(string $propertyName);
@@ -13,6 +11,5 @@ public function hasProperty(string $propertyName): bool;
public function title(): string;
public function hasPaymentFields(): bool;
public function getProcessedDescriptionForBlock(): string;
- public function paymentFieldsService(): PaymentFieldsService;
public function hasSurcharge(): bool;
}
diff --git a/src/Settings/General/MollieGeneralSettings.php b/src/Settings/General/MollieGeneralSettings.php
index e6ef54571..49c359717 100644
--- a/src/Settings/General/MollieGeneralSettings.php
+++ b/src/Settings/General/MollieGeneralSettings.php
@@ -2,7 +2,7 @@
namespace Mollie\WooCommerce\Settings\General;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
use Mollie\WooCommerce\Gateway\Surcharge;
use Mollie\WooCommerce\Shared\SharedDataDictionary;
diff --git a/src/Settings/General/MultiCountrySettingsField.php b/src/Settings/General/MultiCountrySettingsField.php
new file mode 100644
index 000000000..fcc723f57
--- /dev/null
+++ b/src/Settings/General/MultiCountrySettingsField.php
@@ -0,0 +1,58 @@
+paymentMethod = $paymentMethod;
+ }
+
+ public function render(string $fieldId, array $fieldConfig, PaymentGateway $gateway): string
+ {
+ return $this->multiSelectCountry($this->paymentMethod);
+ }
+
+ public function multiSelectCountry($paymentMethod)
+ {
+ $selections = (array)$paymentMethod->getProperty('allowed_countries', []);
+ $gatewayId = $paymentMethod->getProperty('id');
+ $id = 'mollie_wc_gateway_' . $gatewayId . '_allowed_countries';
+ $title = __('Sell to specific countries', 'mollie-payments-for-woocommerce');
+ $countries = WC()->countries->countries;
+ asort($countries);
+ ob_start();
+ ?>
+
+ |
+
+ |
+
+
+
+ |
+
+ 'select',
'options' => [
- PaymentService::PAYMENT_METHOD_TYPE_ORDER => ucfirst(
- PaymentService::PAYMENT_METHOD_TYPE_ORDER
+ PaymentProcessor::PAYMENT_METHOD_TYPE_ORDER => ucfirst(
+ PaymentProcessor::PAYMENT_METHOD_TYPE_ORDER
) . ' (' . __('default', 'mollie-payments-for-woocommerce')
. ')',
- PaymentService::PAYMENT_METHOD_TYPE_PAYMENT => ucfirst(
- PaymentService::PAYMENT_METHOD_TYPE_PAYMENT
+ PaymentProcessor::PAYMENT_METHOD_TYPE_PAYMENT => ucfirst(
+ PaymentProcessor::PAYMENT_METHOD_TYPE_PAYMENT
),
],
- 'default' => PaymentService::PAYMENT_METHOD_TYPE_ORDER,
+ 'default' => PaymentProcessor::PAYMENT_METHOD_TYPE_ORDER,
'desc' => sprintf(
/* translators: Placeholder 1: opening link tag, placeholder 2: closing link tag */
__(
diff --git a/src/Settings/Settings.php b/src/Settings/Settings.php
index 2d03aa453..306ec85a6 100644
--- a/src/Settings/Settings.php
+++ b/src/Settings/Settings.php
@@ -9,7 +9,7 @@
use Mollie\Api\Exceptions\ApiException;
use Mollie\WooCommerce\Gateway\Surcharge;
use Mollie\WooCommerce\Notice\AdminNotice;
-use Mollie\WooCommerce\Payment\PaymentService;
+use Mollie\WooCommerce\Payment\PaymentProcessor;
use Mollie\WooCommerce\Settings\General\MollieGeneralSettings;
use Mollie\WooCommerce\Shared\SharedDataDictionary;
use WC_Payment_Gateway;
@@ -230,7 +230,7 @@ public function isTestModeEnabled()
public function isOrderApiSetting()
{
$orderApiSetting = get_option($this->getSettingId('api_switch'));
- return !$orderApiSetting || is_string($orderApiSetting) && trim($orderApiSetting) === PaymentService::PAYMENT_METHOD_TYPE_ORDER;
+ return !$orderApiSetting || is_string($orderApiSetting) && trim($orderApiSetting) === PaymentProcessor::PAYMENT_METHOD_TYPE_ORDER;
}
/**
* @param bool $overrideTestMode
diff --git a/src/Settings/SettingsModule.php b/src/Settings/SettingsModule.php
index 61ecb6632..b554b34b8 100644
--- a/src/Settings/SettingsModule.php
+++ b/src/Settings/SettingsModule.php
@@ -146,7 +146,7 @@ function () use ($optionName, $defaultAdvancedOptions, $defaultComponentsOptions
$this->maybeTestModeNotice();
});
- $gateways = $container->get('gateway.instances');
+ $gateways = $container->get('__deprecated.gateway_helpers');
$isSDDGatewayEnabled = $container->get('gateway.isSDDGatewayEnabled');
$this->initMollieSettingsPage($isSDDGatewayEnabled, $gateways, $pluginPath, $pluginUrl, $paymentMethods);
add_action(
diff --git a/src/Subscription/MaybeFixSubscription.php b/src/Subscription/MaybeFixSubscription.php
deleted file mode 100644
index 9d5ae1ca8..000000000
--- a/src/Subscription/MaybeFixSubscription.php
+++ /dev/null
@@ -1,51 +0,0 @@
- '-1',
- 'meta_query' => [
- [
- 'key' => '_mollie_customer_id',
- 'value' => '',
- 'compare' => 'NOT EXISTS',
- ],
- ],
- ]
- );
- foreach ($subscriptions as $subscription) {
- $customer = $subscription->get_meta('_mollie_customer_id');
- //cst_*
- if (strlen($customer) < 5) {
- $parent = $subscription->get_parent();
- if ($parent) {
- $subscription->update_meta_data('_mollie_customer_id', $parent->get_meta('_mollie_customer_id'));
- $subscription->update_meta_data('_mollie_order_id', $parent->get_meta('_mollie_order_id'));
- $subscription->update_meta_data('_mollie_payment_id', $parent->get_meta('_mollie_payment_id'));
- $subscription->update_meta_data('_mollie_payment_mode', $parent->get_meta('_mollie_payment_mode'));
- $subscription->save();
- }
- }
- }
- update_option('mollie_wc_fix_subscriptions2', true);
- }
-}
diff --git a/src/Subscription/MollieSepaRecurringGateway.php b/src/Subscription/MollieSepaRecurringGatewayHandler.php
similarity index 83%
rename from src/Subscription/MollieSepaRecurringGateway.php
rename to src/Subscription/MollieSepaRecurringGatewayHandler.php
index 86f856446..497560e72 100644
--- a/src/Subscription/MollieSepaRecurringGateway.php
+++ b/src/Subscription/MollieSepaRecurringGatewayHandler.php
@@ -7,24 +7,23 @@
use DateInterval;
use DateTime;
use Mollie\Api\Exceptions\ApiException;
+use Mollie\Api\Resources\Payment;
use Mollie\Api\Types\SequenceType;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
use Mollie\WooCommerce\Notice\NoticeInterface;
use Mollie\WooCommerce\Payment\MollieObject;
use Mollie\WooCommerce\Payment\MollieOrderService;
-use Mollie\WooCommerce\Payment\OrderInstructionsService;
-use Mollie\WooCommerce\Payment\PaymentCheckoutRedirectService;
use Mollie\WooCommerce\Payment\PaymentFactory;
-use Mollie\WooCommerce\Payment\PaymentService;
+use Mollie\WooCommerce\Payment\PaymentProcessor;
+use Mollie\WooCommerce\PaymentMethods\InstructionStrategies\OrderInstructionsManager;
use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
use Mollie\WooCommerce\SDK\Api;
use Mollie\WooCommerce\SDK\HttpResponse;
use Mollie\WooCommerce\Settings\Settings;
use Mollie\WooCommerce\Shared\Data;
use Psr\Log\LoggerInterface as Logger;
-use Psr\Log\LogLevel;
-class MollieSepaRecurringGateway extends MollieSubscriptionGateway
+class MollieSepaRecurringGatewayHandler extends MollieSubscriptionGatewayHandler
{
const WAITING_CONFIRMATION_PERIOD_DAYS = '21';
@@ -37,8 +36,7 @@ class MollieSepaRecurringGateway extends MollieSubscriptionGateway
public function __construct(
PaymentMethodI $directDebitPaymentMethod,
PaymentMethodI $paymentMethod,
- PaymentService $paymentService,
- OrderInstructionsService $orderInstructionsService,
+ OrderInstructionsManager $orderInstructionsService,
MollieOrderService $mollieOrderService,
Data $dataService,
Logger $logger,
@@ -53,7 +51,6 @@ public function __construct(
parent::__construct(
$paymentMethod,
- $paymentService,
$orderInstructionsService,
$mollieOrderService,
$dataService,
@@ -66,22 +63,9 @@ public function __construct(
$pluginId,
$apiHelper
);
- $directDebit = new MolliePaymentGateway(
- $directDebitPaymentMethod,
- $paymentService,
- $orderInstructionsService,
- $mollieOrderService,
- $dataService,
- $logger,
- $notice,
- $httpResponse,
- $mollieObject,
- $paymentFactory,
- $pluginId
- );
- if ($directDebit->enabled === 'yes') {
- $this->initSubscriptionSupport();
- $this->recurringMollieMethod = $directDebit;
+ $directDebitSettings = get_option('mollie_wc_gateway_directdebit_settings');
+ if ($directDebitSettings['enabled'] === 'yes') {
+ $this->recurringMollieMethod = $directDebitPaymentMethod;
}
return $this;
}
@@ -93,7 +77,7 @@ protected function getRecurringMollieMethodId()
{
$result = null;
if ($this->recurringMollieMethod) {
- $result = $this->recurringMollieMethod->paymentMethod()->getProperty('id');
+ $result = $this->recurringMollieMethod->getProperty('id');
}
return $result;
@@ -106,7 +90,7 @@ protected function getRecurringMollieMethodTitle()
{
$result = null;
if ($this->recurringMollieMethod) {
- $result = $this->recurringMollieMethod->paymentMethod()->getProperty('title');
+ $result = $this->recurringMollieMethod->getProperty('title');
}
return $result;
@@ -168,7 +152,7 @@ protected function addPendingPaymentOrder($renewal_order)
}
/**
- * @param null $payment
+ * @param Payment $payment
* @return string
*/
protected function getPaymentMethodTitle($payment)
diff --git a/src/Subscription/MollieSubscriptionGateway.php b/src/Subscription/MollieSubscriptionGatewayHandler.php
similarity index 83%
rename from src/Subscription/MollieSubscriptionGateway.php
rename to src/Subscription/MollieSubscriptionGatewayHandler.php
index ec3d17fa9..a13ddd710 100644
--- a/src/Subscription/MollieSubscriptionGateway.php
+++ b/src/Subscription/MollieSubscriptionGatewayHandler.php
@@ -6,15 +6,16 @@
use Exception;
use Mollie\Api\Exceptions\ApiException;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
use Mollie\WooCommerce\Payment\MollieObject;
use Mollie\WooCommerce\Payment\MollieSubscription;
-use Mollie\WooCommerce\Payment\OrderInstructionsService;
-use Mollie\WooCommerce\Payment\PaymentCheckoutRedirectService;
use Mollie\WooCommerce\Payment\PaymentFactory;
-use Mollie\WooCommerce\Payment\PaymentService;
+use Mollie\WooCommerce\Payment\PaymentProcessor;
use Mollie\WooCommerce\Notice\NoticeInterface;
use Mollie\WooCommerce\Payment\MollieOrderService;
+use Mollie\WooCommerce\Payment\Request\Middleware\MiddlewareHandler;
+use Mollie\WooCommerce\Payment\Request\Middleware\UrlMiddleware;
+use Mollie\WooCommerce\PaymentMethods\InstructionStrategies\OrderInstructionsManager;
use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
use Mollie\WooCommerce\SDK\Api;
use Mollie\WooCommerce\SDK\HttpResponse;
@@ -22,11 +23,10 @@
use Mollie\WooCommerce\Settings\Settings;
use Mollie\WooCommerce\Shared\Data;
use Psr\Log\LoggerInterface as Logger;
-use Psr\Log\LogLevel;
use Mollie\WooCommerce\PaymentMethods\Constants;
use WC_Order;
-class MollieSubscriptionGateway extends MolliePaymentGateway
+class MollieSubscriptionGatewayHandler extends MolliePaymentGatewayHandler
{
protected const PAYMENT_TEST_MODE = 'test';
protected const METHODS_NEEDING_UPDATE = ['mollie_wc_gateway_bancontact',
@@ -39,7 +39,6 @@ class MollieSubscriptionGateway extends MolliePaymentGateway
'mollie_wc_gateway_sofort', ];
protected const DIRECTDEBIT = Constants::DIRECTDEBIT;
- protected $isSubscriptionPayment = false;
protected $apiHelper;
protected $settingsHelper;
/**
@@ -52,8 +51,7 @@ class MollieSubscriptionGateway extends MolliePaymentGateway
*/
public function __construct(
PaymentMethodI $paymentMethod,
- PaymentService $paymentService,
- OrderInstructionsService $orderInstructionsService,
+ OrderInstructionsManager $orderInstructionsProcessor,
MollieOrderService $mollieOrderService,
Data $dataService,
Logger $logger,
@@ -68,8 +66,7 @@ public function __construct(
parent::__construct(
$paymentMethod,
- $paymentService,
- $orderInstructionsService,
+ $orderInstructionsProcessor,
$mollieOrderService,
$dataService,
$logger,
@@ -81,65 +78,61 @@ public function __construct(
);
$this->apiHelper = $apiHelper;
+ $middlewares = [
+ new UrlMiddleware($pluginId, $logger),
+ ];
+ $middlewareHandler = new MiddlewareHandler($middlewares);
$this->subscriptionObject = new MollieSubscription(
$pluginId,
$apiHelper,
$settingsHelper,
$dataService,
- $logger
+ $logger,
+ $paymentMethod,
+ $middlewareHandler
);
+ }
+
+ public function addSubscriptionFilters($gateway)
+ {
if (class_exists('WC_Subscriptions_Order')) {
- add_action('woocommerce_scheduled_subscription_payment_' . $this->id, [ $this, 'scheduled_subscription_payment' ], 10, 2);
+ add_action(
+ 'woocommerce_scheduled_subscription_payment_' . $gateway->id,
+ function ($renewal_total, WC_Order $renewal_order) use ($gateway) {
+ $this->scheduled_subscription_payment($renewal_total, $renewal_order, $gateway);
+ },
+ 10,
+ 3
+ );
// A resubscribe order to record a customer resubscribing to an expired or cancelled subscription.
add_action('wcs_resubscribe_order_created', [ $this, 'delete_resubscribe_meta' ], 10);
// After creating a renewal order to record a scheduled subscription payment with the same post meta, order items etc.
- add_action('wcs_renewal_order_created', [ $this, 'delete_renewal_meta' ], 10);
+ add_action('wcs_renewal_order_created', [ $this, 'delete_renewal_meta' ], 10);
add_action('woocommerce_subscription_failing_payment_method_updated_mollie', [ $this, 'update_failing_payment_method' ], 10, 2);
- add_filter('woocommerce_subscription_payment_meta', [ $this, 'add_subscription_payment_meta' ], 10, 2);
- add_action('woocommerce_subscription_validate_payment_meta', [ $this, 'validate_subscription_payment_meta' ], 10, 2);
- }
- if ($this->paymentMethod->getProperty('Subscription')) {
- $this->initSubscriptionSupport();
+ add_filter(
+ 'woocommerce_subscription_payment_meta',
+ function ($payment_meta, $subscription) use ($gateway) {
+ return $this->add_subscription_payment_meta($payment_meta, $subscription, $gateway);
+ },
+ 10,
+ 3
+ );
+ add_action(
+ 'woocommerce_subscription_validate_payment_meta',
+ function ($payment_method_id, $payment_meta) use ($gateway) {
+ $this->validate_subscription_payment_meta($payment_method_id, $payment_meta, $gateway);
+ },
+ 10,
+ 2
+ );
}
}
- /**
- *
- */
- protected function initSubscriptionSupport()
- {
- $supportSubscriptions = [
- 'subscriptions',
- 'subscription_cancellation',
- 'subscription_suspension',
- 'subscription_reactivation',
- 'subscription_amount_changes',
- 'subscription_date_changes',
- 'multiple_subscriptions',
- 'subscription_payment_method_change',
- 'subscription_payment_method_change_admin',
- 'subscription_payment_method_change_customer',
- ];
-
- $this->supports = array_merge($this->supports, $supportSubscriptions);
- }
-
- /**
- * @param $order_id
- * @return array
- * @throws InvalidApiKey
- */
- public function process_subscription_payment($order_id)
- {
- $this->isSubscriptionPayment = true;
- return parent::process_payment($order_id);
- }
-
/**
* @param $renewal_order
*
@@ -206,7 +199,7 @@ public function update_subscription_status_for_direct_debit($renewal_order)
* @return array
* @throws InvalidApiKey
*/
- public function scheduled_subscription_payment($renewal_total, WC_Order $renewal_order)
+ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal_order, $gateway)
{
if (! $renewal_order) {
$this->logger->debug($this->id . ': Could not load renewal order or process renewal payment.');
@@ -219,15 +212,15 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
// Allow developers to hook into the subscription renewal payment before it processed
do_action($this->pluginId . '_before_renewal_payment_created', $renewal_order);
- $this->logger->debug($this->id . ': Try to create renewal payment for renewal order ' . $renewal_order_id);
- $this->paymentService->setGateway($this);
+ $this->logger->debug($gateway->id . ': Try to create renewal payment for renewal order ' . $renewal_order_id);
+ //$this->paymentProcessor->setGatewayHelper($gateway->id);
$initial_order_status = $this->paymentMethod->getInitialOrderStatus();
// Overwrite plugin-wide
$initial_order_status = apply_filters($this->pluginId . '_initial_order_status', $initial_order_status);
// Overwrite gateway-wide
- $initial_order_status = apply_filters($this->pluginId . '_initial_order_status_' . $this->id, $initial_order_status);
+ $initial_order_status = apply_filters($this->pluginId . '_initial_order_status_' . $gateway->id, $initial_order_status);
// Get Mollie customer ID
$customer_id = $this->getOrderMollieCustomerId($renewal_order);
@@ -247,7 +240,7 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
$data = $this->subscriptionObject->getRecurringPaymentRequestData($renewal_order, $customer_id, $initialPaymentUsedOrderAPI);
// Allow filtering the renewal payment data
- $data = apply_filters('woocommerce_' . $this->id . '_args', $data, $renewal_order);
+ $data = apply_filters('woocommerce_' . $gateway->id . '_args', $data, $renewal_order);
// Create a renewal payment
try {
@@ -268,7 +261,8 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
$mandateId,
$isRenewalMethodDirectDebit,
$data,
- $validMandate
+ $validMandate,
+ $gateway
);
}
if (!$validMandate) {
@@ -278,7 +272,8 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
$mollieApiClient,
$validMandate,
$data,
- $renewalOrderMethod
+ $renewalOrderMethod,
+ $gateway
);
}
} catch (ApiException $e) {
@@ -312,7 +307,7 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
&& $payment->mandateId !== $mandateId
&& !empty($subscriptionParentOrder)
) {
- $this->logger->debug("{$this->id}: updating to mandate {$payment->mandateId}");
+ $this->logger->debug("{$gateway->id}: updating to mandate {$payment->mandateId}");
$subscriptionParentOrder->update_meta_data(
'_mollie_mandate_id',
$payment->mandateId
@@ -340,7 +335,7 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
$this->updateFirstPaymentMethodToRecurringPaymentMethod($renewal_order, $renewal_order_id, $payment);
// Log successful creation of payment
- $this->logger->debug($this->id . ': Renewal payment ' . $payment->id . ' (' . $payment->mode . ') created for order ' . $renewal_order_id . ' payment json response: ' . wp_json_encode($payment));
+ $this->logger->debug($gateway->id . ': Renewal payment ' . $payment->id . ' (' . $payment->mode . ') created for order ' . $renewal_order_id . ' payment json response: ' . wp_json_encode($payment));
// Unset & set active Mollie payment
// Get correct Mollie Payment Object
@@ -367,9 +362,9 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
'result' => 'success',
];
} catch (ApiException $e) {
- $this->logger->debug("{$this->id} : Failed to create payment for order {$renewal_order_id}, with customer {$customer_id} and mandate {$mandateId}. New status failed. API error: {$e->getMessage()}");
+ $this->logger->debug("{$gateway->id} : Failed to create payment for order {$renewal_order_id}, with customer {$customer_id} and mandate {$mandateId}. New status failed. API error: {$e->getMessage()}");
/* translators: Placeholder 1: Payment method title */
- $message = sprintf(__('Could not create %s renewal payment.', 'mollie-payments-for-woocommerce'), $this->title);
+ $message = sprintf(__('Could not create %s renewal payment.', 'mollie-payments-for-woocommerce'), $gateway->title);
$message .= ' ' . $e->getMessage();
$renewal_order->update_status('failed', $message);
}
@@ -504,13 +499,22 @@ public function delete_renewal_meta($renewal_order)
* @return mixed
* @throws \Mollie\Api\Exceptions\ApiException
*/
- public function add_subscription_payment_meta($payment_meta, $subscription)
+ public function add_subscription_payment_meta($payment_meta, $subscription, $gateway)
{
+ if ($gateway->id !== $subscription->get_payment_method()) {
+ return $payment_meta;
+ }
+ $parent = $subscription->get_parent();
+ $subscription->update_meta_data('_mollie_customer_id', $parent->get_meta('_mollie_customer_id'));
+ $subscription->update_meta_data('_mollie_order_id', $parent->get_meta('_mollie_order_id'));
+ $subscription->update_meta_data('_mollie_payment_id', $parent->get_meta('_mollie_payment_id'));
+ $subscription->update_meta_data('_mollie_payment_mode', $parent->get_meta('_mollie_payment_mode'));
+ $subscription->save();
$mollie_payment_id = $subscription->get_meta('_mollie_payment_id', true);
$mollie_payment_mode = $subscription->get_meta('_mollie_payment_mode', true);
$mollie_customer_id = $subscription->get_meta('_mollie_customer_id', true);
- $payment_meta[ $this->id ] = [
+ $payment_meta[ $gateway->id ] = [
'post_meta' => [
'_mollie_payment_id' => [
'value' => $mollie_payment_id,
@@ -535,9 +539,9 @@ public function add_subscription_payment_meta($payment_meta, $subscription)
* @param $payment_meta
* @throws Exception
*/
- public function validate_subscription_payment_meta($payment_method_id, $payment_meta)
+ public function validate_subscription_payment_meta($payment_method_id, $payment_meta, $gateway)
{
- if ($this->id === $payment_method_id) {
+ if ($gateway->id === $payment_method_id) {
// Check that a Mollie Customer ID is entered
if (! isset($payment_meta['post_meta']['_mollie_customer_id']['value']) || empty($payment_meta['post_meta']['_mollie_customer_id']['value'])) {
throw new Exception('A "_mollie_customer_id" value is required.');
@@ -557,54 +561,6 @@ public function update_failing_payment_method($subscription, $renewal_order)
$subscription->save();
}
- /**
- * @param int $order_id
- *
- * @return array
- * @throws \Mollie\Api\Exceptions\ApiException
- * @throws InvalidApiKey
- */
- public function process_payment($order_id)
- {
- $this->addWcSubscriptionsFiltersForPayment();
- $isSubscription = $this->dataService->isSubscription($order_id);
- if ($isSubscription) {
- $this->paymentService->setGateway($this);
- $result = $this->process_subscription_payment($order_id);
- return $result;
- }
-
- return parent::process_payment($order_id);
- }
-
- protected function addWcSubscriptionsFiltersForPayment(): void
- {
- add_filter(
- $this->pluginId . '_is_subscription_payment',
- function ($isSubscription, $orderId) {
- if ($this->dataService->isWcSubscription($orderId)) {
- add_filter(
- $this->pluginId . '_is_automatic_payment_disabled',
- static function ($filteredOption) {
- if (
- 'yes' == get_option(
- \WC_Subscriptions_Admin::$option_prefix . '_turn_off_automatic_payments'
- )
- ) {
- return true;
- }
- return $filteredOption;
- }
- );
- return true;
- }
- return $isSubscription;
- },
- 10,
- 2
- );
- }
-
/**
* @param $mollie_customer_id
* @param $mollie_payment_id
@@ -648,13 +604,13 @@ public function restore_mollie_customer_id_and_mandate($mollie_customer_id, $mol
// Get the WooCommerce payment gateway for this subscription
$gateway = wc_get_payment_gateway_by_order($subscription);
- if (! $gateway || ! ( $gateway instanceof MolliePaymentGateway )) {
+ if (! $gateway || ! mollieWooCommerceIsMollieGateway($gateway)) {
$this->logger->debug(__METHOD__ . ' - Subscription ' . $subscription_id . ' renewal payment: stopped processing, not a Mollie payment gateway, could not restore customer ID.');
return $mollie_customer_id;
}
-
- $mollie_method = $gateway->paymentMethod->getProperty('id');
+ $gatewayId = $gateway->id;
+ $mollie_method = substr($gatewayId, strrpos($gatewayId, '_') + 1);
// Check that first payment method is related to SEPA Direct Debit and update
$methods_needing_update = [
@@ -721,22 +677,23 @@ public function restore_mollie_customer_id_and_mandate($mollie_customer_id, $mol
}
/**
+ * TODO this is still used in the service callback
* Check if the gateway is available in checkout
*
* @return bool
*/
- public function is_available(): bool
+ public function is_available($gateway): bool
{
- if (!$this->checkEnabledNorDirectDebit()) {
+ if (!$this->checkEnabledNorDirectDebit($gateway)) {
return false;
}
if (!$this->cartAmountAvailable()) {
return true;
}
- $status = parent::is_available();
+ $status = parent::is_available($gateway);
// Do extra checks if WooCommerce Subscriptions is installed
- $orderTotal = $this->get_order_total();
- return $this->subscriptionObject->isAvailableForSubscriptions($status, $this, $orderTotal);
+ $orderTotal = WC()->cart && WC()->cart->get_total('edit');
+ return $this->subscriptionObject->isAvailableForSubscriptions($status, $this, $orderTotal, $gateway);
}
/**
@@ -750,7 +707,7 @@ protected function initialPaymentUsedOrderAPI($subscriptionParentOrder): bool
}
$orderIdMeta = $subscriptionParentOrder->get_meta('_mollie_order_id');
- $parentOrderMeta = $orderIdMeta ?: PaymentService::PAYMENT_METHOD_TYPE_PAYMENT;
+ $parentOrderMeta = $orderIdMeta ?: PaymentProcessor::PAYMENT_METHOD_TYPE_PAYMENT;
return strpos($parentOrderMeta, 'ord_') !== false;
}
@@ -773,11 +730,12 @@ protected function usePreviousMandate(
$mandateId,
bool $isRenewalMethodDirectDebit,
$data,
- bool $validMandate
+ bool $validMandate,
+ $gateway
): array {
$this->logger->debug(
- $this->id . ': Found mandate ID for renewal order ' . $renewal_order_id . ' with customer ID ' . $customer_id
+ $gateway->id . ': Found mandate ID for renewal order ' . $renewal_order_id . ' with customer ID ' . $customer_id
);
$mandate = $mollieApiClient->customers->get($customer_id)->getMandate($mandateId);
@@ -805,11 +763,12 @@ protected function useAnyValidMandate(
\Mollie\Api\MollieApiClient $mollieApiClient,
bool $validMandate,
$data,
- $renewalOrderMethod
+ $renewalOrderMethod,
+ $gateway
): array {
// Get all mandates for the customer ID
$this->logger->debug(
- $this->id . ': Try to get all mandates for renewal order ' . $renewal_order_id . ' with customer ID ' . $customer_id
+ $gateway->id . ': Try to get all mandates for renewal order ' . $renewal_order_id . ' with customer ID ' . $customer_id
);
$mandates = $mollieApiClient->customers->get($customer_id)->mandates();
foreach ($mandates as $mandate) {
diff --git a/src/Subscription/SubscriptionModule.php b/src/Subscription/SubscriptionModule.php
index a6ca51ffb..4398765cf 100644
--- a/src/Subscription/SubscriptionModule.php
+++ b/src/Subscription/SubscriptionModule.php
@@ -9,7 +9,7 @@
use DateTime;
use Inpsyde\Modularity\Module\ExecutableModule;
use Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
use Mollie\WooCommerce\Settings\Settings;
use Mollie\WooCommerce\Shared\Data;
use Mollie\WooCommerce\Shared\SharedDataDictionary;
@@ -42,20 +42,10 @@ public function run(ContainerInterface $container): bool
assert($this->dataHelper instanceof Data);
$this->settingsHelper = $container->get('settings.settings_helper');
assert($this->settingsHelper instanceof Settings);
- $this->maybeFixSubscriptions();
$this->schedulePendingPaymentOrdersExpirationCheck();
return true;
}
- /**
- * See MOL-322, MOL-405
- */
- public function maybeFixSubscriptions()
- {
- $fixer = new MaybeFixSubscription();
- $fixer->maybeFix();
- }
-
/**
* WCSubscription related.
*/
diff --git a/tests/php/Stubs/enqueue_scripts.php b/tests/overrides/enqueue_scripts.php
similarity index 100%
rename from tests/php/Stubs/enqueue_scripts.php
rename to tests/overrides/enqueue_scripts.php
diff --git a/tests/php/Stubs/woocommerce.php b/tests/overrides/woocommerce.php
similarity index 100%
rename from tests/php/Stubs/woocommerce.php
rename to tests/overrides/woocommerce.php
diff --git a/tests/php/Functional/ApplePayButton/AjaxRequestsTest.php b/tests/php/Functional/ApplePayButton/AjaxRequestsTest.php
index fff43d732..40ace5d45 100644
--- a/tests/php/Functional/ApplePayButton/AjaxRequestsTest.php
+++ b/tests/php/Functional/ApplePayButton/AjaxRequestsTest.php
@@ -8,10 +8,8 @@
use Mollie\WooCommerce\Buttons\ApplePayButton\AppleAjaxRequests;
use Mollie\WooCommerce\Buttons\ApplePayButton\ApplePayDataObjectHttp;
use Mollie\WooCommerce\Buttons\ApplePayButton\ResponsesToApple;
-use Mollie\WooCommerce\Gateway\Surcharge;
-use Mollie\WooCommerce\Payment\RefundLineItemsBuilder;
+use Mollie\WooCommerce\Gateway\Refund\RefundLineItemsBuilder;
use Mollie\WooCommerce\Shared\Data;
-use Mollie\WooCommerce\Subscription\MollieSubscriptionGateway;
use Mollie\WooCommerceTests\Functional\HelperMocks;
use Mollie\WooCommerceTests\Stubs\postDTOTestsStubs;
use Mollie\WooCommerceTests\Stubs\WooCommerceMocks;
diff --git a/tests/php/Functional/ApplePayButton/DataToAppleButtonScriptsTest.php b/tests/php/Functional/ApplePayButton/ApplePayDirectHandlerTest.php
similarity index 100%
rename from tests/php/Functional/ApplePayButton/DataToAppleButtonScriptsTest.php
rename to tests/php/Functional/ApplePayButton/ApplePayDirectHandlerTest.php
diff --git a/tests/php/Functional/ApplePayButton/ResponsesToAppleTest.php b/tests/php/Functional/ApplePayButton/ResponsesToAppleTest.php
index 59908b6b0..29498e3a5 100644
--- a/tests/php/Functional/ApplePayButton/ResponsesToAppleTest.php
+++ b/tests/php/Functional/ApplePayButton/ResponsesToAppleTest.php
@@ -6,7 +6,7 @@
use Faker\Generator;
use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
use Mollie\WooCommerce\Buttons\ApplePayButton\ResponsesToApple;
-use Mollie\WooCommerce\Subscription\MollieSubscriptionGateway;
+use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;
use Mollie\WooCommerceTests\Functional\HelperMocks;
use Mollie\WooCommerceTests\TestCase;
diff --git a/tests/php/Functional/Gateway/MollieGatewayTest.php b/tests/php/Functional/Gateway/MollieGatewayTest.php
deleted file mode 100644
index 37faf16d2..000000000
--- a/tests/php/Functional/Gateway/MollieGatewayTest.php
+++ /dev/null
@@ -1,161 +0,0 @@
-helperMocks = new HelperMocks();
- $this->wooCommerceMocks = new WooCommerceMocks();
- }
-
- /**
- * WHEN gateway setting 'enabled' !== 'yes'
- * THEN is_available returns false
- * @test
- */
- public function gatewayNOTEnabledIsNOTAvailable()
- {
- $testee = $this->buildTestee(['enabled'=>'no']);
-
- $expectedResult = false;
- $result = $testee->is_available();
- $this->assertEquals($expectedResult, $result);
- }
-
- /**
- * WHEN gateway setting 'enabled' !== 'yes'
- * THEN is_available returns true
- * @test
- */
- public function gatewayEnabledIsAvailable()
- {
- $testee = $this->buildTestee(['enabled'=>'yes']);
- $total = 10.00;
- $WC = $this->wooCommerceMocks->wooCommerce(10.00, 0, $total, 0);
- expect('WC')->andReturn($WC);
- $testee->expects($this->atLeast(2))->method('get_order_total')->willReturn($total);
- expect('get_woocommerce_currency')->andReturn('EUR');
- expect('get_transient')->andReturn([['id'=>'ideal']]);
- expect('wc_get_base_location')->andReturn(['country'=>'ES']);
-
- $expectedResult = true;
- $result = $testee->is_available();
- $this->assertEquals($expectedResult, $result);
- }
-
- /**
- * WHEN gateway setting 'enabled' !== 'yes'
- * AND the customer has no country set
- * THEN we fallback to the shop country and is_available returns true
- * @test
- */
- public function gatewayAvailableWhenNoCountrySelected()
- {
- $testee = $this->buildTestee(['enabled'=>'yes']);
- $total = 10.00;
- $WC = $this->wooCommerceMocks->wooCommerce(10.00, 0, $total, 0, '');
- expect('WC')->andReturn($WC);
- $testee->expects($this->atLeast(2))->method('get_order_total')->willReturn($total);
- expect('get_woocommerce_currency')->andReturn('EUR');
- expect('get_transient')->andReturn([['id'=>'ideal']]);
- expect('wc_get_base_location')->andReturn(['country'=>'ES']);
-
- $expectedResult = true;
- $result = $testee->is_available();
- $this->assertEquals($expectedResult, $result);
- }
-
- private function buildTestee($settings){
- return $this->helperMocks->mollieGatewayBuilder('Ideal', false, false, $settings);
- }
-
- private function wcOrder($id = 1, $meta = false, $parentOrder = false, $status = 'processing')
- {
- $item = $this->createConfiguredMock(
- 'WC_Order',
- [
- 'get_id' => $id,
- 'get_order_key' => 'wc_order_hxZniP1zDcnM8',
- 'get_total' => '20',
- 'get_items' => [$this->wcOrderItem()],
- 'get_billing_first_name' => 'billingggivenName',
- 'get_billing_last_name' => 'billingfamilyName',
- 'get_billing_email' => 'billingemail',
- 'get_shipping_first_name' => 'shippinggivenName',
- 'get_shipping_last_name' => 'shippingfamilyName',
- 'get_billing_address_1' => 'shippingstreetAndNumber',
- 'get_billing_address_2' => 'billingstreetAdditional',
- 'get_billing_postcode' => 'billingpostalCode',
- 'get_billing_city' => 'billingcity',
- 'get_billing_state' => 'billingregion',
- 'get_billing_country' => 'billingcountry',
- 'get_shipping_address_1' => 'shippingstreetAndNumber',
- 'get_shipping_address_2' => 'shippingstreetAdditional',
- 'get_shipping_postcode' => 'shippingpostalCode',
- 'get_shipping_city' => 'shippingcity',
- 'get_shipping_state' => 'shippingregion',
- 'get_shipping_country' => 'shippingcountry',
- 'get_shipping_methods' => false,
- 'get_order_number' => 1,
- 'get_payment_method' => 'mollie_wc_gateway_ideal',
- 'get_currency' => 'EUR',
- 'get_meta' => $meta,
- 'get_parent' => $parentOrder,
- 'update_status'=>$status
- ]
- );
-
- return $item;
- }
- private function wcOrderItem()
- {
- $item = new \WC_Order_Item_Product();
-
- $item['quantity'] = 1;
- $item['variation_id'] = null;
- $item['product_id'] = 1;
- $item['line_subtotal_tax']= 0;
- $item['line_total']= 20;
- $item['line_subtotal']= 20;
- $item['line_tax']= 0;
- $item['tax_status']= '';
- $item['total']= 20;
- $item['name']= 'productName';
-
- return $item;
- }
-
-}
-
-
-
diff --git a/tests/php/Functional/HelperMocks.php b/tests/php/Functional/HelperMocks.php
index bb264c1d1..be2ee804d 100644
--- a/tests/php/Functional/HelperMocks.php
+++ b/tests/php/Functional/HelperMocks.php
@@ -4,17 +4,20 @@
namespace Mollie\WooCommerceTests\Functional;
+use Inpsyde\PaymentGateway\PaymentGateway;
use Mollie\Api\MollieApiClient;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
use Mollie\WooCommerce\Notice\AdminNotice;
use Mollie\WooCommerce\Payment\MollieOrder;
use Mollie\WooCommerce\Payment\MollieOrderService;
-use Mollie\WooCommerce\Payment\OrderInstructionsService;
-use Mollie\WooCommerce\Payment\OrderItemsRefunder;
+use Mollie\WooCommerce\Payment\MolliePayment;
+use Mollie\WooCommerce\Payment\Request\RequestFactory;
+use Mollie\WooCommerce\PaymentMethods\InstructionStrategies\OrderInstructionsManager;
+use Mollie\WooCommerce\Gateway\Refund\OrderItemsRefunder;
use Mollie\WooCommerce\Payment\OrderLines;
use Mollie\WooCommerce\Payment\MollieObject;
use Mollie\WooCommerce\Payment\PaymentFactory;
-use Mollie\WooCommerce\Payment\PaymentService;
+use Mollie\WooCommerce\Payment\PaymentProcessor;
use Mollie\WooCommerce\PaymentMethods\Ideal;
use Mollie\WooCommerce\SDK\Api;
use Mollie\WooCommerce\SDK\HttpResponse;
@@ -50,14 +53,24 @@ public function statusHelper()
return new Status();
}
- public function paymentFactory($apiClientMock){
+ public function genericPaymentGatewayMock()
+ {
+ $mock = $this->getMockBuilder(PaymentGateway::class)
+ ->addMethods(['supports'])
+ ->onlyMethods(['get_return_url'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ return $mock;
+ }
+
+ public function paymentFactory(){
return new PaymentFactory(
- $this->dataHelper($apiClientMock),
- $this->apiHelper($apiClientMock),
- $this->settingsHelper(),
- $this->pluginId(),
- $this->loggerMock(),
- $this->orderLines($apiClientMock)
+ function(){
+ return $this->mollieOrderMock();
+ },
+ function(){
+ return $this->molliePaymentMock();
+ }
);
}
@@ -67,6 +80,12 @@ public function mollieOrderMock()
->disableOriginalConstructor()
->getMock();
}
+ public function molliePaymentMock()
+ {
+ return $this->getMockBuilder(MolliePayment::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ }
public function noticeMock()
{
return $this->getMockBuilder(AdminNotice::class)
@@ -77,7 +96,7 @@ public function noticeMock()
public function paymentService()
{
return $this->createConfiguredMock(
- PaymentService::class,
+ PaymentProcessor::class,
[
]
@@ -86,7 +105,7 @@ public function paymentService()
public function orderInstructionsService()
{
return $this->createConfiguredMock(
- OrderInstructionsService::class,
+ OrderInstructionsManager::class,
[
]
@@ -239,9 +258,8 @@ public function paymentMethodBuilder($paymentMethodName, $isSepa = false, $isSub
return $paymentMethod;
}
- public function mollieGatewayBuilder($paymentMethodName, $isSepa, $isSubscription, $settings, $paymentService = null) {
+ public function mollieGatewayBuilder($paymentMethodName, $isSepa, $isSubscription, $settings) {
$paymentMethod = $this->paymentMethodBuilder($paymentMethodName, $isSepa, $isSubscription, $settings);
- $paymentService = $paymentService ?? $this->paymentService();
$orderInstructionsService = $this->orderInstructionsService();
$mollieOrderService = $this->mollieOrderService();
$data = $this->dataHelper();
@@ -251,16 +269,14 @@ public function mollieGatewayBuilder($paymentMethodName, $isSepa, $isSubscriptio
$mollieObject = $this->getMockBuilder(MollieObject::class)
->disableOriginalConstructor()
->getMock();
- $apiClientMock = $this->apiClient();
- $paymentFactory = $this->paymentFactory($apiClientMock);
+ $paymentFactory = $this->paymentFactory();
$pluginId = $this->pluginId();
return $this->buildTesteeMock(
- MolliePaymentGateway::class,
+ MolliePaymentGatewayHandler::class,
[
$paymentMethod,
- $paymentService,
$orderInstructionsService,
$mollieOrderService,
$data,
@@ -281,6 +297,13 @@ public function mollieGatewayBuilder($paymentMethodName, $isSepa, $isSubscriptio
]
)->getMock();
}
+
+ public function requestFactory()
+ {
+ return $this->getMockBuilder(RequestFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ }
}
class emptyLogger implements LoggerInterface{
diff --git a/tests/php/Functional/PayPalButton/AjaxRequestsTest.php b/tests/php/Functional/PayPalButton/AjaxRequestsTest.php
index 17b6bd79f..79f7c2103 100644
--- a/tests/php/Functional/PayPalButton/AjaxRequestsTest.php
+++ b/tests/php/Functional/PayPalButton/AjaxRequestsTest.php
@@ -8,7 +8,7 @@
use Mollie\WooCommerce\Buttons\PayPalButton\PayPalAjaxRequests;
use Mollie\WooCommerce\Buttons\PayPalButton\PayPalDataObjectHttp;
use Mollie\WooCommerce\Gateway\Surcharge;
-use Mollie\WooCommerce\Subscription\MollieSubscriptionGateway;
+use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;
use Mollie\WooCommerceTests\Functional\HelperMocks;
use Mollie\WooCommerceTests\Stubs\postDTOTestsStubs;
use Mollie\WooCommerceTests\TestCase;
@@ -75,7 +75,7 @@ public function testcreateWcOrderSuccess()
]
);
$logger = $this->helperMocks->loggerMock();
- $paypalGateway = $this->mollieGateway('paypal', false, true);
+ $paypalGateway = $this->helperMocks->genericPaymentGatewayMock();
expect('wp_verify_nonce')
->andReturn(true);
$dataObject = new PayPalDataObjectHttp($logger);
diff --git a/tests/php/Functional/Payment/OrderItemsRefunderTest.php b/tests/php/Functional/Payment/OrderItemsRefunderTest.php
index 15e04b900..c0ca7fcaf 100644
--- a/tests/php/Functional/Payment/OrderItemsRefunderTest.php
+++ b/tests/php/Functional/Payment/OrderItemsRefunderTest.php
@@ -8,8 +8,8 @@
use Mollie\Api\Exceptions\ApiException;
use Mollie\Api\Resources\Order;
use Mollie\Api\Resources\Refund;
-use Mollie\WooCommerce\Payment\OrderItemsRefunder;
-use Mollie\WooCommerce\Payment\RefundLineItemsBuilder;
+use Mollie\WooCommerce\Gateway\Refund\OrderItemsRefunder;
+use Mollie\WooCommerce\Gateway\Refund\RefundLineItemsBuilder;
use Mollie\WooCommerce\Shared\Data;
diff --git a/tests/php/Functional/Payment/RequestObjectTest.php b/tests/php/Functional/Payment/OrderRequestStrategyTest.php
similarity index 55%
rename from tests/php/Functional/Payment/RequestObjectTest.php
rename to tests/php/Functional/Payment/OrderRequestStrategyTest.php
index 53e8f119f..1122ededf 100644
--- a/tests/php/Functional/Payment/RequestObjectTest.php
+++ b/tests/php/Functional/Payment/OrderRequestStrategyTest.php
@@ -3,25 +3,145 @@
namespace Mollie\WooCommerceTests\Functional\Payment;
+use Mockery;
use Mollie\Api\MollieApiClient;
-use Mollie\WooCommerce\Payment\MollieOrder;
use Mollie\WooCommerce\Payment\OrderLines;
+use Mollie\WooCommerce\Payment\Request\Middleware\MiddlewareHandler;
+use Mollie\WooCommerce\Payment\Request\Middleware\OrderLinesMiddleware;
+use Mollie\WooCommerce\Payment\Request\Strategies\OrderRequestStrategy;
+use Mollie\WooCommerce\Payment\Request\Strategies\RequestStrategyInterface;
use Mollie\WooCommerceTests\Functional\HelperMocks;
use Mollie\WooCommerceTests\Stubs\WC_Order_Item_Product;
use Mollie\WooCommerceTests\Stubs\WC_Settings_API;
use Mollie\WooCommerceTests\Stubs\WC_Product;
use Mollie\WooCommerceTests\TestCase;
use PHPUnit\Framework\MockObject\MockObject;
+use WC_Order;
+
use function Brain\Monkey\Functions\stubs;
use function Brain\Monkey\Functions\when;
/**
* Class Mollie_WC_Plugin_Test
*/
-class RequestObjectTest extends TestCase
+class OrderRequestStrategyTest extends TestCase
{
- /** @var HelperMocks */
+ /**
+ * @var HelperMocks
+ */
private $helperMocks;
+
+ public function setUp(): void
+ {
+ $_POST = [];
+ parent::setUp();
+
+ when('__')->returnArg(1);
+
+ $this->helperMocks = new HelperMocks();
+ }
+
+ public function tearDown(): void
+ {
+ parent::tearDown();
+ Mockery::close();
+ }
+
+ public function test_createRequest_returnsFailure_ifGatewayMissingOrNotMollie()
+ {
+ when('wc_get_payment_gateway_by_order')->justReturn(null);
+
+
+ stubs([
+ 'mollieWooCommerceIsMollieGateway' => false,
+ ]);
+
+ $dataHelper = $this->helperMocks->dataHelper();
+ $settingsHelper = $this->helperMocks->settingsHelper();
+
+ $middlewareHandler = new MiddlewareHandler([]);
+ $strategyClass = OrderRequestStrategy::class;
+ /** @var RequestStrategyInterface $strategy */
+ $strategy = new $strategyClass($dataHelper, $settingsHelper, $middlewareHandler);
+
+ $order = Mockery::mock(WC_Order::class);
+
+ $result = $strategy->createRequest($order, 'some-customer-id');
+ $this->assertEquals(['result' => 'failure'], $result, 'Should return failure if no gateway is found.');
+ }
+
+ public function test_createRequest_returnsFailure_ifNotMollieGateway()
+ {
+ $nonMollieGateway = new \stdClass();
+ $nonMollieGateway->id = 'some_other_gateway';
+
+ when('wc_get_payment_gateway_by_order')->justReturn($nonMollieGateway);
+ stubs([
+ 'mollieWooCommerceIsMollieGateway' => false,
+ ]);
+
+ $dataHelper = $this->helperMocks->dataHelper();
+ $settingsHelper = $this->helperMocks->settingsHelper();
+ $middlewareHandler = new MiddlewareHandler([]);
+ $strategyClass = OrderRequestStrategy::class;
+ $strategy = new $strategyClass($dataHelper, $settingsHelper, $middlewareHandler);
+ $order = Mockery::mock(WC_Order::class);
+
+ $result = $strategy->createRequest($order, 'some-customer-id');
+ $this->assertEquals(['result' => 'failure'], $result, 'Should return failure if gateway is not Mollie.');
+ }
+
+ public function test_createRequest_buildsExpectedData_forValidMollieGateway()
+ {
+ $mollieGateway = new \stdClass();
+ $mollieGateway->id = 'mollie_ideal';
+
+ when('wc_get_payment_gateway_by_order')->justReturn($mollieGateway);
+ stubs([
+ 'mollieWooCommerceIsMollieGateway' => true,
+ ]);
+
+ $dataHelper = $this->helperMocks->dataHelper();
+ $settingsHelper = $this->helperMocks->settingsHelper();
+ $order = Mockery::mock(WC_Order::class);
+ $middleware = Mockery::mock(OrderLinesMiddleware::class);
+ $middleware->shouldReceive('__invoke')->andReturnUsing(function ($data) {
+ $data['decorated'] = true;
+ return $data;
+ });
+
+ $middlewareHandler = new MiddlewareHandler([$middleware]);
+
+
+ $strategyClass = OrderRequestStrategy::class;
+ $strategy = new $strategyClass($dataHelper, $settingsHelper, $middlewareHandler);
+
+
+ $order->shouldReceive('get_id')->andReturn(1234);
+ $order->shouldReceive('get_total')->andReturn(99.99);
+ $order->shouldReceive('get_order_number')->andReturn('1001');
+ $order->shouldReceive('get_currency')->andReturn('EUR');
+
+ $result = $strategy->createRequest($order, 'cust_abc123');
+
+
+ $this->assertArrayHasKey('amount', $result);
+ $this->assertArrayHasKey('method', $result);
+ $this->assertArrayHasKey('locale', $result);
+ $this->assertArrayHasKey('metadata', $result);
+ $this->assertArrayHasKey('orderNumber', $result);
+
+ $this->assertEquals('ideal', $result['method']);
+ $this->assertEquals('en_US', $result['locale'], 'Should get locale from settings');
+ $this->assertEquals('EUR', $result['amount']['currency']);
+ $this->assertEquals('99.99', $result['amount']['value'], 'Should reflect the formatted total');
+
+ $this->assertEquals(1234, $result['metadata']['order_id']);
+ $this->assertEquals('1001', $result['orderNumber']);
+
+ $this->assertArrayHasKey('decorated', $result, 'Decorator was applied');
+ $this->assertTrue($result['decorated'], 'Decorator set its key to true');
+ }
public $products = [
'1' => [
'id' => 1,
@@ -45,12 +165,6 @@ class RequestObjectTest extends TestCase
]
];
- public function __construct($name = null, array $data = [], $dataName = '')
- {
- parent::__construct($name, $data, $dataName);
- $this->helperMocks = new HelperMocks();
- }
-
/**
* GIVEN A PAYMENT REQUEST
* WHEN THE TOTAL AMOUNT HAS DECIMALS
@@ -58,6 +172,7 @@ public function __construct($name = null, array $data = [], $dataName = '')
*
*
* @test
+ * @group skip
*/
public function processPayment_decimals_and_taxes_request_no_mismatch()
{
@@ -96,61 +211,70 @@ private function generateTestDataSet(): array
public function executeTest($order)
{
$customerId = 1;
- $wrapperMock = $this->createMock(WC_Product::class);
+ // Mock product retrieval so each product ID corresponds to a product with the given price
+ $wrapperMock = $this->createMock(WC_Product::class);
$callback = function ($productId) {
$price = $this->products[$productId]['price'];
- $productMock = $this->wcProduct($productId, $price);
-
- return $productMock;
+ return $this->wcProduct($productId, $price);
};
$wrapperMock->method('getProduct')->willReturnCallback($callback);
+ $apiClientMock = $this->createConfiguredMock(
+ MollieApiClient::class,
+ []
+ );
+ $orderLines = new OrderLines($this->helperMocks->dataHelper($apiClientMock), $this->helperMocks->pluginId());
+ $linesDecorator = new OrderLinesMiddleware($orderLines, 'no_category');
+ $paymentGateway = $this->helperMocks->genericPaymentGatewayMock();
+ when('wc_get_payment_gateway_by_order')->justReturn($paymentGateway);
stubs([
- 'wc_get_payment_gateway_by_order' => $this->mollieGateway(
- 'ideal',
- $this->helperMocks->paymentService()
- ),
'add_query_arg' => 'https://webshop.example.org/wc-api/mollie_return?order_id=1&key=wc_order_hxZniP1zDcnM8',
'WC' => $this->wooCommerce(),
'get_option' => ['enabled' => false],
'wc_get_product' => $wrapperMock,
'wc_clean' => false,
'wp_parse_url' => null,
- 'wp_strip_all_tags' => null
+ 'wp_strip_all_tags' => null,
]);
- $apiClientMock = $this->createConfiguredMock(
- MollieApiClient::class,
- []
- );
- $orderLines = new OrderLines($this->helperMocks->dataHelper($apiClientMock), $this->helperMocks->pluginId());
- $testee = new MollieOrder(
- $this->helperMocks->orderItemsRefunder(),
- 'order',
- $this->helperMocks->pluginId(),
- $this->helperMocks->apiHelper($apiClientMock),
- $this->helperMocks->settingsHelper(),
+
+
+
+ $strategy = new OrderRequestStrategy(
$this->helperMocks->dataHelper($apiClientMock),
- $this->helperMocks->loggerMock(),
- $orderLines
+ $this->helperMocks->settingsHelper(),
+ [$linesDecorator]
);
+ $createRequestResult = $strategy->createRequest($order, (string) $customerId);
- /*
- * Execute Test
- */
+ $this->assertArrayHasKey('amount', $createRequestResult, 'createRequest should include amount');
+ $this->assertArrayHasKey('value', $createRequestResult['amount'], 'createRequest->amount should have value');
+ $this->assertArrayHasKey('currency', $createRequestResult['amount'], 'createRequest->amount should have currency');
+ $this->assertArrayHasKey('method', $createRequestResult, 'createRequest should include method');
+ $this->assertArrayHasKey('locale', $createRequestResult, 'createRequest should include locale');
+ $this->assertArrayHasKey('metadata', $createRequestResult, 'createRequest should include metadata');
+ $this->assertArrayHasKey('orderNumber', $createRequestResult, 'createRequest should include orderNumber');
- $arrayResult = $testee->getPaymentRequestData($order, $customerId);
- $expectedResult = $this->noMismatchError($arrayResult);
+ $expectedResult = $this->noMismatchError($createRequestResult);
$this->assertTrue($expectedResult);
}
-
- protected function setUp(): void
+ private function wcProduct($productId, $price)
{
- $_POST = [];
- parent::setUp();
- when('__')->returnArg(1);
+ $item = $this->createConfiguredMock(
+ WC_Product::class,
+ [
+ 'get_price' => $price,
+ 'get_id'=>$productId,
+ 'get_type' => 'simple',
+ 'needs_shipping' => true,
+ 'get_sku'=>5,
+ 'is_taxable'=>true
+ ]
+ );
+
+ return $item;
}
protected function mollieGateway($paymentMethodName, $testee, $isSepa = false, $isSubscription = false)
diff --git a/tests/php/Functional/Payment/PaymentServiceTest.php b/tests/php/Functional/Payment/PaymentServiceTest.php
index 8e5d00300..39bc68396 100644
--- a/tests/php/Functional/Payment/PaymentServiceTest.php
+++ b/tests/php/Functional/Payment/PaymentServiceTest.php
@@ -5,9 +5,11 @@
use Mollie\Api\Endpoints\OrderEndpoint;
use Mollie\Api\Exceptions\ApiException;
use Mollie\Api\MollieApiClient;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
+use Mollie\WooCommerce\Payment\MollieOrder;
use Mollie\WooCommerce\Payment\PaymentCheckoutRedirectService;
-use Mollie\WooCommerce\Payment\PaymentService;
+use Mollie\WooCommerce\Payment\PaymentFactory;
+use Mollie\WooCommerce\Payment\PaymentProcessor;
use Mollie\WooCommerce\PaymentMethods\IconFactory;
use Mollie\WooCommerce\PaymentMethods\Voucher;
use Mollie\WooCommerceTests\Functional\HelperMocks;
@@ -74,19 +76,27 @@ public function processPayment_Order_success(){
);
$apiClientMock->orders = $orderEndpoints;
$voucherDefaultCategory = Voucher::NO_CATEGORY;
- $testee = new PaymentService(
+ $deprecatedGatewayHelper = $this->mollieGateway($paymentMethodId);
+ $testee = new PaymentProcessor(
$this->helperMocks->noticeMock(),
$this->helperMocks->loggerMock(),
- $this->helperMocks->paymentFactory($apiClientMock),
+ $this->paymentFactory(),
$this->helperMocks->dataHelper($apiClientMock),
$this->helperMocks->apiHelper($apiClientMock),
$this->helperMocks->settingsHelper(),
$this->helperMocks->pluginId(),
$this->paymentCheckoutService($apiClientMock),
- $voucherDefaultCategory
+ $voucherDefaultCategory,
+ ['mollie_wc_gateway_ideal' => $deprecatedGatewayHelper]
);
- $gateway = $this->mollieGateway($paymentMethodId, $testee);
- $testee->setGateway($gateway);
+ $gateway = $this->helperMocks->genericPaymentGatewayMock();
+ $gateway->id = 'mollie_wc_gateway_ideal';
+ $gateway->method('supports')->willReturnMap([
+ ['subscriptions', false]
+ ]);
+ $gateway->method('get_return_url')->willReturn($processPaymentRedirect);
+
+ $testee->setGatewayHelper($gateway->id);
stubs(
[
@@ -102,24 +112,15 @@ public function processPayment_Order_success(){
]
);
- $expectedRequestToMollie = $this->expectedRequestData($wcOrder);
- $orderEndpoints->method('create')->with($expectedRequestToMollie);
-
/*
* Expectations
*/
- expect('is_plugin_active')
- ->andReturn(false);
+ //we are not testing the request data, as that is tested in a separate test
+
expect('get_option')
->with('mollie-payments-for-woocommerce_api_switch')
->andReturn(false);
- expect('get_transient')->andReturn(['ideal'=>['id'=>'ideal', 'status'=>'activated']]);
- $wcOrder->expects($this->any())
- ->method('get_billing_company')
- ->willReturn('');
- $wcOrder->expects($this->any())
- ->method('get_billing_phone')
- ->willReturn('+34345678900');
+
/*
* Execute Test
*/
@@ -127,7 +128,7 @@ public function processPayment_Order_success(){
'result' => 'success',
'redirect' => $processPaymentRedirect,
);
- $arrayResult = $testee->processPayment(1, $wcOrder, $paymentMethod, $processPaymentRedirect);
+ $arrayResult = $testee->processPayment($wcOrder, $gateway);
self::assertEquals($expectedResult, $arrayResult);
}
@@ -157,26 +158,29 @@ public function processAsMollieOrder_BailsIf_FraudException()
$apiClientMock = $this->createMock(MollieApiClient::class);
$apiClientMock->orders = $orderEndpointsMock;
$voucherDefaultCategory = Voucher::NO_CATEGORY;
-
- $testee = new PaymentService(
+ $gateway = $this->helperMocks->genericPaymentGatewayMock();
+ $gateway->id = 'mollie_wc_gateway_ideal';
+ $deprecatedGatewayHelper = $this->mollieGateway($paymentMethodId);
+ $testee = new PaymentProcessor(
$this->helperMocks->noticeMock(),
$this->helperMocks->loggerMock(),
- $this->helperMocks->paymentFactory($apiClientMock),
+ $this->helperMocks->paymentFactory(),
$this->helperMocks->dataHelper($apiClientMock),
$this->helperMocks->apiHelper($apiClientMock),
$this->helperMocks->settingsHelper(),
$this->helperMocks->pluginId(),
$this->paymentCheckoutService($apiClientMock),
- $voucherDefaultCategory
+ $voucherDefaultCategory,
+ ['mollie_wc_gateway_ideal' => $deprecatedGatewayHelper]
);
- $gateway = $this->mollieGateway($paymentMethodId, $testee);
$testee->setGateway($gateway);
+ $testee->setGatewayHelper('mollie_wc_gateway_ideal');
$wcOrderId = 1;
$wcOrderKey = 'wc_order_hxZniP1zDcnM8';
$wcOrder = $this->wcOrder($wcOrderId, $wcOrderKey);
$cusomerId = 1;
$apiKey = 'test_test';
- $method = new \ReflectionMethod(PaymentService::class, 'processAsMollieOrder');
+ $method = new \ReflectionMethod(PaymentProcessor::class, 'processAsMollieOrder');
$method->setAccessible(true);
$this->expectException(ApiException::class);
@@ -198,11 +202,34 @@ protected function setUp(): void
when('__')->returnArg(1);
}
- protected function mollieGateway($paymentMethodName, $testee, $isSepa = false, $isSubscription = false){
- return $this->helperMocks->mollieGatewayBuilder($paymentMethodName, $isSepa, $isSubscription, [], $testee);
+ protected function mollieGateway($paymentMethodName, $isSepa = false, $isSubscription = false){
+ return $this->helperMocks->mollieGatewayBuilder($paymentMethodName, $isSepa, $isSubscription, []);
}
+ public function paymentFactory(){
+ return new PaymentFactory(
+ function(){
+ return $this->mollieOrderMock();
+ },
+ function(){
+ return $this->molliePaymentMock();
+ }
+ );
+ }
+
+ public function mollieOrderMock()
+ {
+ $dataMock = $this->createMock(stdClass::class);
+ $dataMock->id = 'mocked_id';
+ $mollieOrder = $this->createConfiguredMock(MollieOrder::class,
+ [
+ 'getPaymentRequestData' => [],
+ 'data' => $dataMock
+ ]
+ );
+ return $mollieOrder;
+ }
/**
*
* @throws PHPUnit_Framework_Exception
diff --git a/tests/php/Functional/Payment/RefundLineItemsBuilderTest.php b/tests/php/Functional/Payment/RefundLineItemsBuilderTest.php
index b5924f04f..c316e84a0 100644
--- a/tests/php/Functional/Payment/RefundLineItemsBuilderTest.php
+++ b/tests/php/Functional/Payment/RefundLineItemsBuilderTest.php
@@ -2,9 +2,9 @@
namespace Mollie\WooCommerceTests\Functional\Payment;
-use Mollie\WooCommerce\Payment\OrderLineStatus;
-use Mollie\WooCommerce\Payment\PartialRefundException;
-use Mollie\WooCommerce\Payment\RefundLineItemsBuilder;
+use Mollie\WooCommerce\Gateway\Refund\OrderLineStatus;
+use Mollie\WooCommerce\Gateway\Refund\PartialRefundException;
+use Mollie\WooCommerce\Gateway\Refund\RefundLineItemsBuilder;
use Mollie\WooCommerce\Shared\Data;
use Mollie\WooCommerceTests\Stubs\WC_Order_Item;
use Mollie\WooCommerceTests\TestCase;
diff --git a/tests/php/Functional/PaymentMethod/PaymentMethodTest.php b/tests/php/Functional/PaymentMethod/PaymentMethodTest.php
index 900cf6957..9deaf2796 100644
--- a/tests/php/Functional/PaymentMethod/PaymentMethodTest.php
+++ b/tests/php/Functional/PaymentMethod/PaymentMethodTest.php
@@ -1,11 +1,11 @@
pluginUrl, $this->pluginPath);
$settingsHelper = $this->helperMocks->settingsHelper();
- $paymentFieldsService = new PaymentFieldsService($this->helperMocks->dataHelper());
$surchargeService = new Surcharge();
$paymentMethod = $this->buildTesteeMock(
Creditcard::class,
- [$iconFactory, $settingsHelper, $paymentFieldsService, $surchargeService, []],
+ [$iconFactory, $settingsHelper, $surchargeService, []],
['getConfig', 'getSettings', 'getInitialOrderStatus', 'getIdFromConfig']
)->getMock();
diff --git a/tests/php/Functional/SDK/SdkTest.php b/tests/php/Functional/SDK/SdkTest.php
index eb2fd5ce2..2ca9c153b 100644
--- a/tests/php/Functional/SDK/SdkTest.php
+++ b/tests/php/Functional/SDK/SdkTest.php
@@ -9,11 +9,11 @@
use Mollie\Api\Resources\Mandate;
use Mollie\Api\Resources\MandateCollection;
use Mollie\Api\Resources\Payment;
-use Mollie\WooCommerce\Gateway\MolliePaymentGateway;
+use Mollie\WooCommerce\Gateway\MolliePaymentGatewayHandler;
use Mollie\WooCommerce\Payment\MollieObject;
use Mollie\WooCommerce\SDK\HttpResponse;
use Mollie\WooCommerce\SDK\WordPressHttpAdapter;
-use Mollie\WooCommerce\Subscription\MollieSubscriptionGateway;
+use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;
use Mollie\WooCommerceTests\Functional\HelperMocks;
use Mollie\WooCommerceTests\Stubs\WooCommerceMocks;
use Mollie\WooCommerceTests\TestCase;
diff --git a/tests/php/Functional/Shared/SurchargeHandlerTest.php b/tests/php/Functional/Shared/SurchargeHandlerTest.php
index bbf43be09..1a9f8817e 100644
--- a/tests/php/Functional/Shared/SurchargeHandlerTest.php
+++ b/tests/php/Functional/Shared/SurchargeHandlerTest.php
@@ -1,10 +1,10 @@
createConfiguredMock(
- MolliePaymentGateway::class,
+ MolliePaymentGatewayHandler::class,
[
'getSelectedIssuer' => 'ideal_INGBNL2A',
'get_return_url' => 'https://webshop.example.org/wc-api/',
diff --git a/tests/php/Functional/Subscription/MollieSubscriptionTest.php b/tests/php/Functional/Subscription/MollieSubscriptionTest.php
index d792bfa8b..ce9fce68a 100644
--- a/tests/php/Functional/Subscription/MollieSubscriptionTest.php
+++ b/tests/php/Functional/Subscription/MollieSubscriptionTest.php
@@ -10,7 +10,7 @@
use Mollie\Api\Resources\Payment;
use Mollie\WooCommerce\Payment\MollieObject;
use Mollie\WooCommerce\SDK\HttpResponse;
-use Mollie\WooCommerce\Subscription\MollieSubscriptionGateway;
+use Mollie\WooCommerce\Subscription\MollieSubscriptionGatewayHandler;
use Mollie\WooCommerceTests\Functional\HelperMocks;
use Mollie\WooCommerceTests\TestCase;
@@ -43,7 +43,7 @@ public function renewSubscriptionPaymentTest()
$gatewayName = 'mollie_wc_gateway_ideal';
$renewalOrder = $this->wcOrder();
$subscription = $this->wcOrder(2, $gatewayName, $renewalOrder, 'active' );
-
+ $gateway = $this->helperMocks->genericPaymentGatewayMock();
$testee = $this->buildTestee();
expect('wcs_get_subscriptions_for_renewal_order')->andReturn(
@@ -52,7 +52,7 @@ public function renewSubscriptionPaymentTest()
$testee->expects($this->once())->method(
'restore_mollie_customer_id_and_mandate'
)->willReturn(false);
- expect('wc_get_payment_gateway_by_order')->andReturn($gatewayName);
+ expect('wc_get_payment_gateway_by_order')->andReturn($gateway);
$renewalOrder->expects($this->once())->method(
'set_payment_method'
)->with($gatewayName);
@@ -61,13 +61,12 @@ public function renewSubscriptionPaymentTest()
expect('wcs_get_subscription')->andReturn($subscription);
$expectedResult = ['result' => 'success'];
- $result = $testee->scheduled_subscription_payment(1.02, $renewalOrder);
+ $result = $testee->scheduled_subscription_payment(1.02, $renewalOrder, $gateway);
$this->assertEquals($expectedResult, $result);
}
private function buildTestee(){
$paymentMethod = $this->helperMocks->paymentMethodBuilder('Ideal');
- $paymentService = $this->helperMocks->paymentService();
$orderInstructionsService = $this->helperMocks->orderInstructionsService();
$mollieOrderService = $this->helperMocks->mollieOrderService();
$data = $this->helperMocks->dataHelper();
@@ -106,10 +105,9 @@ private function buildTestee(){
$pluginId = $this->helperMocks->pluginId();
$apiHelper = $this->helperMocks->apiHelper($apiClientMock);
return $this->buildTesteeMock(
- MollieSubscriptionGateway::class,
+ MollieSubscriptionGatewayHandler::class,
[
$paymentMethod,
- $paymentService,
$orderInstructionsService,
$mollieOrderService,
$data,
diff --git a/tests/php/Stubs/stubs.php b/tests/php/Stubs/stubs.php
deleted file mode 100644
index cb4c05ac2..000000000
--- a/tests/php/Stubs/stubs.php
+++ /dev/null
@@ -1,5 +0,0 @@
-