-

Karnovsky A
1 parent 1e55b4b8
Showing 9 changed files with 50 additions and 56 deletions Show diff stats
common/modules/product/helpers/ProductHelper.php
common/modules/product/models/Category.php
common/modules/product/models/Product.php
console/controllers/ImportController.php
frontend/controllers/CatalogController.php
frontend/models/ProductFrontendSearch.php
frontend/views/catalog/product.php
frontend/views/catalog/product_item.php
frontend/views/site/index.php
@@ -5,6 +5,7 @@ namespace common\modules\product\helpers;
 use common\modules\product\models\Brand;
 use common\modules\product\models\Category;
 use common\modules\product\models\Product;
+use common\modules\product\models\ProductVariant;
 use yii\base\Object;
 use Yii;
  
@@ -69,7 +70,8 @@ class ProductHelper extends Object {
     public static function getLastProducts($as_object = false) {
         $last_products = Yii::$app->session->get('last_products', []);
         if ($as_object) {
-            $last_products = array_reverse(Product::find()->where(['product_id' => $last_products])->all());
+            $last_products = array_reverse(Product::find()->where([Product::tableName() .'.product_id' => $last_products])->all());
+//            $last_products = array_reverse(Product::find()->joinWith('variants')->where([Product::tableName() .'.product_id' => $last_products])->andWhere(['!=', ProductVariant::tableName() .'.stock', 0])->all());
         }
         return $last_products;
     }
@@ -86,6 +88,6 @@ class ProductHelper extends Object {
                 $data = ['akciya' => true];
                 break;
         }
-        return Product::find()->where($data)->limit($count)/*->orderBy($sort)*/->all();
+        return Product::find()->joinWith('variants')->where($data)->andWhere(['!=', ProductVariant::tableName() .'.stock', 0])->limit($count)/*->orderBy($sort)*/->all();
     }
 }
 \ No newline at end of file
@@ -134,8 +134,11 @@ class Category extends \yii\db\ActiveRecord
     }
  
     public function getProducts() {
-//        return $this->hasMany(Product::className(), ['product_id' => 'product_id'])->viaTable('product_category', ['category_id' => 'category_id']);
-        return $this->getRelations('product_categories');
+        return $this->hasMany(Product::className(), ['product_id' => 'product_id'])
+            ->viaTable('product_category', ['category_id' => 'category_id'])
+            ->with(['variants'])
+            ->andOnCondition(['!=', ProductVariant::tableName() .'.stock', 0]);
+//        return $this->getRelations('product_categories');
     }
  
     /**
@@ -144,14 +144,24 @@ class Product extends \yii\db\ActiveRecord
      */
     public function getVariant()
     {
-//        return ProductVariant::find()->filterWhere([ProductVariant::tableName() .'.product_id' => Product::tableName() .'.product_id'])->where('>', ProductVariant::tableName() .'.stock', 0);
         return $this->hasOne(ProductVariant::className(), ['product_id' => 'product_id']);
     }
  
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getEnabledVariant()
+    {
+        return $this->hasOne(ProductVariant::className(), ['product_id' => 'product_id'])->andOnCondition(['!=', ProductVariant::tableName() .'.stock', 0]);
+    }
     public function getVariantPrice() {
         return $this->variant->price;
     }
  
+    public function getEnabledVariantPrice() {
+        return $this->enabledVariant->price;
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -162,14 +172,7 @@ class Product extends \yii\db\ActiveRecord
  
     public function getEnabledVariants()
     {
-        /*$result = [];
-        foreach ($this->variants as $variant) {
-            if (is_null($variant->stock) || $variant->stock > 0) {
-                $result[] = $variant;
-            }
-        }
-        return $result;*/
-        return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->where(['!=', ProductVariant::tableName() .'.stock', 0]);
+        return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->andOnCondition(['!=', ProductVariant::tableName() .'.stock', 0]);
     }
  
     public function setVariants($variants) {
@@ -416,7 +416,7 @@ class ImportController extends Controller {
  
         while (($data = fgetcsv ($handle, 10000, ";")) !== FALSE) {
             $j++;
-//            if ($j > 10) {
+//            if ($j > 1) {
 //                return TRUE;
 //            }
  
@@ -429,14 +429,20 @@ class ImportController extends Controller {
  
             // данные строк
             $modification_code = @$data[0];
-            $price             = floatval(@$data[1]);
-            $price_promo       = floatval(@$data[2]);
+            $_price             = floatval(@$data[1]);
+            $_price_promo       = floatval(@$data[2]);
             $count             = intval(@$data[3]);
             $city_name         = @$data[4];
             $product_title     = @$data[5];
  
+            // @todo refactory this code
+            $price = $_price_promo > 0 ? $_price_promo : $_price;
+            $price_promo = $_price_promo > 0 ? $_price : $_price_promo;
+
+            $modification_code = trim($modification_code);
+
             if (empty ($modification_code)) {
-                CONTINUE;
+                continue;
             }
             // товары в пути
             if (empty ($city_name))
@@ -446,28 +452,28 @@ class ImportController extends Controller {
                     Yii::getAlias('@uploadFilePricesAway')
                 );
  
-//                $this->stdout("Товар $product_title в пути\n");
+                $this->stdout("~ Товар $product_title в пути\n");
  
-                CONTINUE;
+                continue;
             }
  
-            if ( ($productVariant = ProductVariant::find()->filterWhere(['ilike', 'sku', trim($modification_code)])->one()) === null ) {
+            if ( ($productVariant = ProductVariant::find()->filterWhere(['sku' => $modification_code])->one()) === null ) {
                 // 'Нет даной модификации в базе';
                 $this->saveNotFoundRecord (
                     [$modification_code, $product_title],
                     Yii::getAlias('@uploadFilePricesNoVariant')
                 );
  
-//                $this->stdout("Для товара $product_title (#$modification_code) не найдено соотвествия\n");
+                $this->stdout("- Для товара $product_title (#$modification_code) не найдено соотвествия\n");
  
-                CONTINUE;
+                continue;
             }
  
             $quantity = 0;
  
             // ===== Set stock ====
             if ( $city_name ) {
-                if ( ($stock = Stock::find()->filterWhere(['ilike', 'name', trim($city_name)])->one()) === null ) {
+                if ( ($stock = Stock::find()->filterWhere(['name' => trim($city_name)])->one()) === null ) {
                     // Create stock
                     $stock = new Stock();
                     $stock->name = trim($city_name);
@@ -484,7 +490,7 @@ class ImportController extends Controller {
  
             $productVariant->save();
  
-//            $this->stdout("Товар $product_title успешно сохранен\n");
+            $this->stdout("+ Товар $product_title успешно сохранен\n");
         }
         fclose ($handle);
  
@@ -108,20 +108,6 @@ class CatalogController extends \yii\web\Controller
  
             if ( !empty($filter['options']) ) {
                 $params['options'] = $filter['options'];
-                /*$optionQuery = TaxOption::find();
-                $optionQuery->select('tax_option_id');
-                $optionQuery->innerJoinWith('group');
-                foreach ($filter['options'] as $option_key => $option_values) {
-                    $optionQuery->orWhere([
-                        'tax_group_id' => $option_key,
-                        'alias' => $filter['options']
-                        ]);
-                }
-                $options = ->where(['in', 'alias', $filter['options']])->all();
-                $params['options'] = [];
-                foreach ($options as $option) {
-                    $params['options'][] = $option->tax_option_id;
-                }*/
             }
  
             if ( !empty($filter['prices']) ) {
@@ -54,14 +54,10 @@ class ProductFrontendSearch extends Product {
         } else {
             $query = Product::find();
         }
-        $query->joinWith(['variant', 'brand', 'brand.brandName', 'category', 'category.categoryName']);
+        $query->joinWith(['variant', 'image', 'brand', 'brand.brandName', 'category', 'category.categoryName']);
  
         $query->groupBy('product.product_id');
  
-//        if (empty($_GET['sort']) || ($_GET['sort'] != 'price' && $_GET['sort'] != '-price')) {
-//            $query->groupBy('product.product_id');
-//        }
-
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
             'pagination' => [
@@ -13,7 +13,7 @@ $this-&gt;title = $product-&gt;fullname;
 //}
 $this->params['breadcrumbs'][] = ['label' => 'Каталог', 'url' => ['catalog/category']];
 $this->params['breadcrumbs'][] = ['label' => $product->category->categoryName->value, 'url' => ['catalog/category', 'category' => $product->category]];
-$this->params['breadcrumbs'][] = $product->fullname .' #'. $product->variant->sku;
+$this->params['breadcrumbs'][] = $product->fullname .' #'. $product->enabledVariant->sku;
  
 $this->registerJs ('
  
@@ -96,8 +96,7 @@ $this-&gt;registerJs (&quot;
         <h1><?= $product->fullname ?></h1>
         <div class="begin">Цветовые решения</div>
         <ul class="product_mod">
-            <?php foreach ($product->variants as $variant): ?>
-                <?php if ($variant->quantity == 0) continue;?>
+            <?php foreach ($product->enabledVariants as $variant): ?>
                 <li>
                     <a id='m<?= $variant->product_variant_id ?>' href="#<?=$variant->product_variant_id ?>"
                        data-cost="<?= $variant->price ?>"
@@ -166,7 +165,7 @@ $this-&gt;registerJs (&quot;
     <div class="content">
         <div class="pic">
             <center>
-                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->variant->imageUrl, 'product_view',['id'=>'pic'])?></a>
+                <a href="#" rel="shadowbox[gal]" id="picoriginal"><?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariant->imageUrl, 'product_view',['id'=>'pic'])?></a>
             </center>
         </div>
         <ul class="product_colors">
@@ -5,8 +5,8 @@ use yii\helpers\Url;
 <li class="item">
     <div class="boxitem">
         <div class="pixbox">
-            <a href="<?= Url::to(['catalog/product', 'product' => $product,'#' => 'm' .$product->variant->product_variant_id]) ?>">
-                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->variant->imageUrl, 'list')?>
+            <a href="<?= Url::to(['catalog/product', 'product' => $product,'#' => 'm' .$product->enabledVariant->product_variant_id]) ?>">
+                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->enabledVariant->imageUrl, 'list')?>
             </a>
         </div>
         <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
@@ -25,7 +25,7 @@ use yii\helpers\Url;
         <a href="<?= Url::to([
             'catalog/product',
             'product' => $product,
-            '#' => 'm' .$product->variant->product_variant_id])
+            '#' => 'm' .$product->enabledVariant->product_variant_id])
         ?>"
            class="name"><?= $product->fullname ?>
         </a>
@@ -35,12 +35,12 @@ use yii\helpers\Url;
         echo '<div class="cost-block">';
         echo '<p class="cost">';
         // есть скидка
-        if ($product->variant->price_old != 0 && $product->variant->price_old != $product->variant->price)
+        if ($product->enabledVariant->price_old != 0 && $product->enabledVariant->price_old != $product->enabledVariant->price)
         {
-            echo '<strike><span id=\'old_cost\'>'.$product->variant->price_old.'</span> грн.</strike>&nbsp;';
+            echo '<strike><span id=\'old_cost\'>'.$product->enabledVariant->price_old.'</span> грн.</strike>&nbsp;';
         }
  
-        echo $product->variant->price.' <span>грн.</span></p>';
+        echo $product->enabledVariant->price.' <span>грн.</span></p>';
  
         echo '</div>';
  
@@ -49,13 +49,12 @@ use yii\helpers\Url;
     <a href="<?= Url::to([
         'catalog/product',
         'product' => $product,
-        '#' => 'm' .$product->variant->product_variant_id])
+        '#' => 'm' .$product->enabledVariant->product_variant_id])
     ?>" class="link_buy">Купить</a>
  
     <div class="mycarousel">
         <ul class="jcarousel jcarousel-skin-tango">
             <?php foreach ($product->enabledVariants as $variant) : ?>
-                <?php if ($variant->quantity == 0) continue;?>
                 <?php if (!empty($variant->image)) :?>
                 <li>
                     <a href="<?= Url::to([
@@ -30,7 +30,7 @@ echo &#39;&lt;div class=&quot;home_banner_up&quot;&gt;&#39;;
 echo '</div>'
 ?>
  
-<?= \frontend\widgets\Rubrics::widget(['wrapper' => 'rubrics', 'includes' => [136,137,138,139,140]])?>
+<?= \frontend\widgets\Rubrics::widget(['wrapper' => 'rubrics', 'includes' => [130,131,132,133,134]])?>
  
 <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'promo'])?>
 <?= \common\modules\product\widgets\specialProducts::widget(['type' => 'new'])?>