Merge remote-tracking branch 'origin/master'

Timur Kastemirov
2 parents da44d1f0 c89c8efd
Showing 7 changed files with 58 additions and 17 deletions Show diff stats
common/config/main.php
common/modules/product/models/Import.php
frontend/models/ProductFrontendSearch.php
frontend/views/catalog/_product_item.php
frontend/views/layouts/main.php
frontend/web/css/css_header.css
frontend/web/images/trio-min.png
@@ -9,7 +9,7 @@ return [
     ],
     'components' => [
         'cache' => [
-            'class' => 'yii\caching\MemCache',
+            'class' => 'yii\caching\DummyCache',
             'keyPrefix' => 'linija_'
         ],
         'sms' => [
@@ -106,7 +106,7 @@
             if ($from == 0) {
                 ProductStock::updateAll([ 'quantity' => 0 ]);
-                ProductVariant::updateAll([ 'status' => 1 ]);
+                ProductVariant::updateAll([ 'status' => 1 ], 'status != 2');
             }
             while (empty( $limit ) || $j++ < $limit) {
@@ -164,7 +164,9 @@
                 // ===== Set stock ====
                 if (!$city_name) {
                     if (!$count) {
-                        $productVariant->status = 0;
+                        if ($productVariant->status !== 2) {
+                            $productVariant->status = 0;
+                        }
                         if ($price_promo) {
                             $productVariant->price_old = $price;
                             $productVariant->price = $price_promo;
@@ -227,7 +229,9 @@
                 }
                 $productVariant->stock = $quantity;
-                $productVariant->status = 0;
+                if ($productVariant->status !== 2) {
+                    $productVariant->status = 0;
+                }
                 $productVariant->save();
                 $this->output[] = '<font style="color:blue">Товар ' . $product_title . ' успешно сохранен</font>';
@@ -115,10 +115,13 @@
             );
             //        $query->groupBy(['product.product_id', 'product_variant.price', 'product_variant.stock']);
-            $query->orderBy([
-                'brand.sort' => SORT_ASC,
-                'product_variant.stock' => SORT_DESC,
-                            ]);
+            $query->orderBy(
+                [
+                    'brand.sort'            => SORT_ASC,
+                    'product_variant.price' => SORT_ASC,
+                    'product_variant.stock' => SORT_DESC,
+                ]
+            );
             ProductHelper::_setQueryParams($query, $params);
             if ($in_stock) {
                 $query->andWhere(
@@ -143,7 +146,8 @@
                                                                    ->innerJoin(
                                                                        'event',
                                                                        'event.event_id=events_to_products.event_id'
-                                                                   )->where(['event.sale' => true]),
+                                                                   )
+                                                                   ->where([ 'event.sale' => true ]),
                         ],
                     ]
                 );
@@ -94,13 +94,15 @@ use yii\helpers\Url;
             <div class="additional_info params">
                 <div class="block_title">Особенности
                     <span style="float: right;font-weight: normal;color: #390;font-size: 13px;">
-                         <?php if($model->variant->status == 1){?>
-                             снят с производства
-                         <?php } elseif($model->variant->stock > 0) {?>
-                             в наличии
-                         <?php } else {?>
-                             под заказ
-                         <?php } ?>
+                        <?php if($model->variant->status == 1){?>
+                          снят с производства
+                        <?php } elseif($model->variant->status == 2) {?>
+                          в ожидании
+                        <?php } elseif($model->variant->stock > 0) {?>
+                          в наличии
+                        <?php } else {?>
+                          под заказ
+                        <?php } ?>
                     </span>
                 </div>
                 <div class="descr">
@@ -474,6 +474,7 @@
             </footer>
             <div class="btn-fixeds fixed-events"><a href="/event/main">акции</a></div>
+            <div class="btn-fixeds fixed-events btns_trio-link"><a href="/catalog/lyustry-i-potolochnoe-osveshchenie">Новинка<b></b></a></div>
             <!--<div class="btn-fixeds fixed-sale"><a href="/event">Распродажа</a></div>-->
             <table border="0" cellspacing="0" cellpadding="0" class="reqsBox"></table>
@@ -8255,6 +8255,26 @@ footer .content-title {
     color: #01974a
 }
+.btn-fixeds.btns_trio-link {
+    right: auto;
+    left: 40px;
+}
+.btn-fixeds.btns_trio-link a {
+    text-align: left;
+    padding-left: 20px;
+}
+.btn-fixeds.btns_trio-link a b {
+    background: url(../images/trio-min.png) 0 50% no-repeat;
+    width: 32px;
+    height: 41px;
+    position: absolute;
+    top: 0;
+    right: 20px;
+}
+
+
+
+
 .brbeadcrumbs-wr {
     height: 83px;
     line-height: 83px
@@ -13250,7 +13270,17 @@ h1.title {
     .fixed-events {
         transform: rotate(-90deg);
         -webkit-transform: rotate(-90deg);
-        right: -53px
+        right: -53px;
+    }
+
+    .btn-fixeds.btns_trio-link {
+        transform: rotate(90deg);
+        -webkit-transform: rotate(90deg);
+        left: -53px;
+    }
+    .btn-fixeds.btns_trio-link a{
+        transform: rotate(180deg);
+        -webkit-transform: rotate(180deg);
     }
     .fixed-sale {