Merge remote-tracking branch 'origin/vetal' into vetal

Виталий
2 parents 8ca8678e a442f66d
Showing 7 changed files with 143 additions and 1 deletions Show diff stats
common/models/Product.php
common/models/ProductLang.php
common/models/Variant.php
common/models/VariantLang.php
console/migrations/m170920_154718_add_column_gallery_to_product_table.php
frontend/config/main.php
frontend/controllers/VariantController.php
+<?php
+    /**
+     * Created by PhpStorm.
+     * User: stes
+     * Date: 20.09.17
+     * Time: 18:52
+     */
+    
+    namespace common\models;
+    
+    use artbox\core\behaviors\BitMaskBehavior;
+    use artbox\core\behaviors\GalleryBehavior;
+    use artbox\core\behaviors\LanguageBehavior;
+    use artbox\core\behaviors\ManyToManyBehavior;
+    use artbox\core\models\Image;
+    use yii\behaviors\TimestampBehavior;
+
+    class Product extends \artbox\catalog\models\Product
+    {
+        public $imgIds;
+        public function behaviors()
+        {
+            return [
+                'language'       => [
+                    'class' => LanguageBehavior::className(),
+                ],
+                'timestamp'      => [
+                    'class' => TimestampBehavior::className(),
+                ],
+                [
+                    'class' => ManyToManyBehavior::className(),
+                ],
+                [
+                    'class'  => BitMaskBehavior::className(),
+                    'fields' => [
+                        'top'       => 0,
+                        'new'       => 1,
+                        'akcia'     => 2,
+                        'exclusive' => 3,
+                    ],
+                ],
+                [
+                    'class' => GalleryBehavior::className(),
+                ],
+            ];
+        }
+        public function getImages()
+        {
+            $ids = [];
+            $gallery = $this->gallery;
+            if (!empty($gallery)) {
+                $ids = array_filter(json_decode($gallery));
+            }
+            if (!empty($this->image_id)) {
+                $ids[] = $this->image_id;
+            }
+            $this->imgIds = $ids;
+            return $this->hasMany(Image::className(), [ 'id' => 'imgIds' ]);
+        }
+    }
 \ No newline at end of file
+<?php
+    /**
+     * Created by PhpStorm.
+     * User: stes
+     * Date: 20.09.17
+     * Time: 18:55
+     */
+    
+    namespace common\models;
+    
+    class ProductLang extends \artbox\catalog\models\ProductLang
+    {
+        
+    }
 \ No newline at end of file
+<?php
+    /**
+     * Created by PhpStorm.
+     * User: stes
+     * Date: 20.09.17
+     * Time: 18:53
+     */
+    
+    namespace common\models;
+    
+    class Variant extends \artbox\catalog\models\Variant
+    {
+        public function getProduct()
+        {
+            return $this->hasOne(Product::className(), [ 'id' => 'product_id' ])
+                        ->inverseOf('variants');
+        }
+    }
 \ No newline at end of file
+<?php
+    /**
+     * Created by PhpStorm.
+     * User: stes
+     * Date: 20.09.17
+     * Time: 18:55
+     */
+    
+    namespace common\models;
+    
+    class VariantLang extends \artbox\catalog\models\VariantLang
+    {
+        
+    }
 \ No newline at end of file
+<?php
+
+use yii\db\Migration;
+
+class m170920_154718_add_column_gallery_to_product_table extends Migration
+{
+    public function safeUp()
+    {
+        $this->addColumn('product', 'gallery', $this->string());
+    }
+
+    public function safeDown()
+    {
+        $this->dropColumn('product', 'gallery');
+    }
+
+    /*
+    // Use up()/down() to run migration code without a transaction.
+    public function up()
+    {
+
+    }
+
+    public function down()
+    {
+        echo "m170920_154718_add_column_gallery_to_product_table cannot be reverted.\n";
+
+        return false;
+    }
+    */
+}
@@ -57,6 +57,11 @@
                 'class'           => SeoUrlManager::className(),
                 'enablePrettyUrl' => true,
                 'showScriptName'  => false,
+                'processRoutes' => [
+                    'variant/view',
+                    'product/view',
+                    'blog/article'
+                ],
                 'rules'           => [
                     [
                         'pattern'  => 'filter/<filter>',
@@ -2,7 +2,7 @@
  
     namespace frontend\controllers;
  
-    use artbox\catalog\models\Variant;
+    use common\models\Variant;
     use artbox\core\components\SeoComponent;
     use yii\db\ActiveQuery;
     use yii\web\Controller;