Merge remote-tracking branch 'origin/master'

Administrator
2 parents 8774e5a3 4c0e6128
Showing 5 changed files with 12 additions and 11 deletions Show diff stats
common/modules/product/models/Brand.php
common/modules/product/models/ProductVariant.php
common/modules/rubrication/models/TaxGroup.php
frontend/web/css/concat_all.css
frontend/web/css/style.css
@@ -27,12 +27,6 @@ class Brand extends \yii\db\ActiveRecord
     public function behaviors()
     {
         return [
-            'slug' => [
-                'class' => Slug::className(),
-                'in_attribute' => 'name',
-                'out_attribute' => 'alias',
-                'translit' => true
-            ],
             'artboxsynonym' => [
                 'class' => ArtboxSynonymBehavior::className(),
                 'keyNameValue' => 'brand_name_id',
@@ -41,7 +35,13 @@ class Brand extends \yii\db\ActiveRecord
                 'valueFields' => [ // postKey => DBFieldName
                     'name' => 'value'
                 ]
-            ]
+            ],
+            'slug' => [
+                'class' => Slug::className(),
+                'in_attribute' => 'name',
+                'out_attribute' => 'alias',
+                'translit' => true
+            ],
         ];
     }
@@ -34,7 +34,7 @@ class ProductVariant extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['product_id', 'name', 'sku', 'product_unit_id'], 'required'],
+            [['product_id', 'sku', 'product_unit_id'], 'required'],
             [['product_id', 'product_unit_id'], 'integer'],
             [['price', 'price_old', 'stock'], 'number'],
             [['name', 'sku'], 'string', 'max' => 255],
@@ -15,7 +15,7 @@ use Yii;
  * @property string $module
  * @property boolean $hierarchical
  * @property string $settings
- * @property boolean is_filter
+ * @property boolean $is_filter
  *
  * @property TaxGroupToGroup[] $taxGroupToGroups
  * @property TaxGroupToGroup[] $taxGroupToGroups0
@@ -62,7 +62,7 @@ class TaxGroup extends \yii\db\ActiveRecord
         return [
             [['name', 'module'], 'required'],
             [['description', 'settings'], 'string'],
-            [['hierarchical'], 'boolean'],
+            [['hierarchical', 'is_filter'], 'boolean'],
             [['alias', 'module'], 'string', 'max' => 50],
             [['name'], 'string', 'max' => 255],
             [['group_to_category'], 'safe']
@@ -233,6 +233,7 @@
   font-size: 30px;
   font-weight: bold;
   padding-bottom: 20px;
+  line-height: 1em;
 }
 .cat_p_catalog_list .sort_price {
@@ -549,7 +549,7 @@ padding-left:27px;
 .novelty_cont .item .pic{
 	margin-top:24px;
 }
-.novelty_cont .title_item{padding:13px;padding-top:0px;color:#6aa033;margin-top:10px;font-size:15px;line-height: 1.2;}
+.novelty_cont .title_item{padding:13px;padding-top:0px;color:#6aa033;margin-top:10px;font-size:15px;line-height: 1.2;height: 4em}
 .novelty_cont .title_item a{text-decoration:none;color:#6aa033;}
 .novelty_cont .item .price{
 	font-size:20px;