Merge pull request #30 from mageplaza/2.4-develop

2.4 develop
mageplaza · Nov 28, 2024 · 9f70bbb · 9f70bbb
2 parents 1d0ea4d + c465883
commit 9f70bbb
Show file tree

Hide file tree

Showing 16 changed files with 700 additions and 117 deletions.
diff --git a/Block/Cart/Button.php b/Block/Cart/Button.php
@@ -22,6 +22,7 @@
 namespace Mageplaza\ShareCart\Block\Cart;
 
 use Magento\Catalog\Model\ProductRepository;
+use Magento\Checkout\CustomerData\Cart as CustomerCart;
 use Magento\Checkout\Model\Session;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
@@ -70,6 +71,11 @@ class Button extends Template
      */
     protected $helper;
 
+    /**
+     * @var CustomerCart
+     */
+    protected $customerCart;
+
     /**
      * Button constructor.
      *
@@ -88,14 +94,15 @@ public function __construct(
         Configurable $configurable,
         PriceCurrencyInterface $priceCurrency,
         Data $helper,
+        CustomerCart $customerCart,
         array $data = []
     ) {
         $this->checkoutSession    = $checkoutSession;
         $this->_productRepository = $productRepository;
         $this->configurable       = $configurable;
         $this->priceCurrency      = $priceCurrency;
         $this->helper             = $helper;
-
+        $this->customerCart  = $customerCart;
         parent::__construct($context, $data);
     }
 
@@ -210,4 +217,12 @@ public function isEnable()
     {
         return $this->helper->isEnabled();
     }
+
+    /**
+     * @return array
+     */
+    public function getShareCartUrl()
+    {
+        return $this->customerCart->getSectionData();
+    }
 }
diff --git a/Controller/Index/Download.php b/Controller/Index/Download.php
@@ -95,5 +95,6 @@ public function execute()
         $mpShareCartToken = $this->checkoutSession->getQuote()->getMpShareCartToken();
 
         $this->printProcess->downloadPdf($mpShareCartToken);
+        return $resultRedirect->setPath('checkout/cart');
     }
 }
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -40,7 +40,6 @@ class Data extends AbstractData
      * @var PriceCurrencyInterface
      */
     protected $priceCurrency;
-
     /**
      * Data constructor.
      *
@@ -88,8 +87,9 @@ public function getAddress($storeId = null)
         return $this->getModuleConfig(self::BUSINESS_CONFIG_PATH . '/address', $storeId);
     }
 
+
     /**
-     * @param null $storeId
+     * @param $storeId
      *
      * @return array|mixed
      */

diff --git a/Helper/PrintProcess.php b/Helper/PrintProcess.php
@@ -22,6 +22,8 @@
 namespace Mageplaza\ShareCart\Helper;
 
 use Exception;
+use Magento\Checkout\CustomerData\Cart as CustomerCart;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Exception\FileSystemException;
@@ -30,6 +32,7 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimeZone;
+use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Store\Model\StoreManagerInterface;
 use Mageplaza\ShareCart\Model\Template\Processor;
@@ -77,40 +80,43 @@ class PrintProcess extends Data
      */
     protected $templateProcessor;
 
+
     /**
-     * PrintProcess constructor.
-     *
      * @param Context $context
+     * @param ObjectManagerInterface $objectManager
+     * @param StoreManagerInterface $storeManager
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param ScopeConfigInterface $scopeConfig
+     * @param ThemeProviderInterface $themeProvider
      * @param Filesystem $fileSystem
      * @param DirectoryList $directoryList
-     * @param StoreManagerInterface $storeManager
-     * @param ObjectManagerInterface $objectManager
-     * @param Data $helper
      * @param DateTime $dateTime
      * @param TimeZone $timezone
      * @param Processor $templateProcessor
-     * @param PriceCurrencyInterface $priceCurrency
      */
     public function __construct(
         Context $context,
+        ObjectManagerInterface $objectManager,
+        StoreManagerInterface $storeManager,
+        PriceCurrencyInterface $priceCurrency,
         Filesystem $fileSystem,
         DirectoryList $directoryList,
-        StoreManagerInterface $storeManager,
-        ObjectManagerInterface $objectManager,
-        Data $helper,
         DateTime $dateTime,
         TimeZone $timezone,
-        Processor $templateProcessor,
-        PriceCurrencyInterface $priceCurrency
+        Processor $templateProcessor
     ) {
         $this->fileSystem        = $fileSystem;
         $this->directoryList     = $directoryList;
-        $this->helper            = $helper;
         $this->dateTime          = $dateTime;
         $this->timezone          = $timezone;
         $this->templateProcessor = $templateProcessor;
 
-        parent::__construct($context, $objectManager, $storeManager, $priceCurrency);
+        parent::__construct(
+            $context,
+            $objectManager,
+            $storeManager,
+            $priceCurrency,
+        );
     }
 
     /**
@@ -128,6 +134,7 @@ public function readFile($relativePath)
 
     /**
      * @return string
+     * @throws Exception
      */
     public function getFileName()
     {
@@ -151,13 +158,13 @@ public function addCustomTemplateVars($quote)
 
         $templateVars['quote']      = $quote;
         $templateVars['store']      = $quote->getStore();
-        $templateVars['vat_number'] = $this->helper->getVATNumber($storeId);
-        $templateVars['phone']      = $this->helper->getPhone($storeId);
-        $templateVars['contact']    = $this->helper->getEmail($storeId);
-        $templateVars['registered'] = $this->helper->getRegisteredNumber($storeId);
-        $templateVars['company']    = $this->helper->getCompanyName($storeId);
-        $templateVars['address']    = $this->helper->getAddress($storeId);
-        $templateVars['message']    = $this->helper->getWarningMessage($storeId);
+        $templateVars['vat_number'] = $this->getVATNumber($storeId);
+        $templateVars['phone']      = $this->getPhone($storeId);
+        $templateVars['contact']    = $this->getEmail($storeId);
+        $templateVars['registered'] = $this->getRegisteredNumber($storeId);
+        $templateVars['company']    = $this->getCompanyName($storeId);
+        $templateVars['address']    = $this->getAddress($storeId);
+        $templateVars['message']    = $this->getWarningMessage($storeId);
         $templateVars['timezone']   = $this->formatDate($this->dateTime->gmtDate());
 
         return $templateVars;

diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "mageplaza/module-core": "^1.4.12",
     "mpdf/mpdf": "^7.1.0 | ^8.0.0"
   },
-  "version": "4.0.4",
+  "version": "4.0.5",
   "license": "proprietary",
   "authors": [
     {

diff --git a/etc/db_schema.xml b/etc/db_schema.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_ShareCart
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+  <table name="quote" resource="default">
+    <column xsi:type="varchar" name="mp_share_cart_token" nullable="true" comment="Mp Share Cart Token"/>
+    <index referenceId="QUOTE_MP_SHARE_CART_TOKEN" indexType="btree">
+      <column name="mp_share_cart_token"/>
+    </index>
+  </table>
+</schema>
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
@@ -0,0 +1,10 @@
+{
+    "quote": {
+        "column": {
+            "mp_share_cart_token": true
+        },
+        "index": {
+            "QUOTE_MP_SHARE_CART_TOKEN": true
+        }
+    }
+}
diff --git a/view/frontend/layout/hyva_checkout_cart_index.xml b/view/frontend/layout/hyva_checkout_cart_index.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_ShareCart
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="hyva_modal"/>
+    <body>
+        <referenceBlock name="mp.sharecart">
+            <action method="setTemplate">
+                <argument name="template" xsi:type="string">Mageplaza_ShareCart::hyva/cart/button.phtml</argument>
+            </action>
+        </referenceBlock>
+        <referenceBlock name="checkout.cart">
+            <action method="setTemplate">
+                <argument name="template" xsi:type="string">Mageplaza_ShareCart::hyva/cart-main.phtml</argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/layout/hyva_default.xml b/view/frontend/layout/hyva_default.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_ShareCart
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="extra_actions">
+            <block class="Mageplaza\ShareCart\Block\Cart\Button" name="mp_sharecart_minicart" template="Mageplaza_ShareCart::hyva/minicart.phtml"/>
+        </referenceContainer>
+    </body>
+</page>