Merge branch 'fix/MOL-808' into release/7.4.1

# Conflicts: # src/Notice/NoticeModule.php
mollie · Oct 24, 2023 · 1f47ca9 · 1f47ca9
2 parents 7637b47 + bd741a7
commit 1f47ca9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/src/Gateway/GatewayModule.php b/src/Gateway/GatewayModule.php
@@ -19,6 +19,7 @@
 use Mollie\WooCommerce\Buttons\PayPalButton\PayPalButtonHandler;
 use Mollie\WooCommerce\Gateway\Voucher\MaybeDisableGateway;
 use Mollie\WooCommerce\Notice\AdminNotice;
+use Mollie\WooCommerce\Notice\FrontendNotice;
 use Mollie\WooCommerce\Notice\NoticeInterface;
 use Mollie\WooCommerce\Payment\MollieObject;
 use Mollie\WooCommerce\Payment\MollieOrderService;
@@ -480,8 +481,8 @@ public function instantiatePaymentMethodGateways(ContainerInterface $container):
     {
         $logger = $container->get(Logger::class);
         assert($logger instanceof Logger);
-        $notice = $container->get(AdminNotice::class);
-        assert($notice instanceof AdminNotice);
+        $notice = $container->get(FrontendNotice::class);
+        assert($notice instanceof FrontendNotice);
         $paymentService = $container->get(PaymentService::class);
         assert($paymentService instanceof PaymentService);
         $mollieOrderService = $container->get(MollieOrderService::class);

diff --git a/src/Gateway/MolliePaymentGateway.php b/src/Gateway/MolliePaymentGateway.php
@@ -578,13 +578,12 @@ public function getReturnRedirectUrlForOrder(WC_Order $order): string
                     return $this->get_return_url($order);
                 } else {
                     $this->notice->addNotice(
-                        'notice',
+                        'error',
                         __(
                             'You have cancelled your payment. Please complete your order with a different payment method.',
                             'mollie-payments-for-woocommerce'
                         )
                     );
-
                     // Return to order payment page
                     return $failedRedirect;
                 }
@@ -599,7 +598,7 @@ public function getReturnRedirectUrlForOrder(WC_Order $order): string
                     && !$payment->isAuthorized()
                 ) {
                     $this->notice->addNotice(
-                        'notice',
+                        'error',
                         __(
                             'Your payment was not successful. Please complete your order with a different payment method.',
                             'mollie-payments-for-woocommerce'
@@ -613,7 +612,7 @@ public function getReturnRedirectUrlForOrder(WC_Order $order): string
                 }
             } catch (UnexpectedValueException $exc) {
                 $this->notice->addNotice(
-                    'notice',
+                    'error',
                     __(
                         'Your payment was not successful. Please complete your order with a different payment method.',
                         'mollie-payments-for-woocommerce'

diff --git a/src/Notice/FrontendNotice.php b/src/Notice/FrontendNotice.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mollie\WooCommerce\Notice;
+
+class FrontendNotice implements NoticeInterface
+{
+    public function addNotice($level, $message): void
+    {
+        wc_add_notice($message, $level);
+    }
+}
diff --git a/src/Notice/NoticeModule.php b/src/Notice/NoticeModule.php
@@ -6,11 +6,8 @@
 
 namespace Mollie\WooCommerce\Notice;
 
-use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
-use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ServiceModule;
-use Mollie\WooCommerce\Notice\AdminNotice;
-use Mollie\WooCommerce\Vendor\Psr\Container\ContainerInterface;
-use Mollie\WooCommerce\Notice\NoticeInterface as Notice;
+use Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
+use Inpsyde\Modularity\Module\ServiceModule;
 
 class NoticeModule implements ServiceModule
 {
@@ -22,6 +19,9 @@ public function services(): array
             AdminNotice::class => static function (): AdminNotice {
                 return new AdminNotice();
             },
+            FrontendNotice::class => static function (): FrontendNotice {
+                return new FrontendNotice();
+            },
         ];
     }
 }