Product admin search fix

Yarik
1 parent 887985c7
Showing 3 changed files with 37 additions and 42 deletions Show diff stats
common/components/Request.php
common/modules/product/models/ProductSearch.php
frontend/controllers/SiteController.php
 <?php
-namespace common\components;
-
-class Request extends \yii\web\Request
-
-{
-
-    public $web;
-
-    public $adminUrl;
-
-
-
-    public function getBaseUrl()
-
+    namespace common\components;
+    
+    class Request extends \yii\web\Request
     {
-
-
-        return str_replace($this->web, "", parent::getBaseUrl()) . $this->adminUrl;
-
-    }
-
-
-
-    public function resolvePathInfo()
-
-    {
-
-        if ($this->getUrl() === $this->adminUrl) {
-
-            return "";
-
-        } else {
-
-            return parent::resolvePathInfo();
-
+        
+        public $web;
+        
+        public $adminUrl;
+        
+        /**
+         * @inheritdoc
+         */
+        public function getBaseUrl()
+        {
+            return str_replace($this->web, "", parent::getBaseUrl()) . $this->adminUrl;
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function resolvePathInfo()
+        {
+            if($this->getUrl() === $this->adminUrl) {
+                return "";
+            } else {
+                return parent::resolvePathInfo();
+            }
         }
-
-    }
-
-}
 \ No newline at end of file
+    }
 \ No newline at end of file
@@ -141,6 +141,8 @@
                 ],
             ]);
+            $this->load($params);
+            
             if(isset( $this->is_top )) {
                 $query->andWhere([
                     'is_top' => (bool) $this->is_top,
@@ -78,12 +78,13 @@
         {
             $categories = Category::find()
                                   ->where([ 'depth' => 0 ])
-                                  ->joinWith('lang', true, 'INNER JOIN')
+                                  ->orderBy('category_id')
+                                  ->joinWith('lang')
                                   ->all();
             $purposes = TaxGroup::find()
                                 ->where([
                                     'tax_group.tax_group_id' => 5,
-                                    'level' => 0,
+                                    'level'                  => 0,
                                 ])
                                 ->joinWith('options.lang')
                                 ->one();
@@ -93,7 +94,7 @@
                                      3,
                                      4,
                                  ],
-                                 'status'    => 1,
+                                 'status'           => 1,
                              ])
                              ->joinWith('lang', true, 'INNER JOIN')
                              ->all();
@@ -241,7 +242,10 @@
         public function actionPage($id)
         {
-            $model = Page::find()->where(['page.id' => $id])->joinWith('lang', true, 'INNER JOIN')->one();
+            $model = Page::find()
+                         ->where([ 'page.id' => $id ])
+                         ->joinWith('lang', true, 'INNER JOIN')
+                         ->one();
             if(empty( $model )) {
                 throw new NotFoundHttpException();
             }