Merge pull request #65 from michielgerritsen/release

Release

Author: Marvin-Magmodules

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

@@ -46,6 +46,9 @@ bin/magento config:set payment/mollie_methods_twint/active 1
 # Enable Components
 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
+
 # Disable webhooks
 bin/magento config:set payment/mollie_general/use_webhooks custom_url
 
@@ -60,6 +63,10 @@ bin/magento config:set payment/mollie_general/currency 0 --scope=ch --scope-code
 bin/magento config:set currency/options/default PLN --scope=pl --scope-code=ch
 bin/magento config:set payment/mollie_general/currency 0 --scope=pl --scope-code=ch
 
+# Disable flat catalog
+bin/magento config:set catalog/frontend/flat_catalog_category 0
+bin/magento config:set catalog/frontend/flat_catalog_product 0
+
 # Disable the use of the base currency
 bin/magento config:set payment/mollie_general/currency 0
 

src/Mollie_HyvaCheckout/Observer/SalesQuoteCollectTotalsBefore/SetDefaultSelectedPaymentMethod.php

@@ -13,6 +13,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\State\InvalidTransitionException;
 use Magento\Quote\Api\Data\PaymentInterfaceFactory;
 use Magento\Quote\Api\PaymentMethodManagementInterface;
 use Magento\Quote\Model\Quote;
@@ -35,7 +36,7 @@ public function __construct(
         Config $config,
         PaymentInterfaceFactory $paymentFactory,
         StoreManagerInterface $storeManager,
-        PaymentMethodManagementInterface $paymentMethodManagement,
+        PaymentMethodManagementInterface $paymentMethodManagement
     ) {
         $this->paymentFactory = $paymentFactory;
         $this->config = $config;
@@ -78,7 +79,11 @@ public function execute(Observer $observer): void
         $payment->setMethod($defaultMethod);
 
         $quote->setPayment($payment);
-        $this->paymentMethodManagement->set($quote->getId(), $payment);
+        try {
+            $this->paymentMethodManagement->set($quote->getId(), $payment);
+        } catch (InvalidTransitionException $exception) {
+            // We are not able to set the payment method. Probably the address is not set yet.
+        }
     }
 
     /**

src/Mollie_HyvaCheckout/view/frontend/layout/hyva_checkout.xml

@@ -15,7 +15,9 @@
         <referenceContainer name="magewire.plugin.scripts">
             <block name="checkout.payment.methods.after.mollie_methods_applepay"
                    as="mollie_methods_applepay_after"
-                   template="Mollie_HyvaCheckout::component/payment/method/applepay_after.phtml">
+                   template="Mollie_HyvaCheckout::component/payment/method/applepay_after.phtml"
+                   ifconfig="payment/mollie_methods_applepay/active"
+            >
                 <arguments>
                     <argument name="magewire" xsi:type="object">
                         Mollie\HyvaCheckout\Magewire\Checkout\Payment\Method\ApplePay
@@ -25,7 +27,9 @@
 
             <block name="checkout.payment.methods.after.mollie_methods_creditcard"
                    as="mollie_methods_creditcard_after"
-                   template="Mollie_HyvaCheckout::component/payment/method/creditcard_after.phtml">
+                   template="Mollie_HyvaCheckout::component/payment/method/creditcard_after.phtml"
+                   ifconfig="payment/mollie_methods_creditcard/active"
+            >
                 <arguments>
                     <argument name="magewire" xsi:type="object">
                         Mollie\HyvaCheckout\Magewire\Checkout\Payment\Method\Creditcard
@@ -35,7 +39,9 @@
 
             <block name="checkout.payment.methods.after.mollie_methods_pointofsale"
                    as="mollie_methods_pointofsale_after"
-                   template="Mollie_HyvaCheckout::component/payment/method/pointofsale_after.phtml">
+                   template="Mollie_HyvaCheckout::component/payment/method/pointofsale_after.phtml"
+                   ifconfig="payment/mollie_methods_pointofsale/active"
+            >
                 <arguments>
                     <argument name="magewire" xsi:type="object">
                         Mollie\HyvaCheckout\Magewire\Checkout\Payment\Method\WithTerminal

src/Mollie_HyvaCheckout/view/frontend/layout/hyva_checkout_components.xml

@@ -63,7 +63,9 @@
         <referenceContainer name="hyva.checkout.main">
             <block name="checkout.payment.methods.after.mollie_methods_applepay"
                    as="mollie_methods_applepay_after"
-                   template="Mollie_HyvaCheckout::component/payment/method/applepay_after.phtml"/>
+                   template="Mollie_HyvaCheckout::component/payment/method/applepay_after.phtml"
+                   ifconfig="payment/mollie_methods_applepay/active"
+            />
         </referenceContainer>
 
         <referenceContainer name="price-summary.total-segments">

tests/End-2-End/support/pages/frontend/CheckoutPaymentPage.ts

@@ -15,6 +15,11 @@ export default class CheckoutPaymentPage {
     const methodRow = page.locator('#payment-method-list > div').filter({ hasText: name });
     const input = methodRow.locator('input');
 
+    if (await input.isChecked()) {
+        // If the input is already checked, we can skip clicking it again
+        return;
+    }
+
     await input.click();
 
     await hyvaCheckout.waitForLoaderWithText(page, 'Saving method');

tests/End-2-End/support/pages/frontend/ProductPage.ts

@@ -25,5 +25,7 @@ export default class ProductPage {
         const productTitle = await page.locator('[data-ui-id="page-title-wrapper"]').innerText();
         await page.getByText(`You added ${productTitle} to your shopping cart.`).waitFor({ state: 'visible' });
         await page.locator('#menu-cart-icon span').waitFor({ state: 'visible' });
+
+        return productTitle;
     }
 }

tests/End-2-End/tests/general.spec.ts

@@ -0,0 +1,24 @@
+/*
+ * Copyright Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+import { test, expect } from '@playwright/test';
+import ProductPage from "Pages/frontend/ProductPage";
+
+const productPage = new ProductPage();
+
+test('[C4251741] Can add multiple products to the cart', async ({ page }) => {
+    await productPage.openProduct(page, 4);
+    const product1Name = await productPage.addSimpleProductToCart(page, 1);
+
+    await productPage.openProduct(page, 5);
+    const product2Name = await productPage.addSimpleProductToCart(page, 1);
+
+    await page.goto('/checkout/cart');
+
+    await expect(page.locator('#shopping-cart-table .cart.item')).toHaveCount(2);
+
+    await page.locator('#shopping-cart-table').getByText(product1Name).waitFor({ state: 'visible' });
+    await page.locator('#shopping-cart-table').getByText(product2Name).waitFor({ state: 'visible' });
+});