Update: change system config canonical field

mageplaza · Mar 19, 2024 · 3cef0d8 · 3cef0d8
1 parent a3ae9b9
commit 3cef0d8
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 21 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -226,4  226,28 @@ public function getQtySale($product)
             return 0;
         }
     }
 
     /**
      * @param $storeId
      * @return bool
      */
     public function canUseCanonicalForCategory($storeId)
     {
         $value = $this->getDuplicateConfig('canonical_tag', $storeId);
         $value = $value ? explode(',', $value) : 0;
 
         return in_array(1, is_array($value) ? $value : [$value]);
     }
 
     /**
      * @param $storeId
      * @return bool
      */
     public function canUseCanonicalForProduct($storeId)
     {
         $value = $this->getDuplicateConfig('canonical_tag', $storeId);
         $value = $value ? explode(',', $value) : 0;
 
         return in_array(2, is_array($value) ? $value : [$value]);
     }
 }
diff --git a/Model/Config/Source/CanonicalFor.php b/Model/Config/Source/CanonicalFor.php
@@ -0,0  1,43 @@
 <?php
 /**
  * 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_Seo
  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
  * @license     https://www.mageplaza.com/LICENSE.txt
  */
 
 namespace Mageplaza\Seo\Model\Config\Source;
 
 use Magento\Framework\Option\ArrayInterface;
 
 /**
  * Class CanonicalFor
  * @package Mageplaza\Seo\Model\Config\Source
  */
 class CanonicalFor implements ArrayInterface
 {
     /**
      * @return array
      */
     public function toOptionArray()
     {
         return [
             ['label' => __('--Please select--'), 'value' => '0'],
             ['label' => __('Category'), 'value' => '1'],
             ['label' => __('Product'), 'value' => '2']
         ];
     }
 }
diff --git a/Plugin/Helper/CanUseCanonicalTagForCategories.php b/Plugin/Helper/CanUseCanonicalTagForCategories.php
@@ -21,6  21,7 @@
 
 namespace Mageplaza\Seo\Plugin\Helper;
 
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Helper\Category;
 use Mageplaza\Seo\Helper\Data as HelperData;
 
@@ -30,6  31,13 @@
  */
 class CanUseCanonicalTagForCategories
 {
     /**
      * Store manager
      *
      * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @var HelperData
      */
@@ -38,11  46,15 @@ class CanUseCanonicalTagForCategories
     /**
      * CanUseCanonicalTagForCategories constructor.
      *
      * @param StoreManagerInterface $storeManager
      * @param HelperData $helper
      */
-    public function __construct(HelperData $helper)
-    {
-        $this->_helper = $helper;
     public function __construct(
         StoreManagerInterface $storeManager,
         HelperData $helper
     ) {
         $this->_storeManager = $storeManager;
         $this->_helper       = $helper;
     }
 
     /**
@@ -54,7  66,7 @@ public function __construct(HelperData $helper)
     public function afterCanUseCanonicalTag(Category $category, $result)
     {
         if ($this->_helper->isEnabled()) {
-            return $this->_helper->getDuplicateConfig('category_canonical_tag');
             return $this->_helper->canUseCanonicalForCategory($this->_storeManager->getStore()->getId());
         }
 
         return $result;

diff --git a/Plugin/Helper/CanUseCanonicalTagForProducts.php b/Plugin/Helper/CanUseCanonicalTagForProducts.php
@@ -22,6  22,7 @@
 namespace Mageplaza\Seo\Plugin\Helper;
 
 use Magento\Catalog\Helper\Product;
 use Magento\Store\Model\StoreManagerInterface;
 use Mageplaza\Seo\Helper\Data as HelperData;
 
 /**
@@ -30,19  31,30 @@
  */
 class CanUseCanonicalTagForProducts
 {
     /**
      * Store manager
      *
      * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @var HelperData
      */
     protected $_helper;
 
     /**
-     * CanUseCanonicalTagForProducts constructor.
      * CanUseCanonicalTagForProduct constructor.
      *
      * @param StoreManagerInterface $storeManager
      * @param HelperData $helper
      */
-    public function __construct(HelperData $helper)
-    {
-        $this->_helper = $helper;
     public function __construct(
         StoreManagerInterface $storeManager,
         HelperData $helper
     ) {
         $this->_storeManager = $storeManager;
         $this->_helper       = $helper;
     }
 
     /**
@@ -54,7  66,7 @@ public function __construct(HelperData $helper)
     public function afterCanUseCanonicalTag(Product $product, $result)
     {
         if ($this->_helper->isEnabled()) {
-            return $this->_helper->getDuplicateConfig('product_canonical_tag');
             return $this->_helper->canUseCanonicalForProduct($this->_storeManager->getStore()->getId());
         }
 
         return $result;

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -42,22  42,18 @@
                         </ul>
                         ]]></comment>
                 </field>
-                <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
             <group id="duplicate" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Duplicate Content</label>
-                <field id="category_canonical_tag" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Use Canonical Link Meta Tag For Categories</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Avoid duplicate content.</comment>
-                </field>
-                <field id="product_canonical_tag" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Use Canonical Link Meta Tag For Products</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Avoid duplicate content.</comment>
                 <field id="canonical_tag" translate="label" type="multiselect" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Use Canonical Link Meta Tag For</label>
                     <source_model>Mageplaza\Seo\Model\Config\Source\CanonicalFor</source_model>
                     <comment>Using canonical URLs will avoid duplicating content between product and category pages,
                         avoiding low quality ratings and reduced rankings on search engines.</comment>
                 </field>
             </group>
             <group id="richsnippets" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">

diff --git a/etc/config.xml b/etc/config.xml
@@ -44,8  44,7 @@
         </seo>
         <catalog>
             <seo>
-                <category_canonical_tag>1</category_canonical_tag>
-                <product_canonical_tag>1</product_canonical_tag>
 
             </seo>
         </catalog>
     </default>