big commti

Administrator
1 parent 316bebf4
Showing 30 changed files with 110 additions and 49 deletions Show diff stats
common/components/artboximage/ArtboxImageHelper.php
common/config/main.php
common/models/Basket.php
common/modules/product/models/Category.php
common/modules/product/models/Export.php
common/modules/product/models/Product.php
common/modules/rubrication/controllers/TaxOptionController.php
common/modules/rubrication/models/TaxGroup.php
common/modules/rubrication/models/TaxGroupToCategory.php
common/modules/rubrication/models/TaxOption.php
common/modules/rubrication/views/tax-group/_form.php
common/modules/rubrication/views/tax-option/_form.php
common/modules/rubrication/views/tax-option/create.php
common/modules/rubrication/views/tax-option/update.php
console/migrations/m160812_140415_tax_group_to_category.php
console/migrations/m160815_101433_add_name_to_category.php
console/migrations/m160815_101441_add_name_to_brand.php
frontend/assets/FotoramaAsset.php
frontend/controllers/OrderController.php
frontend/models/SignupForm.php
@@ -40,6 +40,7 @@ class ArtboxImageHelper extends Object {
         if (empty($preset) || empty($preset_alias)) {
             return $file;
         }
+
         $filePath = self::getPathFromUrl($file);
         if (!file_exists($filePath) || !preg_match('#^(.*)\.(' . self::getExtensionsRegexp() . ')$#', $file, $matches)) {
             return $file;
@@ -155,6 +155,12 @@ return [
                         'width' => 256,
                     ],
                 ],
+                'option_menu' => [
+                    'resize' => [
+                        'width' => 100,
+                        'height' => 110,
+                    ],
+                ],
             ]
         ],
         'basket' => [
@@ -240,7 +240,7 @@ class Category extends \yii\db\ActiveRecord
         return $query3;
     }
-    public function getTaxGroupsByAlias($alias)
+    public function getTaxGroupsForMenu()
     {
         $connection = Yii::$app->getDb();
@@ -255,9 +255,8 @@ class Category extends \yii\db\ActiveRecord
                         SELECT product_id FROM product_category WHERE category_id = :category_id
                     )
                 )
-                AND tax_group.alias = :alias',
+                AND tax_group.is_menu = true',
             [
-                ':alias' => $alias,
                 ':category_id' => $this->category_id
             ]);
@@ -18,7 +18,8 @@ class Export extends Model {
         $handle = fopen($dirName .'/'. $filename, "w");
         ///$products = Product::find()->joinWith(['variants'])->where(['!=', ProductVariant::tableName() .'.stock', 0])->select('product.product_id')->all();
         $products = Product::find()
-            ->with(['variantsWithFilters','brand','categories'])->all();
+            ->with(['variantsWithFilters','brand','categories','filters'])->all();
+
         $i = 0;
         foreach ($products as $product)
@@ -89,6 +90,7 @@ class Export extends Model {
             fputcsv($handle, $to_write, ';');
+            unset($product);
         }
@@ -231,7 +231,7 @@ class Product extends \yii\db\ActiveRecord
     }
     public function getVariantsWithFilters(){
-        return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->with(['filters','images']);
+        return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->with(['filters','image']);
     }
     /**
@@ -3,6 +3,7 @@
 namespace common\modules\rubrication\controllers;
 use common\modules\rubrication\models\TaxGroup;
+use common\modules\rubrication\models\TaxOptionImage;
 use Yii;
 use common\modules\rubrication\models\TaxOption;
 use common\modules\rubrication\models\TaxOptionSearch;
@@ -10,6 +11,7 @@ use yii\data\ActiveDataProvider;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use yii\web\UploadedFile;
 /**
  * TaxOptionController implements the CRUD actions for TaxOption model.
@@ -78,7 +80,29 @@ class TaxOptionController extends Controller
         if ($model->load(Yii::$app->request->post())) {
-            $model->save();
+            if ($model->save() && ($image = UploadedFile::getInstance($model, 'image')) ) {
+                $imageModel = TaxOptionImage::find()->where(['tax_option_id' => $model->tax_option_id])->one();
+
+                if($imageModel instanceof TaxOptionImage) {
+                    $imageModel->product_variant_id = $model->product_variant_id;
+                    $imageModel->image = $image->name;
+                    $imageModel->save();
+                } else {
+                    $imageModel = new TaxOptionImage();
+                    $imageModel->product_variant_id = $model->product_variant_id;
+                    $imageModel->image = $image->name;
+                    $imageModel->save();
+                }
+
+
+                $imgDir = Yii::getAlias('@storage/tax_option/');
+
+                if(!is_dir($imgDir)) {
+                    mkdir($imgDir, 0755, true);
+                }
+
+                $image->saveAs(Yii::getAlias('@storage/tax_option/' . $image->name));
+            }
             $valueModel->tax_option_id = $model->tax_option_id;
             $valueModel->value = $model->name;
@@ -111,26 +135,32 @@ class TaxOptionController extends Controller
     {
         $model = $this->findModel($id);
         $group = TaxGroup::findOne($model->tax_group_id);
-        $valueModelName = $this->getValueModelName($group);
-        $valueModel = $valueModelName::findOne($model->default_value);
+
         if ($model->load(Yii::$app->request->post())) {
-            $model->save();
-            $valueModel->tax_option_id = $model->tax_option_id;
-            $valueModel->value = $model->name;
-            $valueModel->save();
-            $model->default_value = $valueModel->tax_value_id;
-            $model->save();
-            TaxOption::find()->rebuildMP($model->tax_group_id);
+            if ( ($image = UploadedFile::getInstance($model, 'image')) ) {
+                $model->image = $image->name;
+            }
+            if ($model->save() && $image) {
+
+                $imgDir = Yii::getAlias('@storage/tax_option/');
+
+                if(!is_dir($imgDir)) {
+                    mkdir($imgDir, 0755, true);
+                }
+
+                $image->saveAs(Yii::getAlias('@storage/tax_option/' . $image->name));
+            }
+
+            //TaxOption::find()->rebuildMP($model->tax_group_id);
             return $this->redirect(['view', 'id' => $model->tax_option_id]);
         } else {
             return $this->render('update', [
                 'model' => $model,
-                'group' => $group,
-                'valueModel' => $valueModel,
+                'group' => $group
             ]);
         }
     }
@@ -19,6 +19,7 @@ use Yii;
  * @property integer $level
  * @property integer $sort
  * @property boolean $display
+ * @property boolean $is_menu
  * @property TaxGroupToGroup[] $taxGroupToGroups
  * @property TaxGroupToGroup[] $taxGroupToGroups0
  * @property TaxOption[] $taxOptions
@@ -58,7 +59,7 @@ class TaxGroup extends \yii\db\ActiveRecord
         return [
             [['name', 'module'], 'required'],
             [['description', 'settings'], 'string'],
-            [['hierarchical', 'is_filter', 'display'], 'boolean'],
+            [['hierarchical', 'is_filter', 'display','is_menu'], 'boolean'],
             [['level', 'sort'], 'integer'],
             [['alias', 'module'], 'string', 'max' => 50],
             [['name'], 'string', 'max' => 255],
@@ -82,6 +83,7 @@ class TaxGroup extends \yii\db\ActiveRecord
             'is_filter' => 'Use in filter',
             'sort' => 'Sort',
             'display' => 'Display',
+            'is_menu' => 'Отображать в меню',
         ];
     }
@@ -2,7 +2,6 @@
 namespace common\modules\rubrication\models;
-use common\modules\relation\relationBehavior;
 use Yii;
 use common\components\artboxtree\ArtboxTreeBehavior;
 use yii\db\ActiveRecord;
@@ -20,6 +19,7 @@ use yii\db\ActiveRecord;
  * @property integer $sort
  * @property integer $default_value
  * @property integer $name
+ * @property array $image
  *
  * @property TaxEntityRelation[] $taxEntityRelations
  * @property TaxGroup $taxGroup
@@ -74,9 +74,8 @@ class TaxOption extends \yii\db\ActiveRecord
         return [
             [['tax_group_id','name'], 'required'],
             [['tax_group_id',  'parent_id', 'sort', 'default_value'], 'integer'],
-            [['alias', 'value'], 'string', 'max' => 50],
+            [['image','alias', 'value'], 'string', 'max' => 255],
             [['tax_group_id'], 'exist', 'skipOnError' => true, 'targetClass' => TaxGroup::className(), 'targetAttribute' => ['tax_group_id' => 'tax_group_id']],
-//            [['parent_id'], 'exist', 'skipOnError' => true, 'targetClass' => TaxOption::className(), 'targetAttribute' => ['parent_id' => 'tax_option_id']],
         ];
     }
@@ -92,6 +91,7 @@ class TaxOption extends \yii\db\ActiveRecord
             'alias' => Yii::t('app', 'Alias'),
             'sort' => Yii::t('app', 'Sort'),
             'default_value' => Yii::t('app', 'Default Value'),
+            'image' => Yii::t('product', 'Image'),
         ];
     }
@@ -210,15 +210,12 @@ class TaxOption extends \yii\db\ActiveRecord
         return false;
     }
-//    public function beforeDelete() {
-//        if ( ($model = $this->getValueModelName()) !== FALSE ) {
-//
-//        }
-//    }
+    public function getImageFile() {
+        return empty($this->image) ? null : Yii::getAlias('@imagesDir/tax_option/'. $this->image);
+    }
-    private function getValueModelName() {
-        $group = $this->taxGroup;
-        $valueClass = '\common\modules\rubrication\models\TaxValue'. ucfirst($group->module);
-        return class_exists($valueClass) ? $valueClass : FALSE;
+    public function getImageUrl()
+    {
+        return empty($this->image) ? null : Yii::getAlias('@imagesUrl/tax_option/' . $this->image);
     }
 }
@@ -13,7 +13,7 @@ use common\components\artboxtree\ArtboxTreeHelper;
 <div class="tax-group-form">
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
@@ -37,7 +37,9 @@ use common\components\artboxtree\ArtboxTreeHelper;
     <?= $form->field($model, 'is_filter')->checkbox() ?>
     <?= $form->field($model, 'display')->checkbox() ?>
-    
+
+    <?= $form->field($model, 'is_menu')->checkbox() ?>
+
     <?= $form->field($model, 'sort')->textInput() ?>
     <div class="form-group">
@@ -15,7 +15,7 @@ use common\modules\rubrication\helpers\RubricationHelper;
 <div class="tax-option-form">
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
     <?php if (empty($group->tax_group_id)) :?>
         <?= $form->field($model, 'tax_group_id')->dropDownList(
             ArrayHelper::map(TaxOption::find()->all(), 'tax_group_id', 'name'),
@@ -33,23 +33,39 @@ use common\modules\rubrication\helpers\RubricationHelper;
     <?= $form->field($model, 'alias')->textInput(['maxlength' => true]) ?>
-    <?php if ($group->hierarchical) :?>
-    <?php
+    <?php if ($group->hierarchical) {
         $tree = TaxOption::find()->getTree($model->tax_group_id);
-    ?>
-    <?= $form->field($model, 'parent_id')->dropDownList(
+        $form->field($model, 'parent_id')->dropDownList(
         ArtboxTreeHelper::treeMap($tree, 'tax_option_id', 'ValueRenderFlash', '.'),
         [
             'prompt' => Yii::t('rubrication', 'Root level'),
             'options' => [
                 $model->tax_option_id => ['disabled' => true]
             ]
-        ]
-    ) ?>
-    <?php else :?>
-        <?= $form->field($model, 'parent_id')->hiddenInput()->label('') ?>
-    <?php endif?>
+        ]);
+
+        }else {
+
+        $form->field($model, 'parent_id')->hiddenInput()->label('');
+    }
+    ?>
+
+    <?= $form->field($model, 'image')->widget(\kartik\file\FileInput::classname(), [
+        'language' => 'ru',
+        'options' => [
+            'accept' => 'image/*',
+            'multiple' => false,
+        ],
+        'pluginOptions' => [
+            'allowedFileExtensions' => ['jpg', 'gif', 'png'],
+            'initialPreview' => !empty($model->imageUrl) ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list') : '',
+            'overwriteInitial' => true,
+            'showRemove' => false,
+            'showUpload' => false,
+            'previewFileType' => 'image',
+        ],
+    ]); ?>
     <?= $form->field($model, 'sort')->dropDownList(RubricationHelper::SortArray()) ?>
     <div class="form-group">
@@ -18,8 +18,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?= $this->render('_form', [
         'model' => $model,
-        'group' => $group,
-        'valueModel' => $valueModel,
+        'group' => $group
     ]) ?>
 </div>
@@ -19,8 +19,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = Yii::t(&#39;rubrication&#39;, &#39;Update&#39;);
     <?= $this->render('_form', [
         'model' => $model,
-        'group' => $group,
-        'valueModel' => $valueModel,
+        'group' => $group
     ]) ?>
 </div>
 <?php
+use common\components\artboximage\ArtboxImageHelper;
 use common\modules\product\models\Category;
+use yii\helpers\Html;
 use yii\helpers\Url;
 $models = Category::find()->all();
@@ -24,11 +26,13 @@ $models = Category::find()-&gt;all();
                 <ul>
-                <?php foreach($model->getTaxGroupsByAlias('naznacenie') as $group): ?>
+                <?php foreach($model->getTaxGroupsForMenu() as $group): ?>
                     <li>
-                        <a href="<?= Url::to(['catalog/category','category' => $model['alias'],'filters' => ['naznacenie' => [$group['option_alias']]]]) ?>">
-                            <i class="spritecat spritecat-klassicheskie_4"></i>
+                        <a href="<?= Url::to(['catalog/category','category' => $model['alias'],'filters' => [$group['alias'] => [$group['option_alias']]]]) ?>">
+                            <div class="option_image_block">
+                                <?= Html::img(ArtboxImageHelper::getImageSrc(Yii::getAlias('@imagesUrl/tax_option/'. $group['image']), 'option_menu'))?>
+                            </div>
                             <div class="clearfix"></div>
                             <span class="menu-bar-cat-name"><?=$group['value']?></span>
                         </a>
@@ -9,6 +9,10 @@
     top: 0px;
     right: -7px;
 }
+
+.option_image_block{
+    height: 110px;
+}
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em
 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,