Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 28b51b30 839d26cf
Showing 3 changed files with 43 additions and 11 deletions Show diff stats
models/Product.php
models/TaxGroup.php
views/tax-group/_form.php
@@ -14,6 +14,7 @@
     use yii\base\InvalidParamException;
     use yii\db\ActiveQuery;
     use yii\db\ActiveRecord;
+    use yii\db\Query;
     use yii\helpers\ArrayHelper;
     use yii\web\NotFoundHttpException;
     use yii\web\Request;
@@ -371,10 +372,27 @@
         public function getFullName():string
         {
             $name = '';
+
+            $groupName = (new Query())->select(['tax_option.*','tax_option_lang.*'])
+                ->from([ 'tax_option' ])
+                ->innerJoin('tax_group', 'tax_group.id = tax_option.tax_group_id')
+                ->innerJoin('tax_option_lang', 'tax_option.id = tax_option_lang.tax_option_id')
+                ->innerJoin('tax_group_to_category', 'tax_group.id = tax_group_to_category.tax_group_id')
+                ->where(['tax_group_to_category.category_id' => $this->category->id, 'tax_group.use_in_name'=>1, 'tax_option.id' => ArrayHelper::getColumn($this->options,'id')])
+                ->one();
+
+
+            if($groupName != null ){
+                $groupName = $groupName['value'];
+            } else {
+                $groupName = '';
+            }
+
+
             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 )) {
@@ -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' => 'Использовать в названии',
             ];
         }
@@ -55,10 +55,15 @@
     <?= $form->field($model, 'is_menu')
              ->checkbox() ?>
-    
+
+    <?= $form->field($model, 'use_in_name')
+        ->checkbox() ?>
+
     <?= $form->field($model, 'sort')
              ->textInput() ?>
-    
+
+    <?= $form->field($model, 'meta_robots')
+        ->textInput() ?>
     <?php
         echo LanguageForm::widget(
             [