From f5ecb5510e71825878ab5e06ddf7b332d6dbe4b7 Mon Sep 17 00:00:00 2001
From: saparatayev <sopa.97@mail.ru>
Date: Wed, 4 Aug 2021 19:28:37 +0500
Subject: [PATCH] fix search, added filter

---
 plugins/tps/birzha/components/Offers.php      | 16 +++++++++-
 .../tps/birzha/components/offers/default.htm  |  4 +--
 shablon/category.html                         |  2 ++
 themes/birzha/pages/category.htm              | 30 ++++++++++++++++++-
 themes/birzha/pages/index.htm                 |  9 +-----
 5 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/plugins/tps/birzha/components/Offers.php b/plugins/tps/birzha/components/Offers.php
index 9d57ebddd..4f6deb80d 100644
--- a/plugins/tps/birzha/components/Offers.php
+++ b/plugins/tps/birzha/components/Offers.php
@@ -9,6 +9,11 @@ use DB;
 
 class Offers extends ComponentBase
 {
+    /*
+    * sort order parametr in a url string
+    */
+    public $sortParam = '';
+
     public function componentDetails()
     {
         return [
@@ -66,7 +71,16 @@ class Offers extends ComponentBase
     }
 
     protected function loadOffers() {
-        $sortOrder = $this->property('sortOrder');
+        $sortOrderParam = strtolower(\Input::get('sort_order'));
+        
+        // protect from sql injection
+        if($sortOrderParam != 'asc' && $sortOrderParam != 'desc') {
+            $sortOrder = $this->property('sortOrder');
+        } else {
+            $sortOrder = $sortOrderParam;
+            $this->sortParam = $sortOrderParam;
+        }
+        
         $cSlug = $this->property('categorySlug');
         $perPage = $this->property('perPage');
         $productSlug = $this->property('productSlug');
diff --git a/plugins/tps/birzha/components/offers/default.htm b/plugins/tps/birzha/components/offers/default.htm
index 73eaf7b4c..869d715ba 100644
--- a/plugins/tps/birzha/components/offers/default.htm
+++ b/plugins/tps/birzha/components/offers/default.htm
@@ -59,13 +59,13 @@
 {% if offers.total > offers.perPage %}
 
 <div class="cat_end">
-    <a href="{{ offers.previousPageUrl|default('#') }}" class="cat_arrow left">
+    <a href="{{ offers.previousPageUrl|default('#') }}&sort_order={{ __SELF__.sortParam }}" class="cat_arrow left">
         <img src="{{ 'assets/images/svg/arrow-right.svg'|theme }}" alt="">
     </a>
     <form method="get" class="cat_form">
         <input type="text" value="{{offers.currentPage|default('1')}}" name="page"> 
     </form>
-    <a href="{{ offers.nextPageUrl|default('#') }}" class="cat_arrow ">
+    <a href="{{ offers.nextPageUrl|default('#') }}&sort_order={{ __SELF__.sortParam }}" class="cat_arrow ">
         <img src="{{ 'assets/images/svg/arrow-right.svg'|theme }}" alt="">
     </a>
     <div class="cat_page">
diff --git a/shablon/category.html b/shablon/category.html
index 3dde5af6e..fa7fc914e 100644
--- a/shablon/category.html
+++ b/shablon/category.html
@@ -357,6 +357,8 @@
                                 <img src="images/svg/loupe.svg" alt="loupe">
                             </div>
                         </div>
+                    </form>
+                    <form action="#">
                         <div class="category_select">
                             <select>
                                 <option value="1">По дате</option>
diff --git a/themes/birzha/pages/category.htm b/themes/birzha/pages/category.htm
index bad0741f9..7c7c3653e 100644
--- a/themes/birzha/pages/category.htm
+++ b/themes/birzha/pages/category.htm
@@ -52,6 +52,26 @@ sortOrder = "desc"
                         </div>
                     </div>
                 </div>
+                <form action="{{ 'search' | page }}" method="get" class="category_search">
+                    <div class="category_input">
+                        <input name="q" type="text" placeholder="Поиск" autocomplete="off">
+                        <button class="category_loupe" type="submit">
+                            <img src="{{ 'assets/images/svg/loupe.svg'|theme }}" alt="loupe">
+                        </button>
+                    </div>
+                </form>
+                <form action="#" class="sort-order">
+                    <div class="category_select">
+                        <select name="sort_order">
+                            <option value="1">По дате</option>
+                            <option value="desc">Decrease</option>
+                            <option value="asc">Increase</option>
+                        </select>
+                        {% if input('page') %}
+                            <input type="hidden" name="page" value="{{ input('page') }}">
+                        {% endif %}
+                    </div>
+                </form>
                 <div class="inline_head">
                     <div class="inline_item">
                         Лот №:
@@ -84,4 +104,12 @@ sortOrder = "desc"
         </div>
     </div>
 </section>
-<!--Category end ========================================================= -->
\ No newline at end of file
+<!--Category end ========================================================= -->
+
+{% put scripts %}
+<script>
+    $('form.sort-order select').change(function() {
+        $('form.sort-order').submit();
+    })
+</script>
+{% endput %}
\ No newline at end of file
diff --git a/themes/birzha/pages/index.htm b/themes/birzha/pages/index.htm
index 0c27c4f7a..4e4dfe5fd 100644
--- a/themes/birzha/pages/index.htm
+++ b/themes/birzha/pages/index.htm
@@ -23,14 +23,7 @@ localeUrl[ru] = "/glavnaya-stranica"
 <link rel="stylesheet" href="{{['assets/css/slick-theme.css','assets/css/slick.css']|theme}}">
 {% endput %}
 
-<div class="auto_container">
-    <div class="wrapper">
-        <form action="{{ 'search' | page }}" method="get">
-            <input name="q" type="text" placeholder="What are you looking for?" autocomplete="off">
-            <button type="submit">Search</button>
-        </form>
-    </div>
-</div>
+
 
 <!--Intro  ============================================================= -->
 <section class="intro">