Merge branch 'bugfix/get-issuers-signature' into release

Author: michielgerritsen

.github/workflows/templates/magento/configure-mollie.sh

@@ -49,6 +49,9 @@ bin/magento config:set payment/mollie_methods_creditcard/use_components 1
 # Set a default payment method
 bin/magento config:set payment/mollie_general/default_selected_method mollie_methods_ideal
 
+# Enable issuers for KBC
+bin/magento config:set  payment/mollie_methods_kbc/issuer_list_type radio
+
 # Disable webhooks
 bin/magento config:set payment/mollie_general/use_webhooks custom_url
 

src/Mollie_HyvaCheckout/Magewire/Checkout/Payment/Method/WithIssuer.php

@@ -1,7 +1,7 @@
 <?php
 /*
- *  Copyright Magmodules.eu. All rights reserved.
- *  See COPYING.txt for license details.
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Mollie\HyvaCheckout\Magewire\Checkout\Payment\Method;
@@ -56,8 +56,7 @@ public function mount(): void
     {
         $quote = $this->sessionCheckout->getQuote();
 
-        $mollieApiClient = $this->mollieApiClient->loadByStore();
-        $this->issuers = $this->getIssuers->execute($mollieApiClient, $this->method, 'list');
+        $this->issuers = $this->getIssuers->execute($this->method, 'list');
 
         if ($selectedIssuer = $quote->getPayment()->getAdditionalInformation('selected_issuer')) {
             $this->selectedIssuer = $selectedIssuer;

tests/End-2-End/tests/auth/backend-auth.setup.ts

@@ -6,12 +6,17 @@
 import { test as setup, expect } from '@playwright/test';
 import BackendLogin from 'Pages/backend/BackendLogin';
 import path from 'path';
+import fs from 'fs';
 
 const backendLogin = new BackendLogin();
 
 const authFile = path.join(__dirname, '../../.auth/backend.json');
 
 setup('[C4212591] authenticate', async ({ page }) => {
+  if (fs.existsSync(authFile)) {
+    return;
+  }
+
   await backendLogin.login(page);
 
   await page.context().storageState({ path: authFile });

tests/End-2-End/tests/methods/kbc.spec.ts

@@ -0,0 +1,65 @@
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+import { test, expect } from '@playwright/test';
+import CheckoutPaymentPage from "Pages/frontend/CheckoutPaymentPage";
+import VisitCheckoutPaymentCompositeAction from "CompositeActions/VisitCheckoutPaymentCompositeAction";
+import MollieHostedPaymentPage from "Pages/mollie/MollieHostedPaymentPage";
+import CheckoutSuccessPage from "Pages/frontend/CheckoutSuccessPage";
+import OrdersPage from "Pages/backend/OrdersPage";
+import CartPage from "Pages/frontend/CartPage";
+
+const checkoutPaymentPage = new CheckoutPaymentPage();
+const visitCheckoutPayment = new VisitCheckoutPaymentCompositeAction();
+const mollieHostedPaymentPage = new MollieHostedPaymentPage(expect);
+const checkoutSuccessPage = new CheckoutSuccessPage(expect);
+const ordersPage = new OrdersPage();
+const cartPage = new CartPage();
+
+const testCases = [
+  {status: 'paid', orderStatus: 'Processing', title: '[C4251742] Validate the submission of an order with KBC/CBC as payment method and payment mark as "Paid"'},
+  {status: 'failed', orderStatus: 'Canceled', title: '[C4251743] Validate the submission of an order with KBC/CBC as payment method and payment mark as "Failed"'},
+  {status: 'expired', orderStatus: 'Canceled', title: '[C4251744] Validate the submission of an order with KBC/CBC as payment method and payment mark as "Expired"'},
+  {status: 'canceled', orderStatus: 'Canceled', title: '[C4251745] Validate the submission of an order with KBC/CBC as payment method and payment mark as "Cancelled"'},
+];
+
+for (const testCase of testCases) {
+  test(testCase.title, async ({ page }) => {
+    test.skip(!process.env.mollie_available_methods.includes('kbc'), 'Skipping test as KBC is not available');
+
+    await visitCheckoutPayment.visit(page);
+
+    await checkoutPaymentPage.selectPaymentMethod(page, 'KBC');
+    await checkoutPaymentPage.placeOrder(page);
+
+    const values = ['CBC', 'KBC'];
+    const randomIndex = Math.floor(Math.random() * values.length);
+
+    mollieHostedPaymentPage.selectPaymentMethod(page, values[randomIndex]);
+    await mollieHostedPaymentPage.selectStatus(page, testCase.status);
+
+    if (testCase.status === 'paid') {
+      await checkoutSuccessPage.assertThatOrderSuccessPageIsShown(page);
+    }
+
+    if (testCase.status === 'canceled') {
+      await cartPage.assertCartPageIsShown(page);
+    }
+
+    if (checkoutPaymentPage.orderId) {
+      await ordersPage.openOrderById(page, checkoutPaymentPage.orderId);
+    } else if (mollieHostedPaymentPage.incrementId) {
+      await ordersPage.openByIncrementId(page, mollieHostedPaymentPage.incrementId);
+    } else {
+      await ordersPage.openLatestOrder(page);
+    }
+
+    if (testCase.status === 'expired') {
+      await ordersPage.callFetchStatus(page);
+    }
+
+    await ordersPage.assertOrderStatusIs(page, testCase.orderStatus);
+  });
+}