Merge remote-tracking branch 'origin/master'

Administrator
2 parents 5613104b 0b8441f2
Showing 5 changed files with 27 additions and 15 deletions Show diff stats
backend/controllers/BrandController.php
common/modules/product/models/Brand.php
common/modules/product/models/Category.php
common/modules/rubrication/behaviors/ArtboxSynonymBehavior.php
common/translation/ru/product.php
@@ -79,6 +79,7 @@ class BrandController extends Controller
     {
         $model = new Brand();
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            exit;
             return is_null(Yii::$app->request->post('create_and_new')) ? $this->redirect(['view', 'id' => $model->brand_id]) : $this->redirect(array_merge(['create'], Yii::$app->request->queryParams));
         } else {
             return $this->render('create', [
@@ -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',
@@ -40,8 +34,13 @@ class Brand extends \yii\db\ActiveRecord
                 'valueOptionId' => 'brand_id',
                 'valueFields' => [ // postKey => DBFieldName
                     'name' => 'value'
+                ],
+                'slug' => [
+                    'valueKeyName' => 'value',
+                    'slugKeyName' => 'alias',
+                    'translit' => true
                 ]
-            ]
+            ],
         ];
     }
@@ -112,6 +111,6 @@ class Brand extends \yii\db\ActiveRecord
     }
     public function getName() {
-        return empty($this->brandName) ? null : $this->brandName->value;
+        return empty($this->brand_name_id) ? null : $this->brandName->value;
     }
 }
@@ -42,12 +42,6 @@ class Category extends \yii\db\ActiveRecord
                 'keyNameGroup' => null,
                 'keyNamePath' => 'path',
             ],
-            'slug' => [
-                'class' => RuSlug::className(),
-                'in_attribute' => 'name',
-                'out_attribute' => 'alias',
-                'translit' => true
-            ],
             'artboxsynonym' => [
                 'class' => ArtboxSynonymBehavior::className(),
                 'keyNameValue' => 'category_name_id',
@@ -55,6 +49,11 @@ class Category extends \yii\db\ActiveRecord
                 'valueOptionId' => 'category_id',
                 'valueFields' => [ // postKey => DBFieldName
                     'name' => 'value'
+                ],
+                'slug' => [
+                    'valueKeyName' => 'value',
+                    'slugKeyName' => 'alias',
+                    'translit' => true
                 ]
             ],
             [
@@ -3,11 +3,13 @@
 namespace common\modules\rubrication\behaviors;
 use common\modules\rubrication\models\TaxValueString;
+use dosamigos\transliterator\TransliteratorHelper;
 use yii\base\Behavior;
 use yii\base\Exception;
 use yii\db\ActiveRecord;
 use Yii;
 use yii\helpers\ArrayHelper;
+use yii\helpers\Inflector;
 use yii\web\NotFoundHttpException;
 class ArtboxSynonymBehavior extends Behavior {
@@ -23,6 +25,8 @@ class ArtboxSynonymBehavior extends Behavior {
     public $values = [];
+    public $slug = null;
+
     /**
      * @param ActiveRecord $owner
      * @throws Exception
@@ -84,6 +88,7 @@ class ArtboxSynonymBehavior extends Behavior {
         $valueModel->setAttribute($this->valueOptionId, $this->owner->getAttribute($this->keyNameId));
         $valueModel->save();
         $this->owner->setAttribute($this->keyNameValue, $valueModel->getAttribute($this->valuePKey));
+        $this->owner->{$this->slug['slugKeyName']} = $this->slugify($valueModel->{$this->slug['valueKeyName']});
         $this->owner->save(false);
     }
@@ -111,6 +116,9 @@ class ArtboxSynonymBehavior extends Behavior {
         if ($isave) {
             $valueModel->setAttribute($this->valueOptionId, $this->owner->getAttribute($this->keyNameId));
             $valueModel->save();
+            if (!empty($this->slug) && empty($this->owner->getAttribute($this->slug['slugKeyName']))) {
+                $this->owner->{$this->slug['slugKeyName']} = $this->slugify($valueModel->{$this->slug['valueKeyName']});
+            }
         }
     }
@@ -122,6 +130,11 @@ class ArtboxSynonymBehavior extends Behavior {
         ]);
     }
+    private function slugify( $slug )
+    {
+        return  Inflector::slug( TransliteratorHelper::process( $slug ), '-', true );
+    }
+
     /**
      * @inheritdoc
      */
-`<?php
+<?php
 return [
     'Categories' => 'Категории',
     'Create Category' => 'Создать Категорию',