Merge pull request #31 from michielgerritsen/release

Release

Author: Marvin-Magmodules

src/Mollie_HyvaCompatibility/view/frontend/layout/hyva_checkout_cart_index.xml

@@ -11,6 +11,7 @@
                    class="Mollie\Payment\Block\Applepay\Shortcut\Button"
                    name="mollie_cart_script"
                    after="checkout.cart.methods.bottom"
+                   ifconfig="payment/mollie_methods_applepay/active"
             />
         </referenceContainer>
     </body>

src/Mollie_HyvaCompatibility/view/frontend/layout/hyva_default.xml

@@ -8,7 +8,9 @@
         <referenceContainer name="cart-drawer.bottom">
             <block template="Mollie_Payment::applepay/minicart/applepay-button-script.phtml"
                    class="Mollie\Payment\Block\Applepay\Shortcut\Button"
-                   name="mollie_cart_script"/>
+                   name="mollie_cart_script"
+                   ifconfig="payment/mollie_methods_applepay/active"
+            />
         </referenceContainer>
     </body>
 </page>

src/Mollie_HyvaCompatibility/view/frontend/templates/Mollie_Payment/applepay/minicart/applepay-button-script.phtml

@@ -49,10 +49,7 @@ use Magento\Framework\Escaper;
             },
 
             pay: () => {
-                // The $block total is more reliable as it holds shipping costs and discounts, but due to some setups
-                // it is sometimes empty. In that case, use the totalAmount from the browser storage.
-                // The correct total amount is retrieved and set during the shipping step.
-                const amount = "<?= $escaper->escapeJs($block->getBaseGrandTotal()); ?>" || this.totalAmount;
+                const amount = this.totalAmount;
                 let countryCode, postalCode, shippingMethods, selectedShippingMethod, quoteTotals;
 
                 const request = {
@@ -82,19 +79,28 @@ use Magento\Framework\Escaper;
                 let session = new ApplePaySession(3, request);
 
                 const getTotal = () => {
-                    let totals = [...quoteTotals];
-                    let total = totals.pop();
+                    const total = quoteTotals.find(item => item.code === 'grand_total') || quoteTotals[quoteTotals.length - 1];
 
                     total.label = "<?= $escaper->escapeJs($block->getStoreName()); ?>";
 
-                    return total;
+                    const payload = { total };
+                    window.dispatchEvent(new CustomEvent('mollie-applepay-total', {
+                        detail: payload,
+                    }));
+
+                    return payload.total;
                 };
 
                 const getLineItems = () => {
                     let totals = [...quoteTotals];
-                    totals.pop();
+                    totals = totals.filter(item => item.code !== 'grand_total');
+
+                    const payload = { lineItems: totals };
+                    window.dispatchEvent(new CustomEvent('mollie-applepay-lineitems', {
+                        detail: payload,
+                    }));
 
-                    return totals;
+                    return payload.lineItems;
                 };
 
                 const handleAjaxError = (message) => {

src/Mollie_HyvaCompatibility/view/frontend/templates/Mollie_Payment/product/view/applepay.phtml

@@ -78,22 +78,30 @@ $product = $block->getProduct();
 
                 const getLineItems = () => {
                     let totals = [...quoteTotals];
-                    totals.pop();
+                    totals = totals.filter(item => item.code !== 'grand_total');
 
-                    return totals;
+                    const payload = { lineItems: totals };
+                    window.dispatchEvent(new CustomEvent('mollie-applepay-lineitems', {
+                        detail: payload,
+                    }));
+
+                    return payload.lineItems;
                 }
 
                 const getTotal = () => {
-                    let totals = [...quoteTotals];
-
-                    var total = totals.pop();
+                    const total = quoteTotals.find(item => item.code === 'grand_total') || quoteTotals[quoteTotals.length - 1];
 
                     total.label = storeName;
 
-                    return total;
+                    const payload = { total };
+                    window.dispatchEvent(new CustomEvent('mollie-applepay-total', {
+                        detail: payload,
+                    }));
+
+                    return payload.total;
                 }
 
-                handleAjaxError = (message) => {
+                const handleAjaxError = (message) => {
                     if (session) session.abort();
 
                     dispatchMessages([

src/Mollie_HyvaCompatibility/view/frontend/templates/product/view/subscription-options.phtml

@@ -25,7 +25,7 @@ $heroicons = $viewModels->require(HeroiconsOutline::class);
         <button
             @click="setOption"
             type="submit"
-            class="action primary tocart product-addtocart-button select-subscription"
+            class="btn btn-secondary action primary tocart product-addtocart-button select-subscription"
             value="onetimepurchase"
             title="<?= __('One Time Purchase') ?>"
             form="product_addtocart_form"