Merge pull request #6 from monsoonconsulting/dev

Merge dev into main

Block/AddToCart.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Monsoon Consulting. All rights reserved.
+ * See LICENSE_MONSOON.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Monsoon\HyvaAjaxAddToCart\Block;
+
+use Magento\Framework\View\Element\Template;
+use Monsoon\HyvaAjaxAddToCart\Model\ConfigInterface;
+
+/**
+ * Class AddToCart
+ */
+class AddToCart extends Template
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * Upsell block contructor
+     *
+     * @param Template\Context $context
+     * @param ConfigInterface $config
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context $context,
+        ConfigInterface $config,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+
+        $this->config = $config;
+    }
+
+    /**
+     * Render block HTML
+     *
+     * @return string
+     */
+    protected function _toHtml(): string
+    {
+        if (!$this->getTemplate() || !$this->config->isAjaxAddToCartEnabled()) {
+            return '';
+        }
+        return $this->fetchView($this->getTemplateFile());
+    }
+
+    /**
+     * Get Ajax Add To Cart Delay (in milliseconds)
+     *
+     * @return string
+     */
+    public function getDelay(): string
+    {
+        return $this->config->getAjaxAddToCartDelay();
+    }
+}

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 <!-- Refer to: https://keepachangelog.com/en/1.0.0/ -->
 
+## [1.1.1] 2022-03-08
+### Fix
+- Stop button click while loading
+### Added
+- Added ability to set delay in backend
+
 ## [1.1.0] 2022-22-04
 ### Added
 - Add Admin Config Controls

Model/Config.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Monsoon Consulting. All rights reserved.
+ * See LICENSE_MONSOON.txt for license details
+ */
+declare(strict_types=1);
+
+namespace Monsoon\HyvaAjaxAddToCart\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Class Config
+ */
+class Config implements ConfigInterface
+{
+    /** @var ScopeConfigInterface */
+    private ScopeConfigInterface $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Is the AJAX add to cart option enabled?
+     *
+     * @param null|int|string $scopeCode
+     * @return bool
+     */
+    public function isAjaxAddToCartEnabled($scopeCode = null): bool
+    {
+        return (bool)$this->scopeConfig->isSetFlag(
+            self::XML_PATH_ENABLE_AJAX_ADD_TO_CART,
+            ScopeInterface::SCOPE_STORE,
+            $scopeCode
+        );
+    }
+
+    /**
+     * Get Ajax Add To Cart Delay
+     *
+     * @param null|int|string $scopeCode
+     * @return string
+     */
+    public function getAjaxAddToCartDelay($scopeCode = null): string
+    {
+        return (string)$this->scopeConfig->getValue(
+            self::XML_PATH_AJAX_ADD_TO_CART_DELAY,
+            ScopeInterface::SCOPE_STORE,
+            $scopeCode
+        );
+    }
+}

Model/ConfigInterface.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Monsoon Consulting. All rights reserved.
+ * See LICENSE_MONSOON.txt for license details
+ */
+declare(strict_types=1);
+
+namespace Monsoon\HyvaAjaxAddToCart\Model;
+
+/**
+ * Interface ConfigInterface
+ */
+interface ConfigInterface
+{
+    public const XML_PATH_ENABLE_AJAX_ADD_TO_CART = 'checkout/options/enable_ajax_add_to_cart';
+    public const XML_PATH_AJAX_ADD_TO_CART_DELAY = 'checkout/options/ajax_add_to_cart_delay';
+
+    /**
+     * Is the AJAX add to cart option enabled?
+     *
+     * @param null|int|string $scopeCode
+     * @return bool
+     */
+
+    public function isAjaxAddToCartEnabled($scopeCode = null): bool;
+
+    /**
+     * Get Ajax Add To Cart Delay
+     *
+     * @param null|int|string $scopeCode
+     * @return string
+     */
+    public function getAjaxAddToCartDelay($scopeCode = null): string;
+}

etc/adminhtml/system.xml

@@ -21,6 +21,18 @@
                     <label>Enable AJAX Add to Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="ajax_add_to_cart_delay"
+                       translate="label comment"
+                       type="text"
+                       sortOrder="110"
+                       showInDefault="1"
+                       showInWebsite="1"
+                       showInStore="1"
+                       canRestore="1">
+                    <label>AJAX Add to Cart Delay</label>
+                    <comment>e.g. 1000 (in milliseconds)</comment>
+                    <validate>validate-number required-entry</validate>
+                </field>
             </group>
         </section>
     </system>

etc/config.xml

@@ -11,6 +11,7 @@
         <checkout>
             <options>
                 <enable_ajax_add_to_cart>0</enable_ajax_add_to_cart>
+                <ajax_add_to_cart_delay>1000</ajax_add_to_cart_delay>
             </options>
         </checkout>
     </default>

etc/di.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Monsoon Consulting. All rights reserved.
+ * See LICENSE_MONSOON.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Monsoon\HyvaAjaxAddToCart\Model\ConfigInterface"
+        type="Monsoon\HyvaAjaxAddToCart\Model\Config" />
+</config>

view/frontend/layout/hyva_default.xml

@@ -9,6 +9,7 @@
     <body>
         <referenceContainer name="before.body.end">
             <block name="monsoon.ajax.addtocart"
+                   class="Monsoon\HyvaAjaxAddToCart\Block\AddToCart"
                    template="Monsoon_HyvaAjaxAddToCart::hyva/script/addtocart.phtml"
                    ifconfig="checkout/options/enable_ajax_add_to_cart"/>
         </referenceContainer>

view/frontend/templates/hyva/script/addtocart.phtml

@@ -5,11 +5,11 @@
  */
 declare(strict_types=1);
 
-use Magento\Framework\View\Element\Template;
+use Monsoon\HyvaAjaxAddToCart\Block\AddToCart;
 use Magento\Framework\Escaper;
 
 /**
- * @var Template $block
+ * @var AddToCart $block
  * @var Escaper $escaper
  */
 
@@ -24,6 +24,7 @@ use Magento\Framework\Escaper;
 <script>
     window.setAjaxCart = (selectors = '.product_addtocart_form, #product_addtocart_form', recursive = true) => {
         const addToCartForms = document.querySelectorAll(selectors);
+        const delay = parseInt('<?= $escaper->escapeJs($block->getDelay()) ?>', 10);
 
         addToCartForms.forEach(form => {
             form.addEventListener('submit', e => {
@@ -46,6 +47,7 @@ use Magento\Framework\Escaper;
 
                 button.prepend(loader);
                 button.classList.add('relative', 'is-loading');
+                button.disabled = true;
 
                 fetch(e.currentTarget.action, {
                     method: 'POST',
@@ -95,11 +97,12 @@ use Magento\Framework\Escaper;
                         setTimeout(() => {
                             loader.remove();
                             button.classList.remove('is-loading');
+                            button.disabled = false;
 
                             messages.forEach(message => {
                                 setMessage(message);
                             });
-                        }, 1000);
+                        }, delay);
                     });
             });
         });