Refactor 8672-add-page-pagination-param

Author: ihorvansach

Block/Post/PostList/AbstractList.php

@@ -23,6 +23,7 @@ abstract class AbstractList extends Template implements IdentityInterface
      */
     protected $_filterProvider;
 
+    /**
     /**
      * @var \Magento\Cms\Model\Page
      */

Block/Post/PostList/Toolbar/Pager.php

@@ -8,7 +8,9 @@
 
 namespace Magefan\Blog\Block\Post\PostList\Toolbar;
 
+use Magento\Store\Model\ScopeInterface;
 use Magefan\Blog\Model\Config\Source\LazyLoad;
+use Magefan\Blog\Model\Config;
 
 /**
  * Blog posts list toolbar pager
@@ -76,7 +78,7 @@ public function getLazyloadMode()
     {
         return (int) $this->_scopeConfig->getValue(
             'mfblog/post_list/lazyload_enabled',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -89,7 +91,7 @@ public function getLazyloadPadding()
     {
         return (int) $this->_scopeConfig->getValue(
             'mfblog/post_list/lazyload_padding',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -100,10 +102,14 @@ public function getLazyloadPadding()
      */
     public function getPagePaginationType()
     {
-        return $this->_scopeConfig->getValue(
-            'mfblog/advanced_permalink/page_pagination_type',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
+        if ($this->_scopeConfig->getValue(Config::XML_PATH_ADVANCED_PERMALINK_ENABLED, ScopeInterface::SCOPE_STORE)) {
+            return $this->_scopeConfig->getValue(
+                Config::XML_PATH_PAGE_PAGINATION_TYPE,
+                ScopeInterface::SCOPE_STORE
+            );
+        }
+
+        return 'page';
     }
 
     /**

Model/Config.php

@@ -279,9 +279,13 @@ public function isBlogCssIncludeOnProduct($storeId = null)
      */
     public function getPagePaginationType($storeId = null)
     {
-        return $this->getConfig(
-            self::XML_PATH_PAGE_PAGINATION_TYPE,
-            $storeId
-        );
+        if ($this->getConfig(self::XML_PATH_ADVANCED_PERMALINK_ENABLED, $storeId)) {
+            return $this->getConfig(
+                self::XML_PATH_PAGE_PAGINATION_TYPE,
+                $storeId
+            );
+        }
+
+        return 'page';
     }
 }

etc/config.xml

@@ -156,6 +156,9 @@
                 <related_posts_template/>
                 <number_of_related_posts>5</number_of_related_posts>
             </product_page>
+            <advanced_permalink>
+                <page_pagination_type>page</page_pagination_type>
+            </advanced_permalink>
             <permalink>
                 <route>blog</route>
                 <redirect_to_no_slash>1</redirect_to_no_slash>
@@ -173,7 +176,6 @@
                 <author_sufix/>
                 <search_route>search</search_route>
                 <rss_route>rss</rss_route>
-                <page_pagination_type>page</page_pagination_type>
             </permalink>
             <seo>
                 <use_canonical_meta_tag_for>all</use_canonical_meta_tag_for>