Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 04eb9f67 e261c537
Showing 4 changed files with 38 additions and 25 deletions Show diff stats
frontend/controllers/CatalogController.php
frontend/views/catalog/_product_item.php
frontend/views/catalog/product.php
frontend/views/catalog/products.php
@@ -24,8 +24,8 @@ class CatalogController extends \yii\web\Controller
     public function actionCategory()
     {
-
-
+    
+        
         /** @var Category $category */
         $category = Yii::$app->request->get('category');
         $filter = Yii::$app->request->get('filters', [ ]);
@@ -151,7 +151,7 @@ class CatalogController extends \yii\web\Controller
         $priceLimits = $productModel->priceLimits($category, $params);
-
+    
         return $this->render('products', [
             'category'        => $category,
@@ -38,12 +38,23 @@ use yii\helpers\Url;
                             ?>
                     </div>
-                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list', [
-                        'alt'   => $model->getFullName(),
-                        'title' => $model->getFullName(),
-                        'class' => 'selected',
-                        'itemprop' => 'image'
-                    ]) ?>
+                    <?php
+                      try {
+                          echo \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list', [
+                              'alt'   => $model->getFullName(),
+                              'title' => $model->getFullName(),
+                              'class' => 'selected',
+                              'itemprop' => 'image'
+                          ]);
+                      } catch(Exception $exception) {
+                          echo \common\components\artboximage\ArtboxImageHelper::getImage('/storage/no_photo.png', 'list', [
+                              'alt'   => $model->getFullName(),
+                              'title' => $model->getFullName(),
+                              'class' => 'selected',
+                              'itemprop' => 'image'
+                          ]);
+                      }
+                    ?>
                 </a>
                 <div class="info_icons">
                     <?php if($model->variant->status != 1){?>
@@ -44,8 +44,8 @@
     $this->params['remarketing']['type'] = 'offerdetail';
     $this->params['remarketing']['id'] = $product->variant->product_variant_id;
     $this->params['remarketing']['price'] = $product->getPrice();
+    
 ?>
-
 <div class="wrapper white item_container">
     <div class="container">
         <div class="product_detail" itemscope itemtype="http://schema.org/Product">
@@ -60,7 +60,6 @@
             <div class="product_code">Код:<?= $product->variant->sku ?></div>
             <div class="clearfix"></div>
             <!-- Image part -->
-            
             <div class="img_part">
                 <div class="position">
@@ -69,7 +68,6 @@
                             <div class="fotorama" data-allowfullscreen="true" data-nav="thumbs"
                                  data-width="342"
                                  data-height="350">
-
                                 <?php foreach($product->images as $image) : ?>
                                     <a href="<?= $image->imageUrl ?>">
                                         <?= ArtboxImageHelper::getImage($image->imageUrl, 'product_show') ?>
@@ -78,11 +76,21 @@
                             </div>
                         <?php else : ?>
                             <a href="<?= $product->imageUrl ?>" data-lightbox="image-1" data-title="<?= $product->fullname;?>">
-                                <?= ArtboxImageHelper::getImage($product->imageUrl, 'product_show',[
-                                    'alt'=>$product->fullname,
-                                    'title' => $product->fullname,
-                                    'itemprop' => 'image'
-                                ]) ?>
+                                <?php
+                                    try {
+                                        echo ArtboxImageHelper::getImage($product->imageUrl, 'product_show',[
+                                            'alt'=>$product->fullname,
+                                            'title' => $product->fullname,
+                                            'itemprop' => 'image'
+                                        ]);
+                                    } catch(Exception $exception) {
+                                        echo ArtboxImageHelper::getImage('/storage/no_photo.png', 'product_show',[
+                                            'alt'=>$product->fullname,
+                                            'title' => $product->fullname,
+                                            'itemprop' => 'image'
+                                        ]);
+                                    }
+                                ?>
                                 </a>
                         <?php endif ?>
@@ -60,7 +60,6 @@
                         'priceLimits' => $priceLimits,
                         //'filterBrands' => $filterBrands
                     ])?>
-
                     <div class="clearfix"></div>
@@ -102,6 +101,7 @@
                             ]);
                             ?>
                         </div>
+                      
                         <div class="clearfix"></div>
                     </div>
@@ -117,14 +117,12 @@
                     <div class="catalog_product_list view_table">
-
-
                         <?= ListView::widget([
                             'dataProvider' => $productProvider,
                             'itemView' => function ($model, $key, $index, $widget) use($category) {
                                 return $this->render('_product_item',[
                                     'model' => $model,
-                                    'category' => $category
+                                    'category' => $category,
                                 ]);
                             },
                             'layout' => "{items}<div class=\"clearfix\"></div>{pager}",
@@ -132,9 +130,6 @@
                         ?>
-
-
-
                         <div class="clearfix"></div>
                     </div>
@@ -142,4 +137,3 @@
             </div>
 <?php Pjax::end()?>
-