Merge pull request #17 from mageplaza/2.4-develop

2.4 develop
mageplaza · Jun 29, 2023 · f4dfd75 · f4dfd75
2 parents 7f16917 + 86a4939
commit f4dfd75
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 15 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -323,4 +323,12 @@ public function getInlineButtonSize($storeId = null)
     {
         return $this->getModuleConfig(self::CONFIG_INLINE . 'button_size', $storeId);
     }
+
+    /**
+     * @return bool
+     */
+    public function checkDailyDealEnable()
+    {
+        return $this->_moduleManager->isOutputEnabled('Mageplaza_DailyDeal');
+    }
 }
diff --git a/Model/System/Config/Source/FloatCmsPages.php b/Model/System/Config/Source/FloatCmsPages.php
@@ -53,7 +53,9 @@ public function getOptionHash()
         $cmsPages = [];
 
         foreach ($pages as $page) {
-            $cmsPages[$page->getId()] = $page->getTitle();
+            if ($page->isActive()){
+                $cmsPages[$page->getId()] = $page->getTitle();
+            }
         }
 
         return $cmsPages;

diff --git a/Model/System/Config/Source/InlineApplyFor.php b/Model/System/Config/Source/InlineApplyFor.php
@@ -21,6 +21,8 @@
 
 namespace Mageplaza\SocialShare\Model\System\Config\Source;
 
+use Mageplaza\SocialShare\Helper\Data as HelperData;
+
 /**
  * Class InlineApplyFor
  * @package Mageplaza\SocialShare\Model\System\Config\Source
@@ -35,19 +37,38 @@ class InlineApplyFor extends OptionArray
     const DAILYDEAL_FEATUREDDEALS  = 'dailydeal_featureddeals';
     const DAILYDEAL_NEWDEALS  = 'dailydeal_newdeals';
 
+    /**
+     * @var HelperData
+     */
+    protected $_helperData;
+
+    public function __construct(HelperData $helperData)
+    {
+        $this->_helperData = $helperData;
+    }
+
     /**
      * @return array
      */
     public function getOptionHash()
     {
-        return [
-            self::HOME_PAGE     => __('Home Page'),
-            self::CATEGORY_PAGE => __('Categories Page'),
-            self::PRODUCT_PAGE  => __('Products Page'),
-            self::DAILYDEAL_ALLDEALS  => __('Daily Deal All Deals Page'),
-            self::DAILYDEAL_BESTSELLERDEALS  => __('Daily Deal Bestseller Deals Page'),
-            self::DAILYDEAL_FEATUREDDEALS  => __('Daily Deal Featured Deals Page'),
-            self::DAILYDEAL_NEWDEALS  => __('Daily Deal New Deals Page'),
-        ];
+        if (!$this->_helperData->checkDailyDealEnable()) {
+            $pages = [
+                self::HOME_PAGE     => __('Home Page'),
+                self::CATEGORY_PAGE => __('Categories Page'),
+                self::PRODUCT_PAGE  => __('Products Page')
+            ];
+        } else {
+            $pages = [
+                self::HOME_PAGE     => __('Home Page'),
+                self::CATEGORY_PAGE => __('Categories Page'),
+                self::PRODUCT_PAGE  => __('Products Page'),
+                self::DAILYDEAL_ALLDEALS  => __('Daily Deal All Deals Page'),
+                self::DAILYDEAL_BESTSELLERDEALS  => __('Daily Deal Bestseller Deals Page'),
+                self::DAILYDEAL_FEATUREDDEALS  => __('Daily Deal Featured Deals Page'),
+                self::DAILYDEAL_NEWDEALS  => __('Daily Deal New Deals Page'),
+            ];
+        }
+        return $pages;
     }
 }
diff --git a/composer.json b/composer.json
@@ -2,10 +2,10 @@
   "name": "mageplaza/module-social-share",
   "description": "Magento 2 Social Share Extension",
   "require": {
-    "mageplaza/module-core": "^1.5.0"
+    "mageplaza/module-core": "^1.5.3"
   },
   "type": "magento2-module",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "license": "proprietary",
   "authors": [
     {

diff --git a/i18n/en_US.csv b/i18n/en_US.csv
@@ -17,6 +17,10 @@ Right,Right
 "Categories Page","Categories Page"
 "Contact Us","Contact Us"
 "Home Page","Home Page"
+"Daily Deal All Deals Page","Daily Deal All Deals Page"
+"Daily Deal Bestseller Deals Page","Daily Deal Bestseller Deals Page"
+"Daily Deal Featured Deals Page","Daily Deal Featured Deals Page"
+"Daily Deal New Deals Page","Daily Deal New Deals Page"
 "Top Content","Top Content"
 "Bottom Content","Bottom Content"
 Horizontal,Horizontal
@@ -26,9 +30,9 @@ Vertical,Vertical
 Enable,Enable
 "Select <b>Yes</b> to enable this module.<br />
                         1. It helps to reduce abandonment cart with <a href=""https://www.mageplaza.com/magento-2-one-step-checkout-extension/"" target=""_blank"">One Step Checkout</a>. <br />
-                        2. <a href=""https://pages.mageplaza.com/abandoned-cart-email-templates-for-magento/?utm_source=configuration&utm_campaign=m2-bannerslider"" target=""_blank"">How to setup abandoned cart email series</a>","Select <b>Yes</b> to enable this module.<br />
+                        2. Magento stores see upwards of 30% revenue 💰 with AVADA. <a href=""https://go.avada.io/mageplaza"">Learn more</a>","Select <b>Yes</b> to enable this module.<br />
                         1. It helps to reduce abandonment cart with <a href=""https://www.mageplaza.com/magento-2-one-step-checkout-extension/"" target=""_blank"">One Step Checkout</a>. <br />
-                        2. <a href=""https://pages.mageplaza.com/abandoned-cart-email-templates-for-magento/?utm_source=configuration&utm_campaign=m2-bannerslider"" target=""_blank"">How to setup abandoned cart email series</a>"
+                        2. Magento stores see upwards of 30% revenue 💰 with AVADA. <a href=""https://go.avada.io/mageplaza"">Learn more</a>"
 "Icon Color","Icon Color"
 "Only apply for default icon","Only apply for default icon"
 "Custom Icon Color","Custom Icon Color"

diff --git a/view/frontend/templates/socialshare.phtml b/view/frontend/templates/socialshare.phtml
@@ -57,7 +57,7 @@
                 <?php endif;?>
                 <?= /* @noEscape */ $block->getFloatPosition()?>
                 <?= /* @noEscape */ $block->getBackgroundColor()?>
-                z-index: 10;
+                z-index: 9999;
             }
 
                 <?php if (!$block->isVerticalStyle($block->getFloatStyle())):?>