From f3f8709d60ff2edafb6ef189aeae50829a0b3346 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Fri, 21 Oct 2016 10:58:37 +0300
Subject: [PATCH] big commti

---
 common/modules/product/models/Import.php |  6 ++++++
 common/modules/product/models/Stock.php  |  2 +-
 frontend/views/catalog/_product_item.php |  2 +-
 frontend/views/catalog/product.php       | 13 ++++++++-----
 frontend/views/event/_product_item.php   |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/common/modules/product/models/Import.php b/common/modules/product/models/Import.php
index 791a83f..54b95d2 100755
--- a/common/modules/product/models/Import.php
+++ b/common/modules/product/models/Import.php
@@ -75,6 +75,12 @@ class Import extends Model {
 
         $is_utf = (preg_match('//u', file_get_contents(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'), null, null, null, 1000000)));
 
+
+
+        Stock::updateAll(['stock' => 0 ]);
+        ProductVariant::updateAll(['status' => 0 ]);
+
+
         while (empty($limit) || $j++ < $limit)
         {
 
diff --git a/common/modules/product/models/Stock.php b/common/modules/product/models/Stock.php
index 4fa53c3..b66c505 100755
--- a/common/modules/product/models/Stock.php
+++ b/common/modules/product/models/Stock.php
@@ -50,7 +50,7 @@ class Stock extends \yii\db\ActiveRecord
                 return "МАГАЗИН ГЛУБОЧЕЦКАЯ";
                 break;
             default:
-                return "На складе";
+                //return "На складе";
                 break;
         }
     }
diff --git a/frontend/views/catalog/_product_item.php b/frontend/views/catalog/_product_item.php
index 47db205..f8036da 100755
--- a/frontend/views/catalog/_product_item.php
+++ b/frontend/views/catalog/_product_item.php
@@ -69,7 +69,7 @@ use yii\helpers\Url;
                     <div class="info">
                         <ul class="sv">
 
-                            <li><span>Бренд:</span> <?= $model->brand->name ?></li>
+                            <li><span>Бренд:</span> <?= !empty($model->brand) ? $model->brand->name : '' ?></li>
 
                             <?php foreach($model->getActiveProperties($category->category_id) as $group): ?>
                                 <li><span><?= $group->name ?> <?php foreach($group->_options as $option) : ?>&nbsp;</span><?= $option->ValueRenderHTML ?><?php endforeach ?></li>
diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php
index 6488725..e4ae6f6 100755
--- a/frontend/views/catalog/product.php
+++ b/frontend/views/catalog/product.php
@@ -194,7 +194,7 @@ FlipclockAsset::register($this);
                             <?php if($product->variant->stock > 0){?>
                                 есть в наличии
                             <?php } else {?>
-                                нет в наличии
+                                под заказ
                             <?php }?>
                         </td>
                         <td rowspan="2" class="spacer">&nbsp;</td>
@@ -308,7 +308,7 @@ FlipclockAsset::register($this);
                                     <?php if($product->variant->stock > 0){?>
                                         <a href="#" class="btn btn-large buy_button" data-toggle="modal" data-id="<?php echo $product->variant->product_variant_id; ?>" data-target="#buyForm" lang="5892">Купить</a>
                                     <?php } else {?>
-                                        <a href="#"  style="background-color:dimgrey; background-image:linear-gradient(to bottom, #9d9fa0, #abafb2)" class="btn btn-large btn-default "  data-id="<?php echo $product->variant->product_variant_id; ?>" >Нет в наличии</a>
+                                        <a href="#"  style="background-color:dimgrey; background-image:linear-gradient(to bottom, #9d9fa0, #abafb2)" class="btn btn-large btn-default "  data-id="<?php echo $product->variant->product_variant_id; ?>" >Под заказ</a>
                                     <?php }?>
 
 
@@ -325,9 +325,12 @@ FlipclockAsset::register($this);
                                     </div>
                                     <div class="clearfix"></div>
                                 </div>
-                                <div class="follow_price">
-                                    <a href="#" data-toggle="modal" data-target="#where_buy">где купить?</a>
-                                </div>
+                                <?php if($product->variant->stock > 0){?>
+                                    <div class="follow_price">
+                                        <a href="#" data-toggle="modal" data-target="#where_buy">где купить?</a>
+                                    </div>
+                                <?php } ?>
+
                                 
                                 <div class="follow_price">
                                     <?php
diff --git a/frontend/views/event/_product_item.php b/frontend/views/event/_product_item.php
index dd44862..2d3c0d6 100755
--- a/frontend/views/event/_product_item.php
+++ b/frontend/views/event/_product_item.php
@@ -70,7 +70,7 @@ $category = $model->category;
                     <div class="info">
                         <ul class="sv">
 
-                            <li><span>Бренд:</span> <?= $model->brand->name ?></li>
+                            <li><span>Бренд:</span> <?= !empty($model->brand) ? $model->brand->name : '' ?></li>
 
                             <?php foreach($model->getActiveProperties($category->category_id) as $group): ?>
                                 <li><span><?= $group->name ?> <?php foreach($group->_options as $option) : ?>&nbsp;</span><?= $option->ValueRenderHTML ?><?php endforeach ?></li>
--
libgit2 0.21.4