Merge pull request #441 from magefan/6820-sort-by-end-date-in-recent-…

…widget Add sorting in recent widget
magefan · Aug 17, 2022 · fba7647 · fba7647
2 parents fa2940c + 4eaa490
commit fba7647
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/Block/Widget/Recent.php b/Block/Widget/Recent.php
@@ -8,10 +8,14 @@
 
 namespace Magefan\Blog\Block\Widget;
 
+use Magefan\Blog\Block\Post\PostList\AbstractList;
+use Magefan\Blog\Model\Config\Source\PostsSortBy;
+use Magento\Framework\Api\SortOrder;
+
 /**
  * Blog recent posts widget
  */
-class Recent extends \Magefan\Blog\Block\Post\PostList\AbstractList implements \Magento\Widget\Block\BlockInterface
+class Recent extends AbstractList implements \Magento\Widget\Block\BlockInterface
 {
     /**
      * @var array
@@ -170,4 +174,38 @@ public function getShorContent($post, $len = null, $endСharacters = null)
     {
         return $post->getShortFilteredContent($len, $endСharacters);
     }
+
+    /**
+     * @return string
+     */
+    public function getCollectionOrderField(): string
+    {
+        $postsSortBy = (int)$this->getData('posts_sort_by');
+        if ($postsSortBy) {
+            switch ($postsSortBy) {
+                case PostsSortBy::POSITION:
+                    return AbstractList::POSTS_SORT_FIELD_BY_POSITION;
+                case PostsSortBy::TITLE:
+                    return AbstractList::POSTS_SORT_FIELD_BY_TITLE;
+            }
+        }
+
+        return parent::getCollectionOrderField();
+    }
+
+    /**
+     * Retrieve collection order direction
+     *
+     * @return string
+     */
+    public function getCollectionOrderDirection()
+    {
+        $postsSortBy = (int)$this->getData('posts_sort_by');
+
+        if (PostsSortBy::TITLE == $postsSortBy) {
+            return SortOrder::SORT_ASC;
+        }
+
+        return parent::getCollectionOrderDirection();
+    }
 }
diff --git a/etc/widget.xml b/etc/widget.xml
@@ -76,6 +76,9 @@
                     <pre>
                 ]]></description>
             </parameter>
+            <parameter name="posts_sort_by" xsi:type="select" source_model="Magefan\Blog\Model\Config\Source\PostsSortBy" visible="true" sort_order="90" >
+                <label translate="true">Posts Sort By</label>
+            </parameter>
         </parameters>
     </widget>
     <widget id="magefan_blog_featured" class="Magefan\Blog\Block\Widget\Featured">