diff --git a/models/Product.php b/models/Product.php index 5dc7248..5a8817d 100755 --- a/models/Product.php +++ b/models/Product.php @@ -371,10 +371,12 @@ public function getFullName():string { $name = ''; + $groupName = $this->category->getTaxGroups()->where(['use_in_name'=>1])->joinWith('lang')->one()->lang->title; + if (!empty( $this->category->lang->category_synonym )) { - $name = $name . $this->category->lang->category_synonym . ' '; + $name = $name . ($groupName ? $groupName : $this->category->lang->category_synonym) . ' '; } else { - $name = $name . $this->category->lang->title . ' '; + $name = $name . ($groupName ? $groupName : $this->category->lang->title) . ' '; } if (!empty( $this->brand )) { diff --git a/models/TaxGroup.php b/models/TaxGroup.php index 1642ed4..b668032 100755 --- a/models/TaxGroup.php +++ b/models/TaxGroup.php @@ -16,6 +16,8 @@ * @property boolean $is_filter * @property integer $level * @property integer $sort + * @property integer $use_in_name + * @property string $meta_robots * @property boolean $display * @property boolean $is_menu * @property string $remote_id @@ -97,10 +99,15 @@ 'level', 'sort', 'position', + 'use_in_name', ], 'integer', ], [ + ['meta_robots'], + 'string' + ], + [ [ 'categories' ], 'safe', ], @@ -113,13 +120,15 @@ public function attributeLabels() { return [ - 'id' => 'Tax Group ID', - 'is_filter' => 'Use in filter', - 'sort' => 'Sort', - 'display' => 'Display', - 'is_menu' => 'Отображать в характеристиках', - 'level' => 'уровень', - 'ppsition' => 'Позиция', + 'id' => 'Tax Group ID', + 'is_filter' => 'Use in filter', + 'sort' => 'Sort', + 'display' => 'Display', + 'is_menu' => 'Отображать в характеристиках', + 'level' => 'уровень', + 'position' => 'Позиция', + 'meta_robots' => 'Meta Robots', + 'use_in_name' => 'Использовать в названии', ]; } diff --git a/views/tax-group/_form.php b/views/tax-group/_form.php index c7e2b8c..53b8a11 100755 --- a/views/tax-group/_form.php +++ b/views/tax-group/_form.php @@ -55,10 +55,15 @@ field($model, 'is_menu') ->checkbox() ?> - + + field($model, 'use_in_name') + ->checkbox() ?> + field($model, 'sort') ->textInput() ?> - + + field($model, 'meta_robots') + ->textInput() ?>