Karnovsky A · Karnovsky A · Karnovsky A
Showing 16 changed files Show diff stats
backend/controllers/BrandController.php
backend/controllers/CategoryController.php
common/config/bootstrap.php
common/config/main.php
common/modules/product/models/Category.php
common/modules/product/models/Product.php
common/modules/product/models/ProductImage.php
common/modules/product/models/ProductVariant.php
common/modules/product/widgets/views/product_smart.php
common/modules/product/widgets/views/products_block.php
common/modules/product/widgets/views/submenu.php
common/widgets/views/basket_modal.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
frontend/views/catalog/product_smart.php
frontend/views/orders/basket-step-02.php
@@ -85,7 +85,7 @@ class BrandController extends Controller
                 $model->image = $image->name;
             }
             if ($model->save() && $image) {
-                $image->saveAs(Yii::getAlias('@frontend/web/images/brand/' . $image->name));
+                $image->saveAs(Yii::getAlias('@storage/brand/' . $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));
@@ -110,7 +110,7 @@ class BrandController extends Controller
                 $model->image = $image->name;
             }
             if ($model->save() && $image) {
-                $image->saveAs(Yii::getAlias('@frontend/web/images/brand/' . $image->name));
+                $image->saveAs(Yii::getAlias('@storage/brand/' . $image->name));
             }
             return $this->redirect(['view', 'id' => $model->brand_id]);
@@ -88,7 +88,7 @@ class CategoryController extends Controller
                 $model->image = $image->name;
             }
             if ($model->save() && $image) {
-                $image->saveAs(Yii::getAlias('@frontend/web/images/category/' . $image->name));
+                $image->saveAs(Yii::getAlias('@storage/category/' . $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));
@@ -118,7 +118,7 @@ class CategoryController extends Controller
                 $model->image = $image->name;
             }
             if ($model->save() && $image) {
-                $image->saveAs(Yii::getAlias('@frontend/web/images/category/' . $image->name));
+                $image->saveAs(Yii::getAlias('@storage/category/' . $image->name));
             }
             return $this->redirect(['view', 'id' => $model->category_id]);
@@ -5,6 +5,6 @@ Yii::setAlias(&#39;@backend&#39;, dirname(dirname(__DIR__)) . &#39;/backend&#39;);
 Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console');
 Yii::setAlias('@storage', dirname(dirname(__DIR__)) . '/storage');
 Yii::setAlias('storage', dirname(dirname(__DIR__)) . '/storage');
-Yii::setAlias('@imagesDir', dirname(dirname(__DIR__)) . '/frontend/web/images');
-Yii::setAlias('@imagesUrl', '/images');
+Yii::setAlias('@imagesDir', dirname(dirname(__DIR__)) . '/storage');
+Yii::setAlias('@imagesUrl', '/storage');
@@ -72,8 +72,8 @@ return [
         'artboximage' => [
             'class' => 'common\components\artboximage\ArtboxImage',
             'driver' => 'GD',  //GD or Imagick
-            'rootPath' => Yii::getAlias('@frontend/web/images'),
-            'rootUrl' => Yii::getAlias('/images'),
+            'rootPath' => Yii::getAlias('@storage'),
+            'rootUrl' => Yii::getAlias('/storage'),
             'presets' => [
                 'product' => [
                     'resize' => [
@@ -137,9 +137,13 @@ return [
                 'slider' => [
                     'resize' => [
                         'width' => 1920,
-                        'height' => 480,
-                        'master' => null
+                        'height' => null,
+                        'master' => 'width'
                     ],
+                    'crop' => [
+                        'width' => 1920,
+                        'height' => 480
+                    ]
                 ],
             ]
         ],
@@ -195,7 +195,7 @@ class Category extends \yii\db\ActiveRecord
     public function getImageUrl()
     {
         // return a default image placeholder if your source image is not found
-        return isset($this->image) ? '/images/category/'. $this->image : '/images/no_photo.png';
+        return isset($this->image) ? '/storage/category/'. $this->image : '/storage/no_photo.png';
     }
@@ -242,12 +242,12 @@ class Product extends \yii\db\ActiveRecord
             foreach ($this->imagesUpload as $image) {
                 $imageName = $image->baseName .'.'. $image->extension;
                 $i = 0;
-                while(file_exists(Yii::getAlias('@frontend/web/images/products/' . $imageName))) {
+                while(file_exists(Yii::getAlias('@storage/products/' . $imageName))) {
                     $i++;
                     $imageName = $image->baseName .'_'. $i .'.'. $image->extension;
                 }
-                $image->saveAs(Yii::getAlias('@frontend/web/images/products/' .$imageName));
+                $image->saveAs(Yii::getAlias('@storage/products/' .$imageName));
                 $images[] = $imageName;
             }
             return $images;
@@ -259,7 +259,7 @@ class Product extends \yii\db\ActiveRecord
     public function getImageUrl()
     {
         $image = empty($this->variant) ? null : $this->variant->image;
-        return !empty($image) ? $image->imageUrl : '/images/no_photo.png';
+        return !empty($image) ? $image->imageUrl : '/storage/no_photo.png';
     }
     public function getImagesHTML() {
@@ -97,7 +97,7 @@ class ProductImage extends \yii\db\ActiveRecord
      */
     public function getImageFile()
     {
-        return isset($this->image) ? '/images/products/' . $this->image : null;
+        return isset($this->image) ? '/storage/products/' . $this->image : null;
     }
     /**
@@ -107,7 +107,7 @@ class ProductImage extends \yii\db\ActiveRecord
     public function getImageUrl()
     {
         // return a default image placeholder if your source image is not found
-        return isset($this->image) ? '/images/products/'. $this->image : '/images/no_photo.png';
+        return isset($this->image) ? '/storage/products/'. $this->image : '/storage/no_photo.png';
     }
     /**
@@ -97,7 +97,7 @@ class ProductVariant extends \yii\db\ActiveRecord
     public function getImageUrl()
     {
         // return a default image placeholder if your source image is not found
-        return !empty($this->image) ? $this->image->imageUrl : '/images/no_photo.png';
+        return !empty($this->image) ? $this->image->imageUrl : '/storage/no_photo.png';
     }
     /**
@@ -55,7 +55,7 @@ use yii\helpers\Url;
                     'catalog/product',
                     'product' => $product,
                     '#' => 'm' . $variant->product_variant_id]) ?>">
-                    <?= \common\components\artboximage\ArtboxImageHelper::getImage((!empty($variant->image) && !empty($variant->image->imageUrl) ? $variant->image->imageUrl : '/images/no_photo.png'), 'product_variant')?>
+                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
                 </a>
             </li>
             <?php endforeach; ?>
@@ -17,11 +17,7 @@ use yii\web\View;
                 <?php endif?>
                 <a href="#" class="item_link">
                     <div class="pic">
-                        <?php if (empty($product->image)) :?>
-                            <img src="/images/no_photo.png">
-                        <?php else :?>
-                            <?= ArtboxImageHelper::getImage($product->image->imageUrl, 'product_list')?>
-                        <?php endif?>
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'product_list')?>
                     </div>
                     <div class="title_item"><?= $product->name?></div>
                 </a>
@@ -9,11 +9,7 @@
                             <?php foreach($populary as $_item) :?>
                                 <div class="content_item"><a href="<?= \yii\helpers\Url::to(['catalog/category', 'category' => $_item])?>">
                                         <div valign="top" class="picture">
-                                            <?php if (empty($_item->image)) :?>
-                                            <img valign="top" src="/images/no_photo.png">
-                                            <?php else :?>
-                                                <?= $_item->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($_item->imageUrl, 'mainmenu') : ''?>
-                                            <?php endif?>
+                                            <?= $_item->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($_item->imageUrl, 'mainmenu') : ''?>
                                         </div>
                                         <div class="title"><?= $_item->categoryName->value?></div>
                                     </a></div>
@@ -31,11 +27,7 @@
                         <?php foreach($item['children'] as $_item) :?>
                         <div class="content_item"><a href="<?= \yii\helpers\Url::to(['catalog/category', 'category' => $_item['item']])?>">
                             <div valign="top" class="picture">
-                                <?php if (empty($_item['item']->image)) :?>
-                                    <img valign="top" src="/images/no_photo.png">
-                                <?php else :?>
-                                    <?= $_item['item']->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($_item['item']->imageUrl, 'mainmenu') : ''?>
-                                <?php endif?>
+                                <?= $_item['item']->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($_item['item']->imageUrl, 'mainmenu') : ''?>
                             </div>
                             <div class="title"><?= $_item['item']->categoryName->value?></div>
                         </a></div>
@@ -17,7 +17,7 @@ use yii\helpers\Html;
                 <div class="delete_item_btn"><i class="fa fa-times"></i></div>
                 <div class="little_img">
                     <?php if (empty($item['item']->product->image)) :?>
-                        <img src="/images/no_photo.png">
+                        <img src="/storage/no_photo.png">
                     <?php else :?>
                         <img src="<?= $item['item']->product->image->imageUrl?>" alt="<?= $item['item']->product->image->alt ? $item['item']->product->image->alt : $item['item']->product->name?>">
                     <?php endif?>
@@ -21,16 +21,18 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
 <div class="item_3_blocks_wrap" id="one_item_block" data-id="<?= $product->variant->product_variant_id?>"> <!-- flex container -->
     <div class="item_img_block"> <!-- блок с фотографиями -->
-        <div class="fotorama" data-allowfullscreen="true" data-nav="thumbs">
         <?php if (!empty($product->images)) :?>
+        <div class="fotorama" data-allowfullscreen="true" data-nav="thumbs">
             <?php foreach($product->images as $image) :?>
             <a href="<?=$image->imageUrl ?>">
                 <?= ArtboxImageHelper::getImage($image->imageUrl, 'product_trumb')?>
             </a>
             <?php endforeach?>
-        <?php endif?>
         </div>
+        <?php else :?>
+            <?= ArtboxImageHelper::getImage($product->imageUrl, 'product')?>
+        <?php endif?>
         <div class="product_service">
             <ul>
                 <li class="item1"><a id="add_to_bookmarks" href="#">Добавить в закладки</a>
@@ -121,6 +123,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
         </div>-->
     </div><!-- закрытие блока с характеристиками -->
+    <?php /*
     <hr>
     <h1 class="with_this">С этим товаром покупают</h1>
@@ -130,7 +133,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
         <div class="my_custom_card">
             <div class="new">АКЦИЯ</div>
             <div class="top">Toп</div>
-            <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
+            <a href="#" class="item_link"><div class="pic"><img src="/storage/no_photo.png"></div>
                 <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
             <div class="brand">Бренд: <span>Knauf</span></div>
             <div class="type">Штукатурки</div>
@@ -143,7 +146,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
         <div class="my_custom_card">
             <div class="new">АКЦИЯ</div>
             <div class="top">Toп</div>
-            <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
+            <a href="#" class="item_link"><div class="pic"><img src="/storage/no_photo.png"></div>
                 <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
             <div class="brand">Бренд: <span>Knauf</span></div>
             <div class="type">Штукатурки</div>
@@ -156,7 +159,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
         <div class="my_custom_card">
             <div class="new">АКЦИЯ</div>
             <div class="top">Toп</div>
-            <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
+            <a href="#" class="item_link"><div class="pic"><img src="/storage/no_photo.png"></div>
                 <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
             <div class="brand">Бренд: <span>Knauf</span></div>
             <div class="type">Штукатурки</div>
@@ -169,7 +172,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
         <div class="my_custom_card">
             <div class="new">АКЦИЯ</div>
             <div class="top">Toп</div>
-            <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
+            <a href="#" class="item_link"><div class="pic"><img src="/storage/no_photo.png"></div>
                 <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
             <div class="brand">Бренд: <span>Knauf</span></div>
             <div class="type">Штукатурки</div>
@@ -180,6 +183,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
         </div>
     </div> <!-- конец блока - с этим также покупают -->
+    */?>
     <div class="tabs_block"> <!-- Табы с описанием видео и отзывами -->
         <div class="ionTabs" id="tabs_1" data-name="Tabs_Group_name">
             <ul class="ionTabs__head">
@@ -7,11 +7,7 @@ use common\components\artboximage\ArtboxImageHelper;
     <div class="top">Toп</div>-->
     <a href="<?= \yii\helpers\Url::to(['catalog/product', 'product' => $product])?>" class="item_link">
         <div class="pic">
-            <?php if (empty($product->image)) :?>
-                <img src="/images/no_photo.png">
-            <?php else :?>
-                <?= ArtboxImageHelper::getImage($product->image->imageUrl, 'product_list')?>
-            <?php endif?>
+            <?= ArtboxImageHelper::getImage($product->imageUrl, 'product_list')?>
         </div>
         <div class="title_item"><?= $product->name?></div></a>
     <?php if (!empty($product->brand)) :?>
@@ -7,11 +7,7 @@ use common\components\artboximage\ArtboxImageHelper;
     <div class="top">Toп</div>-->
     <a href="<?= \yii\helpers\Url::to(['catalog/product', 'product' => $product])?>" class="item_link">
         <div class="pic">
-            <?php if (empty($product->image)) :?>
-                <img src="/images/no_photo.png">
-            <?php else :?>
-                <?= ArtboxImageHelper::getImage($product->image->imageUrl, 'product_list')?>
-            <?php endif?>
+            <?= ArtboxImageHelper::getImage($product->imageUrl, 'product_list')?>
         </div>
         <div class="title_item"><?= $product->name?></div></a>
     <?php if ($product->brand) :?>
@@ -25,7 +25,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 						<div class="delete_item_btn"><i class="fa fa-times"></i></div>
 						<div class="little_img">
 							<?php if (empty($item['item']->product->image)) :?>
-								<img src="/images/no_photo.png">
+								<img src="/storage/no_photo.png">
 							<?php else :?>
 								<img src="/images/<?= $item['item']->product->image->image?>" alt="<?= $item['item']->product->image->alt ? $item['item']->product->image->alt : $item['item']->product->name?>">
 							<?php endif?>