From dbe48e8b010be099d7e97c67524aa1f1977b4aba Mon Sep 17 00:00:00 2001
From: Alex <kennen.md@gmail.com>
Date: Thu, 10 Nov 2016 13:58:16 +0200
Subject: [PATCH] -Some fixes

---
 models/CategoryLang.php           | 24 ++++++++++++++----------
 models/Product.php                | 10 +++++++---
 views/category/_form.php          | 11 ++++++-----
 views/category/_form_language.php |  7 +++++--
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/models/CategoryLang.php b/models/CategoryLang.php
index dd3f667..03354aa 100755
--- a/models/CategoryLang.php
+++ b/models/CategoryLang.php
@@ -5,9 +5,10 @@
     use artweb\artbox\language\models\Language;
     use Yii;
     use yii\db\ActiveRecord;
-
+    
     /**
      * This is the model class for table "category_lang".
+     *
      * @property integer  $category_id
      * @property integer  $language_id
      * @property string   $title
@@ -16,6 +17,7 @@
      * @property string   $meta_description
      * @property string   $seo_text
      * @property string   $h1
+     * @property string   $category_synonym
      * @property Category $category
      * @property Language $language
      */
@@ -42,7 +44,7 @@
         {
             return [
                 'slug' => [
-                    'class'         => 'artweb\artbox\behaviors\Slug',
+                    'class' => 'artweb\artbox\behaviors\Slug',
                 ],
             ];
         }
@@ -66,6 +68,7 @@
                 ],
                 [
                     [
+                        'category_synonym',
                         'title',
                         'meta_title',
                         'meta_robots',
@@ -110,14 +113,15 @@
         public function attributeLabels()
         {
             return [
-                'category_id' => Yii::t('app', 'Category ID'),
-                'language_id' => Yii::t('app', 'Language ID'),
-                'title'        => Yii::t('app', 'Name'),
-                'meta_title'  => Yii::t('app', 'Meta Title'),
-                'meta_robots' => Yii::t('app', 'Meta Robots'),
-                'meta_description'   => Yii::t('app', 'Meta Desc'),
-                'seo_text'    => Yii::t('app', 'Seo Text'),
-                'h1'          => Yii::t('app', 'H1'),
+                'category_id'      => Yii::t('app', 'Category ID'),
+                'language_id'      => Yii::t('app', 'Language ID'),
+                'title'            => Yii::t('app', 'Name'),
+                'meta_title'       => Yii::t('app', 'Meta Title'),
+                'meta_robots'      => Yii::t('app', 'Meta Robots'),
+                'meta_description' => Yii::t('app', 'Meta Desc'),
+                'seo_text'         => Yii::t('app', 'Seo Text'),
+                'h1'               => Yii::t('app', 'H1'),
+                'category_synonym' => Yii::t('app', 'Synonym')
             ];
         }
         
diff --git a/models/Product.php b/models/Product.php
index 980b0d3..c51267f 100755
--- a/models/Product.php
+++ b/models/Product.php
@@ -38,7 +38,7 @@
      * @property TaxOption[]          $filters
      * @property ProductVariant[]     $variantsWithFilters
      * @property string               $remote_id
-     * @property string               $fullname
+     * @property string               $fullName
      * @property float                $variantPrice
      * @property float                $enabledVariantPrice
      * @property array                $categoryNames
@@ -315,9 +315,13 @@
          *
          * @return string
          */
-        public function getFullname():string
+        public function getFullName():string
         {
-            return empty( $this->brand ) ? $this->lang->title : $this->brand->lang->title . ' ' . $this->lang->title;
+            $name = '';
+            if (!empty($this->category->lang->category_synonym)) $name = $name . $this->category->lang->category_synonym . ' ';
+            if (!empty($this->brand)) $name = $name . $this->brand->lang->title . ' ';
+            $name .= $this->lang->title;
+            return $name;
         }
         
         /**
diff --git a/views/category/_form.php b/views/category/_form.php
index fdfd031..36d972c 100755
--- a/views/category/_form.php
+++ b/views/category/_form.php
@@ -1,8 +1,9 @@
 <?php
     
-    use common\modules\language\widgets\LanguageForm;
-    use common\modules\product\models\Category;
-    use common\modules\product\models\CategoryLang;
+    use artweb\artbox\components\artboximage\ArtboxImageHelper;
+    use artweb\artbox\language\widgets\LanguageForm;
+    use artweb\artbox\ecommerce\models\Category;
+    use artweb\artbox\ecommerce\models\CategoryLang;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\ActiveForm;
@@ -53,7 +54,7 @@
                              'gif',
                              'png',
                          ],
-                         'initialPreview'        => !empty( $model->imageUrl ) ? \common\components\artboximage\ArtboxImageHelper::getImage(
+                         'initialPreview'        => !empty( $model->imageUrl ) ? ArtboxImageHelper::getImage(
                              $model->imageUrl,
                              'list'
                          ) : '',
@@ -71,7 +72,7 @@
     <?= LanguageForm::widget(
         [
             'modelLangs' => $modelLangs,
-            'formView'   => '@backend/views/category/_form_language',
+            'formView'   => '@artweb/artbox/ecommerce/views/category/_form_language',
             'form'       => $form,
         ]
     ) ?>
diff --git a/views/category/_form_language.php b/views/category/_form_language.php
index 4f015d5..17f6ad3 100755
--- a/views/category/_form_language.php
+++ b/views/category/_form_language.php
@@ -1,6 +1,6 @@
 <?php
-    use common\modules\language\models\Language;
-    use common\modules\product\models\CategoryLang;
+    use artweb\artbox\language\models\Language;
+    use artweb\artbox\ecommerce\models\CategoryLang;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
@@ -13,6 +13,9 @@
 ?>
 <?= $form->field($model_lang, '[' . $language->id . ']title')
          ->textInput([ 'maxlength' => true ]); ?>
+    
+<?= $form->field($model_lang, '[' . $language->id . ']category_synonym')
+         ->textInput([ 'maxlength' => true ]); ?>
 
 <?= $form->field($model_lang, '[' . $language->id . ']alias')
          ->textInput([ 'maxlength' => true ]); ?>
--
libgit2 0.21.4