Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents e0906f08 61453ef0
Showing 3 changed files with 16 additions and 4 deletions Show diff stats
models/Delivery.php
models/OrderDeliveryLang.php
models/ProductFrontendSearch.php
@@ -15,6 +15,7 @@
      * @property int                 $value
      * @property int                 $sort
      * @property Delivery|null       $parent
+     * @property Delivery[]          $children
      * * From language behavior *
      * @property OrderDeliveryLang   $lang
      * @property OrderDeliveryLang[] $langs
@@ -77,4 +78,10 @@
         {
             return $this->hasOne(self::className(), [ 'id' => 'parent_id' ]);
         }
-    }
 \ No newline at end of file
+        
+        public function getChildren()
+        {
+            return $this->hasMany(self::className(), [ 'parent_id' => 'id' ]);
+        }
+    }
+    
 \ No newline at end of file
@@ -47,7 +47,6 @@
                 [
                     [
                         'title',
-                        'text',
                     ],
                     'required',
                 ],
@@ -79,11 +79,17 @@
                             'default' => SORT_DESC,
                             'label'   => 'имени от Я до А',
                         ],
-                        'price'     => [
+                        'price_asc'     => [
                             'asc'     => [ 'enabledVariants.price' => SORT_ASC ],
+                            'desc'    => [ 'enabledVariants.price' => SORT_ASC ],
+                            'default' => SORT_ASC,
+                            'label'   => 'по цене по возрастанию',
+                        ],
+                        'price_desc'     => [
+                            'asc'     => [ 'enabledVariants.price' => SORT_DESC ],
                             'desc'    => [ 'enabledVariants.price' => SORT_DESC ],
                             'default' => SORT_DESC,
-                            'label'   => 'по цене',
+                            'label'   => 'по цене по уменшению',
                         ],
                     ],
                 ]