Merge remote-tracking branch 'origin/master'

Yarik
2 parents 8467c8d3 cf039359
Showing 11 changed files with 46 additions and 31 deletions Show diff stats
common/config/main.php
common/modules/product/models/Import.php
common/modules/product/widgets/views/product_smart.php
common/modules/product/widgets/views/product_smart_similar.php
frontend/controllers/AjaxController.php
frontend/controllers/SiteController.php
frontend/views/catalog/_product_item.php
frontend/views/catalog/product.php
frontend/views/catalog/products.php
frontend/web/css/css_header.css
frontend/widgets/Seo.php
@@ -9,7 +9,7 @@ return [
     ],
     'components' => [
         'cache' => [
-            'class' => 'yii\caching\DummyCache',
+            'class' => 'yii\caching\MemCache',
             'keyPrefix' => 'linija_'
         ],
         'sms' => [
@@ -164,6 +164,15 @@
                 // ===== Set stock ====
                 if (!$city_name) {
                     if (!$count) {
+                        $productVariant->status = 0;
+                        if ($price_promo) {
+                            $productVariant->price_old = $price;
+                            $productVariant->price = $price_promo;
+                        } else {
+                            $productVariant->price = $price;
+                            $productVariant->price_old = $price_promo;
+                        }
+                        $productVariant->save(false, ['status', 'price', 'price_promo']);
                         continue;
                     }
                     $city_name = 'Склад';
@@ -43,9 +43,13 @@
                                    'product' => $product->alias
                                ]) ?>" title="<?= $product->fullname . ' ' . $product->category->name ?>">
  
-              <p><span><?= $product->name ?></span></p>
-<!--              <p><span>--><?//= $product->fullname ?><!--</span></p>-->
-<!--            <p><span>--><?//= $product->category->name ?><!--</span></p>-->
+              <p><span><?= $product->fullName ?></span></p>
+            <?php
+                /*
+              <p><span><?= $product->fullname ?></span></p>
+            <p><span><?= $product->category->name ?></span></p>
+             */
+            ?>
           </a>
  
         </div>
@@ -36,8 +36,8 @@
                 $product->imageUrl,
                 'list',
                 [
-                    'alt'      => $product->name,
-                    'title'    => $product->name,
+                    'alt'      => $product->getFullName(),
+                    'title'    => $product->getFullName(),
                     'class'    => 'selected',
                     'itemprop' => 'image',
                 ]
@@ -50,9 +50,9 @@
             <a href="<?= Url::to([
                 'catalog/product',
                 'product' => $product->alias
-            ]) ?>" title="<?= $product->fullname . ' ' . $product->category->name ?>">
+            ]) ?>" title="<?= $product->fullname ?>">
 <!--                <p><span>--><?php //echo $product->category->name ?><!--</span></p>-->
-                <p><span><?= $product->name ?></span></p>
+                <p><span><?= $product->fullName ?></span></p>
  
             </a>
  
@@ -93,8 +93,8 @@ class AjaxController extends Controller
         $query->select(['product.*']);
         $query->joinWith(['enabledVariants','brand','options', 'category']);
  
-//        $query->groupBy(['product.product_id', 'product_variant.price']);
-
+        $query->groupBy(['product.product_id', 'product_variant.price']);
+        
         ProductHelper::_setQueryParams($query, $params);
  
         $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]);
@@ -263,7 +263,10 @@ class SiteController extends Controller
  
             foreach ($products as $product)
             {
-
+                /**
+                 * Fix for emty brands 14.03.2017
+                 */
+                if (empty($product->brand)) continue;
  
                 print "<item>";
                 print "<id>" . htmlspecialchars($product->variant->product_variant_id) . "</id>";
@@ -39,8 +39,8 @@ use yii\helpers\Url;
  
                     </div>
                     <?= \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list', [
-                        'alt'   => $model->category->name . ' ' . $model->name,
-                        'title' => $model->category->name . ' ' . $model->name,
+                        'alt'   => $model->getFullName(),
+                        'title' => $model->getFullName(),
                         'class' => 'selected',
                         'itemprop' => 'image'
                     ]) ?>
@@ -25,8 +25,9 @@
     $this->params[ 'seo' ][ Seo::TITLE ] = $product->fullname .' купить в Киеве, Украине недорого  - Лінія Світла';
     $this->params[ 'seo' ][ 'fields' ][ 'name' ] = $product->fullname;
     $this->params[ 'seo' ][ 'h1' ] =  $product->fullname;
-
-
+    $this->params[ 'seo' ][ 'key' ] =  $product->category->name;
+    
+    
     $this->params[ 'breadcrumbs' ][] = [
         'label' => $category->name,
         'url'   => [
@@ -73,8 +74,8 @@
                         <?php else : ?>
                             <a href="<?= $product->imageUrl ?>" data-lightbox="image-1" data-title="<?= $product->fullname;?>">
                                 <?= ArtboxImageHelper::getImage($product->imageUrl, 'product_show',[
-                                    'alt'=>$product->fullname." фото 1" ,
-                                    'title' => $product->fullname." фото 1",
+                                    'alt'=>$product->fullname,
+                                    'title' => $product->fullname,
                                     'itemprop' => 'image'
                                 ]) ?>
                                 </a>
@@ -514,7 +515,7 @@
                                             <td class="value">
                                                 <?php
                                                     foreach($group->_options as $option) {
-                                                      if ($group->is_filter) {
+                                                      if ($group->is_filter && preg_match("/^.*(назначение|подразделы|стиль|тип\sисточника|тип\sнастенного|тип\sпотолочного|вид|тип\sлампочки|тип\sуличного|тип\sточечного).*$/iu", $group->name)) {
                                                         echo Html::a('&nbsp;' . $option->ValueRenderHTML,
                                                                      [
                                                                          'catalog/category',
@@ -81,7 +81,7 @@
  
 					<!----------------- Banner ventolux ------------------->
 					<div style="width: 95%; overflow: hidden; margin-top: 10px;" >
-						<a href="http://ventolux.ua/" target="_blank"><img style="width: 100%;" src="/storage/banner/ventolux1.jpg" alt="ventolux" /></a>
+						<a rel="nofollow" href="http://ventolux.ua/" target="_blank"><img style="width: 100%;" src="/storage/banner/ventolux1.jpg" alt="ventolux" /></a>
 					</div>
  
                 </div>
@@ -20398,7 +20398,7 @@ vertical-align: top
  
 .sub-cat_ ul li {
 border: 0!important;
-height: 180px!important;
+height: 188px!important;
 position: relative;
 margin-top: 20px!important
 }
@@ -20455,7 +20455,7 @@ color: #0f6fc7;
 font-size: 14px;
 line-height: normal;
 text-align: center;
-height: 34px;
+height: 66px;
 overflow: hidden;
 margin-top: 10px
 }
@@ -293,24 +293,22 @@ class Seo extends Widget
  
         $widgetData = static::findSeoByUrl($this->url);
  
+        $seoDynamicData = $this->findSeoByDynamic();
+        
         if ($widgetData instanceof \common\models\Seo) {
  
             $result = $widgetData->$param;
-
+            
+        } else if ($seoDynamicData instanceof SeoDynamic) {
+            
+            $result = $seoDynamicData->$param;
+    
         } else if (!empty($this->$param)) {
  
             $result = $this->$param;
  
         } else {
-
-            $widgetData = $this->findSeoByDynamic();
-
-            if ($widgetData instanceof SeoDynamic) {
-
-                $result = $widgetData->$param;
-
-            }
-
+            $result = '';
         }
  
         return $this->replaceData($result);