big commti

Administrator
1 parent 11dbe035
Showing 10 changed files with 23 additions and 23 deletions Show diff stats
common/modules/product/CatalogUrlManager.php
common/modules/product/models/Category.php
common/modules/product/models/Product.php
common/modules/product/models/ProductVariant.php
common/modules/product/models/Stock.php
common/widgets/views/order.php
frontend/models/ProductFrontendSearch.php
frontend/views/catalog/_product_item.php
frontend/views/catalog/product.php
frontend/views/layouts/main.php
@@ -46,7 +46,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                         $link = 'product'.'/'. $product_variant->product->alias;
                         header("Status: 301");
-                        header("Location: http://www.test-22.artweb.com.ua/".$link);
+                        header("Location: http://www.linija-svitla.ua/".$link);
                         die();
                     }
                 }
@@ -60,7 +60,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                         $link = 'product'.'/'. $product_variant->product->alias;
                         header("Status: 301");
-                        header("Location: http://www.test-22.artweb.com.ua/".$link);
+                        header("Location: http://www.linija-svitla.ua/".$link);
                         die();
                     }
                 }
@@ -73,7 +73,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                         $link = 'product'.'/'. $product_variant->product->alias;
                         header("Status: 301");
-                        header("Location: http://www.test-22.artweb.com.ua/".$link);
+                        header("Location: http://www.linija-svitla.ua/".$link);
                         die();
                     }
                     $sku = $old_item_name[$count-2].'/'.$old_item_name[$count-1].' '.$old_item_name[$count];
@@ -82,7 +82,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                     if($product_variant instanceof ProductVariant){
                         $link = 'product'.'/'. $product_variant->product->alias;
                         header("Status: 301");
-                        header("Location: http://www.test-22.artweb.com.ua/".$link);
+                        header("Location: http://www.linija-svitla.ua/".$link);
                         die();
                     }
@@ -92,7 +92,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                     if($product_variant instanceof ProductVariant){
                         $link = 'product'.'/'. $product_variant->product->alias;
                         header("Status: 301");
-                        header("Location: http://www.test-22.artweb.com.ua/".$link);
+                        header("Location: http://www.linija-svitla.ua/".$link);
                         die();
                     }
@@ -102,7 +102,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                     if($product_variant instanceof ProductVariant){
                         $link = 'product'.'/'. $product_variant->product->alias;
                         header("Status: 301");
-                        header("Location: http://www.test-22.artweb.com.ua/".$link);
+                        header("Location: http://www.linija-svitla.ua/".$link);
                         die();
                     }
@@ -115,7 +115,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                         $link = 'product'.'/'. $product_variant->product->alias;
                         header("Status: 301");
-                        header("Location: http://www.test-22.artweb.com.ua/".$link);
+                        header("Location: http://www.linija-svitla.ua/".$link);
                         die();
                     }
                 }
@@ -127,7 +127,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                         $link = 'product'.'/'. $product_variant->product->alias;
                         header("Status: 301");
-                        header("Location: http://www.test-22.artweb.com.ua/".$link);
+                        header("Location: http://www.linija-svitla.ua/".$link);
                         die();
                     }
                 }
@@ -241,7 +241,7 @@ class Category extends \yii\db\ActiveRecord
                 ->innerJoin('tax_group','tax_group.tax_group_id = tax_option.tax_group_id')
                 ->orderBy('tax_option.sort, tax_group.sort');
             return $query3->all();
-        }, 3600*24);
+        }, 3600);
     }
@@ -153,7 +153,8 @@ class Product extends \yii\db\ActiveRecord
      */
     public function getImageUrl()
     {
-        $image = empty($this->variant) ? null : $this->variant->image;
+
+        $image = !empty($this->image) ? $this->image : $this->variant->image;
         return !empty($image) ? $image->imageUrl : '/storage/no_photo.png';
     }
@@ -137,10 +137,6 @@ class ProductVariant extends \yii\db\ActiveRecord
         return $this->hasMany(ProductStock::className(),['product_variant_id'=> 'product_variant_id'])->joinWith('stock');
     }
-    public function getVariantActiveStocks(){
-
-        return $this->hasMany(ProductStock::className(),['product_variant_id'=> 'product_variant_id'])->where(['quantity' > 0])->joinWith('stock');
-    }
     public function getStocks(){
@@ -68,7 +68,6 @@ class Stock extends \yii\db\ActiveRecord
             'name' => Yii::t('product', 'Name'),
         ];
     }
-
     /**
      * @inheritdoc
      * @return StockQuery the active query used by this AR class.
@@ -107,7 +107,7 @@
         </tr>
     </table>
     <div style="padding: 40px;">
-        <center><img src="http://www.test-22.artweb.com.ua/images/new_img/new_logo.png"></center>
+        <center><img src="http://www.linija-svitla.ua/images/new_img/new_logo.png"></center>
         <table cellpadding="0" cellspacing="0" border="0" valign="top" style="
               width: 100%; margin: 20px 0;">
@@ -49,6 +49,7 @@ class ProductFrontendSearch extends Product {
      */
     public function search($category = null, $params = [], $in_stock = true) {
+
         $dataProvider = new ArrayDataProvider([
             'allModels' => $this->getSearchQuery($category, $params, $in_stock)->with([
                 'images',
@@ -89,13 +90,16 @@ class ProductFrontendSearch extends Product {
     }
     public function getSearchQuery($category = null, $params = [], $in_stock = true) {
+
         if (!empty($category)) {
             /** @var ActiveQuery $query */
             /**@var Category $category **/
             $query = $category->getProducts();
+
         } else {
             $query = Product::find();
         }
+
         $query->select(['product.*']);
         $query->joinWith(['enabledVariants','brand','options', 'category']);
@@ -34,8 +34,7 @@ use yii\helpers\Url;
                             ?>
                     </div>
-
-                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($model->variant->imageUrl, 'list', [
+                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list', [
                         'alt'   => $model->category->name . ' ' . $model->name,
                         'title' => $model->category->name . ' ' . $model->name,
                         'class' => 'selected'
@@ -657,8 +657,10 @@
                 <br/>
                 <div class="shopsList">
                     <ul>
-                        <?php foreach($product->variant->activeStock as $stock){?>
-                            <li><?= Html::a($stock->siteName, Url::to (['text/main', 'translit' => 'magaziny', '#'=>$stock->stock_id])) ?></li>
+                        <?php foreach($product->variant->variantStocks as $stock){
+                            if($stock->quantity > 0 ){?>
+                            <li><?= Html::a($stock->stock->siteName, Url::to (['text/main', 'translit' => 'magaziny', '#'=>$stock->stock->stock_id])) ?></li>
+                                <?php } ?>
                         <?php } ?>
                     </ul>
@@ -58,19 +58,18 @@ use common\models\Event;
             ga('send', 'pageview');
         </script>
-
     <!-- Google Tag Manager -->
     <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
             new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
             j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
             'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-        })(window,document,'script','dataLayer','GTM-MWB6PH');</script>
+        })(window,document,'script','dataLayer','GTM-NMXP4K');</script>
     <!-- End Google Tag Manager -->
     </head>
 <?php $this->beginBody() ?>
     <body>
     <!-- Google Tag Manager (noscript) -->
-    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-MWB6PH"
+    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NMXP4K"
                       height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     <!-- End Google Tag Manager (noscript) -->