-

Karnovsky A
1 parent 22827c55
Showing 19 changed files with 216 additions and 87 deletions Show diff stats
backend/controllers/ArticlesController.php
backend/controllers/BlogController.php
backend/controllers/BrandController.php
backend/controllers/CategoryController.php
backend/views/articles/_form.php
backend/views/blog/_form.php
backend/views/brand/_form.php
backend/views/brand/view.php
backend/views/category/_form.php
backend/views/category/view.php
common/components/artboximage/ArtboxImageBehavior.php
common/config/bootstrap.php
common/models/Articles.php
common/models/Blog.php
common/modules/product/models/Brand.php
common/modules/product/models/Category.php
frontend/views/articles/index.php
frontend/views/articles/show.php
frontend/views/catalog/product_item.php
@@ -9,6 +9,8 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use developeruz\db_rbac\behaviors\AccessBehavior;
+use yii\web\UploadedFile;
+
 /**
  * ArticlesController implements the CRUD actions for Articles model.
  */
@@ -77,7 +79,16 @@ class ArticlesController extends Controller
     {
         $model = new Articles();
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post())) {
+
+            if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
+                $model->image = $image->name;
+            }
+
+            if ($model->save() && $image) {
+                $image->saveAs(Yii::getAlias('@imagesDir/articles/' . $image->name));
+            }
+
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('create', [
@@ -96,7 +107,16 @@ class ArticlesController extends Controller
     {
         $model = $this->findModel($id);
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post())) {
+
+            if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
+                $model->image = $image->name;
+            }
+
+            if ($model->save() && $image) {
+                $image->saveAs(Yii::getAlias('@imagesDir/articles/' . $image->name));
+            }
+
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('update', [
@@ -79,10 +79,18 @@ class BlogController extends Controller
     {
         $model = new Blog();
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post())) {
             Fields::saveFieldData(Yii::$app->request->post('Fields'), $model->blog_id, Blog::className(), 'ru');
+            if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
+                $model->cover = $image->name;
+            }
+
+            if ($model->save() && $image) {
+                $image->saveAs(Yii::getAlias('@imagesDir/articles/' . $image->name));
+            }
+
             return $this->redirect(['view', 'id' => $model->blog_id]);
         } else {
             return $this->render('create', [
@@ -101,8 +109,18 @@ class BlogController extends Controller
     {
         $model = $this->findModel($id);
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post())) {
+
             Fields::saveFieldData(Yii::$app->request->post('Fields'), $model->blog_id, Blog::className(), 'ru');
+
+            if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
+                $model->cover = $image->name;
+            }
+
+            if ($model->save() && $image) {
+                $image->saveAs(Yii::getAlias('@imagesDir/articles/' . $image->name));
+            }
+
             return $this->redirect(['view', 'id' => $model->blog_id]);
         } else {
             return $this->render('update', [
@@ -9,6 +9,8 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
+use yii\web\UploadedFile;
+
 /**
  * BrandController implements the CRUD actions for Brand model.
  */
@@ -78,8 +80,15 @@ class BrandController extends Controller
     public function actionCreate()
     {
         $model = new Brand();
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            exit;
+        if ($model->load(Yii::$app->request->post())) {
+            if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
+                $model->image = $image->name;
+            }
+
+            if ($model->save() && $image) {
+                $image->saveAs(Yii::getAlias('@imagesDir/brands/' . $image->name));
+            }
+
             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', [
@@ -99,13 +108,15 @@ class BrandController extends Controller
         $model = $this->findModel($id);
         if ($model->load(Yii::$app->request->post())) {
-//            var_dump($_POST);
-//            print "<hr>";
-//            var_dump($_FILES);
-//            exit;
-            if ($model->save()) {
-                return $this->redirect(['view', 'id' => $model->brand_id]);
+            if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
+                $model->image = $image->name;
+            }
+
+            if ($model->save() && $image) {
+                $image->saveAs(Yii::getAlias('@imagesDir/brands/' . $image->name));
             }
+
+            return $this->redirect(['view', 'id' => $model->brand_id]);
         } else {
             return $this->render('update', [
                 'model' => $model,
@@ -11,6 +11,8 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
+use yii\web\UploadedFile;
+
 /**
  * CategoryController implements the CRUD actions for Category model.
  */
@@ -79,7 +81,15 @@ class CategoryController extends Controller
     {
         $model = new Category();
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post())) {
+            if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
+                $model->image = $image->name;
+            }
+
+            if ($model->save() && $image) {
+                $image->saveAs(Yii::getAlias('@imagesDir/categories/' . $image->name));
+            }
+
             return is_null(Yii::$app->request->post('create_and_new')) ? $this->redirect(['view', 'id' => $model->category_id]) : $this->redirect(array_merge(['create'], Yii::$app->request->queryParams));
         } else {
             if (!empty(Yii::$app->request->queryParams['parent'])) {
@@ -102,7 +112,15 @@ class CategoryController extends Controller
     {
         $model = $this->findModel($id);
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post())) {
+            if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
+                $model->image = $image->name;
+            }
+
+            if ($model->save() && $image) {
+                $image->saveAs(Yii::getAlias('@imagesDir/categories/' . $image->name));
+            }
+
             return $this->redirect(['view', 'id' => $model->category_id]);
         } else {
             return $this->render('update', [
@@ -13,7 +13,10 @@ use yii\jui\DatePicker;
 <div class="articles-form">
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'enableClientValidation' => false,
+        'options' => ['enctype' => 'multipart/form-data']
+    ]); ?>
     <?= $form->field($model, 'date')
@@ -34,7 +37,21 @@ use yii\jui\DatePicker;
         ]) ?>
-    <?= $form->field($model, 'image')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'imageUpload')->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, 'translit')->textInput(['maxlength' => true]) ?>
@@ -15,7 +15,10 @@ use common\components\Request;
 <div class="blog-form">
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'enableClientValidation' => false,
+        'options' => ['enctype' => 'multipart/form-data']
+    ]); ?>
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
@@ -31,20 +34,21 @@ use common\components\Request;
             )
         ]) ?>
-    <?= ImageUploader::widget([
-        'model'=> $model,
-        'field'=>'cover',
-        'size' => [
-            [
-                'width'=>340,
-                'height'=>260,
-            ]
+    <?= $form->field($model, 'imageUpload')->widget(\kartik\file\FileInput::classname(), [
+        'language' => 'ru',
+        'options' => [
+            'accept' => 'image/*',
+            'multiple' => false,
         ],
-        'multi'=>true,
-        'gallery' =>$model->cover,
-        'name' => 'Загрузить миниатюру статьи'
-    ]);
-    ?>
+        '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',
+        ],
+    ]); ?>
     <?= FieldEditor::widget([
         'template' => 'education',
@@ -19,7 +19,21 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'alias')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'image')->fileInput(['accept' => 'image/*']) ?>
+    <?= $form->field($model, 'imageUpload')->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, 'meta_title')->textInput(['maxlength' => true]) ?>
@@ -31,7 +31,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'brand_id',
             'brand_name_id',
             'alias',
-            'image',
+            'imageUrl:image',
             'meta_title',
             'meta_desc:ntext',
             'meta_robots',
@@ -12,7 +12,10 @@ use kartik\select2\Select2;
 <div class="category-form">
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'enableClientValidation' => false,
+        'options' => ['enctype' => 'multipart/form-data']
+    ]); ?>
     <?= $form->field($model, 'name')->textInput() ?>
@@ -25,13 +28,6 @@ use kartik\select2\Select2;
         ]
     ])->label(Yii::t('product', 'Parent category')) ?>
-    <?php /*
-    <?= $form->field($model, 'group_to_category')->dropDownList(
-        \yii\helpers\ArrayHelper::map(\common\modules\rubrication\models\TaxGroup::find()->all(), 'tax_group_id', 'name'), [
-            'multiple' => true
-    ])->label(Yii::t('product', 'Linked options')) ?>
-    */?>
-
     <?= $form->field($model, 'group_to_category')->widget(Select2::className(), [
             'data' => \yii\helpers\ArrayHelper::map(\common\modules\rubrication\models\TaxGroup::find()->all(), 'tax_group_id', 'name'),
             'language' => 'ru',
@@ -45,20 +41,21 @@ use kartik\select2\Select2;
         ]
     ) ?>
-    <?= ImageUploader::widget([
-        'model'=> $model,
-        'field'=>'image',
-        'size' => [
-            [
-                'width'=>340,
-                'height'=>260,
-            ]
+    <?= $form->field($model, 'imageUpload')->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',
         ],
-        'multi'=>false,
-        'gallery' => $model->image,
-        'name' => 'Загрузить изображение'
-    ]);
-    ?>
+    ]); ?>
     <?= $form->field($model, 'meta_title')->textInput(['maxlength' => true]) ?>
@@ -36,7 +36,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'parent_id',
             'path',
             'depth',
-            'image',
+            'imageUrl:image',
             'meta_title',
             'meta_desc:ntext',
             'meta_robots',
+<?php
+
+namespace common\components\artboximage;
+
+use Yii;
+use yii\base\Behavior;
+
+class ArtboxImageBehavior extends Behavior {
+
+}
 \ No newline at end of file
@@ -4,3 +4,6 @@ Yii::setAlias(&#39;@frontend&#39;, dirname(dirname(__DIR__)) . &#39;/frontend&#39;);
 Yii::setAlias('@backend', dirname(dirname(__DIR__)) . '/backend');
 Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console');
 Yii::setAlias('storage', dirname(dirname(__DIR__)) . '/storage');
+
+Yii::setAlias('@imagesDir', dirname(dirname(__DIR__)) . '/frontend/web/images');
+Yii::setAlias('@imagesUrl', '/images');
@@ -21,6 +21,8 @@ use Yii;
  */
 class Articles extends \yii\db\ActiveRecord
 {
+    public $imageUpload;
+
     /**
      * @inheritdoc
      */
@@ -39,6 +41,8 @@ class Articles extends \yii\db\ActiveRecord
             [['title', 'body', 'image', 'translit'], 'required'],
             [['body', 'seo_text'], 'string'],
             [['title', 'image', 'translit', 'meta_title', 'meta_keywords', 'meta_description', 'h1'], 'string', 'max' => 255],
+            [['imageUpload'], 'safe'],
+            [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
         ];
     }
@@ -53,6 +57,7 @@ class Articles extends \yii\db\ActiveRecord
             'title' => 'Title',
             'body' => 'Body',
             'image' => 'Image',
+            'imageUrl' => Yii::t('app', 'Image'),
             'translit' => 'Translit',
             'meta_title' => 'Meta Title',
             'meta_keywords' => 'Meta Keywords',
@@ -61,4 +66,13 @@ class Articles extends \yii\db\ActiveRecord
             'h1' => 'H1',
         ];
     }
+
+    public function getImageFile() {
+        return empty($this->image) ? null : Yii::getAlias('@imagesDir/articles/'. $this->image);
+    }
+
+    public function getImageUrl()
+    {
+        return empty($this->image) ? null : Yii::getAlias('@imagesUrl/articles/' . $this->image);
+    }
 }
@@ -21,6 +21,7 @@
      */
     class Blog extends \yii\db\ActiveRecord
     {
+        public $imageUpload;
         /**
          * @inheritdoc
@@ -80,6 +81,8 @@
                     'string',
                     'max' => 255,
                 ],
+                [['imageUpload'], 'safe'],
+                [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
             ];
         }
@@ -102,6 +105,17 @@
                 'view_count'  => Yii::t('app', 'view_count'),
                 'description' => Yii::t('app', 'description'),
                 'cover'       => Yii::t('app', 'cover'),
+                'image'       => Yii::t('app', 'cover'),
+                'imageUrl'    => Yii::t('app', 'cover'),
             ];
         }
+
+        public function getImageFile() {
+            return empty($this->image) ? null : Yii::getAlias('@imagesDir/brands/'. $this->image);
+        }
+
+        public function getImageUrl()
+        {
+            return empty($this->image) ? null : Yii::getAlias('@imagesUrl/brands/' . $this->image);
+        }
     }
@@ -4,8 +4,7 @@ namespace common\modules\product\models;
 use common\behaviors\Slug;
 use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
-use mongosoft\file\UploadBehavior;
-use mongosoft\file\UploadImageBehavior;
+use yii\web\UploadedFile;
 use Yii;
 /**
@@ -27,6 +26,8 @@ use Yii;
  */
 class Brand extends \yii\db\ActiveRecord
 {
+    public $imageUpload;
+
     public function behaviors()
     {
         return [
@@ -43,18 +44,6 @@ class Brand extends \yii\db\ActiveRecord
                     'slugKeyName' => 'alias',
                     'translit' => true
                 ],
-                'uploader' => [
-                    'class' => UploadBehavior::className(),
-                    'attribute' => 'fileUpload',
-                    'scenarios' => ['insert', 'update'],
-//                    'placeholder' => '@app/modules/user/assets/images/userpic.jpg',
-                    'path' => '@storage/brands/{alias}',
-                    'url' => '/storage/brands/{alias}',
-//                    'thumbs' => [
-//                        'thumb' => ['width' => 400, 'quality' => 90],
-//                        'preview' => ['width' => 200, 'height' => 200],
-//                    ],
-                ],
             ],
         ];
     }
@@ -77,10 +66,10 @@ class Brand extends \yii\db\ActiveRecord
             [['brand_name_id'], 'integer'],
             [['meta_desc', 'seo_text'], 'string'],
             [['alias', 'name'], 'string', 'max' => 250],
-            [['meta_title'], 'string', 'max' => 255],
+            [['meta_title', 'image'], 'string', 'max' => 255],
             [['meta_robots'], 'string', 'max' => 50],
-            [['fileUpload'], 'file', 'extensions' => 'jpg, gif, png'],
-//            [['brand_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => BrandName::className(), 'targetAttribute' => ['brand_name_id' => 'brand_name_id']],
+            [['imageUpload'], 'safe'],
+            [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
         ];
     }
@@ -132,10 +121,11 @@ class Brand extends \yii\db\ActiveRecord
     }
     public function getImageFile() {
-        return empty($this->image) ? null : '/images/brand/'. $this->image;
+        return empty($this->image) ? null : Yii::getAlias('@imagesDir/brands/'. $this->image);
     }
-    public function getImageUrl() {
-        return empty($this->image) ? null : '/images/brand/'. $this->image;
+    public function getImageUrl()
+    {
+        return empty($this->image) ? null : Yii::getAlias('@imagesUrl/brands/' . $this->image);
     }
 }
@@ -85,7 +85,7 @@ class Category extends \yii\db\ActiveRecord
             [['name'], 'string'],
             [['parent_id', 'depth', 'category_name_id', 'product_unit_id'], 'integer'],
             [['path', 'meta_desc', 'seo_text'], 'string'],
-            [['meta_title'], 'string', 'max' => 255],
+            [['meta_title', 'image'], 'string', 'max' => 255],
             [['meta_robots'], 'string', 'max' => 50],
             [['alias', 'name'], 'string', 'max' => 250],
             [['populary'], 'boolean'],
@@ -93,7 +93,6 @@ class Category extends \yii\db\ActiveRecord
             [['category_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => CategoryName::className(), 'targetAttribute' => ['category_name_id' => 'category_name_id']],
             [['imageUpload'], 'safe'],
             [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
-//            [['product_unit_id'], 'exist', 'skipOnError' => true, 'targetClass' => ProductUnit::className(), 'targetAttribute' => ['product_unit_id' => 'product_unit_id']],
         ];
     }
@@ -172,14 +171,17 @@ class Category extends \yii\db\ActiveRecord
         return $this->hasOne(CategoryName::className(), ['category_name_id' => 'category_name_id']);
     }
-    public function getName()
-    {
+    public function getName() {
         return empty($this->categoryName) ? null : $this->categoryName->value;
     }
+    public function getImageFile() {
+        return empty($this->image) ? null : Yii::getAlias('@imagesDir/categories/'. $this->image);
+    }
+
     public function getImageUrl()
     {
-        return empty($this->image) ? null : '/images/category/' . $this->image;
+        return empty($this->image) ? null : Yii::getAlias('@imagesUrl/categories/' . $this->image);
     }
     public function beforeSave($insert)
@@ -27,7 +27,9 @@ $this-&gt;registerMetaTag([&#39;name&#39; =&gt; &#39;keywords&#39;, &#39;content&#39; =&gt; &#39;Блог&#39;]);
         <?php foreach($news as $item):?>
 	<div class="news_item">
-		<a href="<?=Url::to(['articles/show','translit'=>$item->translit,'id'=>$item->id])?>"><img src="<?=Yii::$app->request->baseUrl.'/storage/articles/ico/'.$item->image?>" width="180" height="125" border="0" align="left" /></a>
+		<a href="<?=Url::to(['articles/show','translit'=>$item->translit,'id'=>$item->id])?>">
+            <?= \common\components\artboximage\ArtboxImageHelper::getImage($item->imageUrl, 'list')?>
+        </a>
 		<a href="<?=Url::to(['articles/show','translit'=>$item->translit,'id'=>$item->id])?>" class="name"><?=$item->title?></a><br />
 		<?=Text::getShort($item->body,600);?><div class="both"></div>
 	</div>        
@@ -22,8 +22,7 @@ $this-&gt;registerMetaTag([&#39;name&#39; =&gt; &#39;keywords&#39;, &#39;content&#39; =&gt; $news-&gt;meta_keywords]
     <div class="content">
 	<h1><?=$news->title?></h1>
-        
-            <img src="<?=Yii::$app->request->baseUrl.'/storage/articles/big/'.$news->image?>" width="400" height="400" border="0" align="left" class='pic' />
+        <?= \common\components\artboximage\ArtboxImageHelper::getImage($news->imageUrl, 'product')?>
             <?=$news->body?>
             <p class='date'><?=$news->date?></p>
     </div>                                    
@@ -9,11 +9,7 @@ use yii\helpers\Url;
                 'catalog/product',
                 'product' => $product])
             ?>">
-                <?php if (empty($product->image)) :?>
-                    <img src="/img/no_photo.png">
-                <?php else :?>
-                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->image->imageUrl, 'list')?>
-                <?php endif?>
+                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
             </a>
         </div>
         <a href="<?= Url::to([