29.06.16

Administrator
1 parent 103e8126
Showing 12 changed files with 146 additions and 149 deletions Show diff stats
common/modules/product/CatalogUrlManager.php
common/modules/product/controllers/VariantController.php
common/modules/product/models/ProductVariant.php
common/translation/ru/product.php
frontend/config/main.php
frontend/controllers/CatalogController.php
frontend/controllers/SearchController.php
frontend/views/catalog/_catalog_box.php
frontend/views/catalog/products.php
frontend/views/layouts/main.php
frontend/views/catalog/search.php → frontend/views/search/index.php
frontend/widgets/Seo.php
@@ -47,9 +47,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                 // Filter
                 if (strpos($paths[2], 'filter:') === 0) {
                     $this->parseFilter($paths[2], $params);
-                }/* elseif (strpos($paths[2], 'word:') === 0) {
-                    $params['word'] = substr($paths[2], 5);
-                }*/
+                }
                 else {
                     throw new HttpException(404 ,'Page not found');
                 }
@@ -106,15 +104,6 @@ class CatalogUrlManager implements UrlRuleInterface {
                 } else {
                     $url = 'catalog/';
                 }
-                /*if (!empty($params['word'])) {
-                    if (!is_array($params['word'])) {
-                        $params['word'] = [$params['word']];
-                    }
-                    $url .= 'word:'. implode(';', $params['word']);
-                }
-                if (isset($params['word'])) {
-                    unset($params['word']);
-                }*/
                 $this->setFilterUrl($params, $url);
@@ -157,11 +157,14 @@ class VariantController extends Controller
                         $stock->name = $ProductStock['name'];
                         $stock->save();
                     }
+
                     $psModel = ProductStock::find()->where(['product_variant_id'=>$model->product_variant_id, 'stock_id' =>$stock->stock_id ]);
                     if(!$psModel instanceof ProductStock){
                         $psModel = new ProductStock;
                         $psModel->load(['ProductStock'=>$ProductStock]);
                         $psModel->stock_id = $stock->stock_id;
+                        $psModel->product_variant_id = $model->product_variant_id;
+                        $psModel->product_id = $model->product->product_id;
                         $psModel->save();
                     } else {
                         $psModel->load(['ProductStock'=>$ProductStock]);
@@ -171,26 +174,13 @@ class VariantController extends Controller
                 }
+
             }
             return $this->redirect(['index', 'product_id'=>$product_id]);
-//            $model->imagesUpload = UploadedFile::getInstances($model, 'imagesUpload');
-//            if ($model->save()) {
-//                if ( ($images = $model->imagesUpload()) !== FALSE) {
-//                    foreach ($images as $image) {
-//                        $imageModel = new ProductImage();
-//                        $imageModel->product_id = $model->product_id;
-//                        $imageModel->product_variant_id = $model->product_variant_id;
-//                        $imageModel->image = $image;
-//                        $imageModel->save();
-//                    }
-//                }
-//
-//                return $this->redirect(['index', 'product_id' => $product_id]);
-//            }
         } else {
             $groups = $model->category-> getTaxGroupsByLevel(1);
@@ -259,19 +259,19 @@ class ProductVariant extends \yii\db\ActiveRecord
         return $this->hasOne(Category::className(), ['category_id' => 'category_id'])->viaTable('product_category', ['product_id' => 'product_id']);
     }
-    public function afterSave($insert, $changedAttributes)
-    {
-        if (!is_null($this->stocks)) {
-            //ProductStock::deleteAll(['product_variant_id' => $this->product_variant_id]);
-            $values = [];
-            foreach ($this->stocks as $id => $quantity) {
-                $productStock = ProductStock::find()->where(['product_variant_id' => $this->product_variant_id, 'stock_id' => $id])->one();
-                $productStock->quantity = $quantity;
-                $productStock->save();
-            }
-        }
-        parent::afterSave($insert, $changedAttributes);
-    }
+//    public function afterSave($insert, $changedAttributes)
+//    {
+//        if (!is_null($this->stocks)) {
+//            //ProductStock::deleteAll(['product_variant_id' => $this->product_variant_id]);
+//            $values = [];
+//            foreach ($this->stocks as $id => $quantity) {
+//                $productStock = ProductStock::find()->where(['product_variant_id' => $this->product_variant_id, 'stock_id' => $id])->one();
+//                $productStock->quantity = $quantity;
+//                $productStock->save();
+//            }
+//        }
+//        parent::afterSave($insert, $changedAttributes);
+//    }
     public function beforeDelete() {
         ProductImage::deleteAll(['product_variant_id' => $this->product_variant_id]);
@@ -24,8 +24,8 @@ return [
     'Price Old' => 'Старая Цена',
     'Products' => 'Товары',
     'Product' => 'Товар',
-    'Variants' => 'Модифицкации',
-    'Variant' => 'Модифицкация',
+    'Variants' => 'Модификации',
+    'Variant' => 'Модификация',
     'Create Product' => 'Создать Товар',
     'Enable' => 'Доступно',
     'Disable' => 'Отсутсвует',
@@ -83,6 +83,7 @@ return [
                 'priceparam.xml'    => 'site/priceparam',
                 'price.xml'         => 'site/price',
                 'smstest'           => 'site/sms',
+                'search' => 'search/index',
 //                'catalog'                                                          => 'catalog/all',
 //                'catalog/<translit:\w+>'                                           => 'catalog/index',
 //                'products/search'                                                  => 'products/search',
@@ -36,7 +36,6 @@ class CatalogController extends \yii\web\Controller
         /** @var Category $category */
         $category = Yii::$app->request->get('category');
         $filter = Yii::$app->request->get('filter', []);
-        $word = trim(Yii::$app->request->get('word', ''));
         if (empty($category->category_id) && empty($word)) {
             return $this->render(
@@ -44,116 +43,78 @@ class CatalogController extends \yii\web\Controller
             );
         }
-        if (!empty($word))
-        {
-            $params = [];
-            $params['keywords'] = explode(' ', preg_replace("|[\s,.!:&?~();-]|i", " ", $word));
-            foreach($params['keywords'] as $i => &$keyword) {
-                $keyword = trim($keyword);
-                if (empty($keyword)) {
-                    unset($params['keywords'][$i]);
-                }
-            }
-
-            $productModel = new ProductFrontendSearch();
-            $productProvider = $productModel->search($category, $params);
+        $params = [];
-            $categoriesQuery = Category::find()
-                ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.category_id = '. Category::tableName() .'.category_id')
-                ->innerJoin(Product::tableName(), Product::tableName() .'.product_id = '. ProductCategory::tableName() .'.product_id')
-                ->innerJoin(ProductVariant::tableName(), ProductVariant::tableName() .'.product_id = '. ProductCategory::tableName() .'.product_id');
-            foreach ($params['keywords'] as $keyword) {
-                $categoriesQuery->andWhere(['ilike', 'product.name', $keyword]);
+        if ( !empty($filter['brands']) ) {
+            $brands = Brand::find()->select('brand_id')->where(['in', 'alias', $filter['brands']])->all();
+            $params['brands'] = [];
+            foreach ($brands as $brand) {
+                $params['brands'][] = $brand->brand_id;
             }
-            $categoriesQuery->andWhere(['!=', ProductVariant::tableName() .'.stock', 0]);
-            $categories = $categoriesQuery->all();
-
-            return $this->render(
-                'search',
-                [
-                    'keywords'          => $params['keywords'],
-                    'category'          => $category,
-                    'productModel'      => $productModel,
-                    'productProvider'   => $productProvider,
-                    'categories'        => $categories,
-                ]
-            );
-
         }
-        else
-        {
-            $params = [];
-
-            if ( !empty($filter['brands']) ) {
-                $brands = Brand::find()->select('brand_id')->where(['in', 'alias', $filter['brands']])->all();
-                $params['brands'] = [];
-                foreach ($brands as $brand) {
-                    $params['brands'][] = $brand->brand_id;
-                }
-            }
-
-            if ( !empty($filter['special']) ) {
-                if (!is_array($filter['special'])) {
-                    $filter['special'] = [$filter['special']];
-                }
-                if (in_array('new', $filter['special'])) {
-                    $params['special']['is_new'] = true;
-                }
-                if (in_array('top', $filter['special'])) {
-                    $params['special']['is_top'] = true;
-                }
-                if (in_array('promo', $filter['special'])) {
-                    $params['special']['akciya'] = true;
-                }
-            }
-            if ( !empty($filter['options']) ) {
-                $params['options'] = $filter['options'];
+        if ( !empty($filter['special']) ) {
+            if (!is_array($filter['special'])) {
+                $filter['special'] = [$filter['special']];
             }
-
-            if ( !empty($filter['prices']) ) {
-                $params['prices'] = $filter['prices'];
+            if (in_array('new', $filter['special'])) {
+                $params['special']['is_new'] = true;
             }
-
-            $productModel = new ProductFrontendSearch();
-            $productQuery = $productModel->getSearchQuery($category, $params);
-            $productProvider = $productModel->search($category, $params);
-
-            $brandModel = new BrandSearch();
-            $brands = $brandModel->getBrands($category, $params)->all();
-
-            $optionsQuery = $productModel->optionsForCategory($category, $params);
-            $groups = [];
-            foreach ($optionsQuery->all() as $option) {
-                if (!isset($groups[$option->tax_group_id])) {
-                    $groups[$option->tax_group_id] = $option->taxGroup;
-                    $groups[$option->tax_group_id]->_options = [];
-                }
-                $groups[$option->tax_group_id]->_options[] = $option;
+            if (in_array('top', $filter['special'])) {
+                $params['special']['is_top'] = true;
             }
-            foreach($groups as $i => $group) {
-                if (empty($group->_options))
-                    unset($groups[$i]);
+            if (in_array('promo', $filter['special'])) {
+                $params['special']['akciya'] = true;
             }
+        }
-            $priceLimits = $productModel->priceLimits($category, $params);
+        if ( !empty($filter['options']) ) {
+            $params['options'] = $filter['options'];
+        }
-            return $this->render(
-                'products',
-                [
-                    'category'          => $category,
-                    'brandModel'        => $brandModel,
-                    'brands'            => $brands,
-                    'filter'            => $filter,
-                    'params'            => $params,
-                    'productModel'      => $productModel,
-                    'productProvider'   => $productProvider,
-                    'groups'            => $groups,
-                    'priceLimits'       => $priceLimits,
-                ]
-            );
+        if ( !empty($filter['prices']) ) {
+            $params['prices'] = $filter['prices'];
         }
+
+        $productModel = new ProductFrontendSearch();
+        $productQuery = $productModel->getSearchQuery($category, $params);
+        $productProvider = $productModel->search($category, $params);
+
+        $brandModel = new BrandSearch();
+        $brands = $brandModel->getBrands($category, $params)->all();
+
+        $optionsQuery = $productModel->optionsForCategory($category, $params);
+        $groups = [];
+        foreach ($optionsQuery->all() as $option) {
+            if (!isset($groups[$option->tax_group_id])) {
+                $groups[$option->tax_group_id] = $option->taxGroup;
+                $groups[$option->tax_group_id]->_options = [];
+            }
+            $groups[$option->tax_group_id]->_options[] = $option;
+        }
+        foreach($groups as $i => $group) {
+            if (empty($group->_options))
+                unset($groups[$i]);
+        }
+
+        $priceLimits = $productModel->priceLimits($category, $params);
+
+        return $this->render(
+            'products',
+            [
+                'category'          => $category,
+                'brandModel'        => $brandModel,
+                'brands'            => $brands,
+                'filter'            => $filter,
+                'params'            => $params,
+                'productModel'      => $productModel,
+                'productProvider'   => $productProvider,
+                'groups'            => $groups,
+                'priceLimits'       => $priceLimits,
+            ]
+        );
+
     }
     public function actionProduct()
+<?php
+
+namespace frontend\controllers;
+use frontend\models\ProductFrontendSearch;
+use Yii;
+use common\modules\product\models\Category;
+use common\modules\product\models\Product;
+use common\modules\product\models\ProductCategory;
+use common\modules\product\models\ProductVariant;
+use yii\web\HttpException;
+
+class SearchController extends \yii\web\Controller
+{
+    public function actionIndex()
+    {
+
+        $word = trim(Yii::$app->request->get('word', ''));
+
+        if (!empty($word))
+        {
+            $params = [];
+
+            $params['keywords'] = explode(' ', preg_replace("|[\s,.!:&?~();-]|i", " ", $word));
+            foreach($params['keywords'] as $i => &$keyword) {
+                $keyword = trim($keyword);
+                if (empty($keyword)) {
+                    unset($params['keywords'][$i]);
+                }
+            }
+
+            $productModel = new ProductFrontendSearch();
+            $productProvider = $productModel->search(null, $params);
+
+            $categoriesQuery = Category::find()
+                ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.category_id = '. Category::tableName() .'.category_id')
+                ->innerJoin(Product::tableName(), Product::tableName() .'.product_id = '. ProductCategory::tableName() .'.product_id')
+                ->innerJoin(ProductVariant::tableName(), ProductVariant::tableName() .'.product_id = '. ProductCategory::tableName() .'.product_id');
+            foreach ($params['keywords'] as $keyword) {
+                $categoriesQuery->andWhere(['ilike', 'product.name', $keyword]);
+            }
+            $categoriesQuery->andWhere(['!=', ProductVariant::tableName() .'.stock', 0]);
+            $categories = $categoriesQuery->all();
+
+            return $this->render(
+                'index',
+                [
+                    'keywords'          => $params['keywords'],
+                    'productModel'      => $productModel,
+                    'productProvider'   => $productProvider,
+                    'categories'        => $categories,
+                ]
+            );
+        }
+        else
+        {
+            throw new HttpException(404, 'Данной странице не существует!');
+        }
+    }
+}
 \ No newline at end of file
@@ -15,6 +15,6 @@ use app\models\Catalog;
                                             </ul>
                                             <?endif;?>
                                             </li>
-                                            <?endforeach;?>    
-					</ul>			
+                                            <?endforeach;?>
+					</ul>
 				</div></div>
 \ No newline at end of file
 <?php
+
 /** @var $this \yii\web\View */
 /** @var $productProvider \yii\data\ActiveDataProvider */
@@ -157,7 +157,7 @@ $this-&gt;registerJsFile (Yii::$app-&gt;request-&gt;baseUrl . &#39;/js/fix_height.js&#39;, [&#39;posi
                 <div class="both"></div>
             </div>
             <div class="search">
-                <form method="get" action="/catalog">
+                <form method="get" action="/search">
                     <input type="text" name="word" value='<?= ! empty($_GET['word']) ? Html::encode ($_GET['word']) : '' ?>'/><input
                         type="submit" value="    "/>
                 </form>
@@ -12,18 +12,13 @@ $page_data = [
 ];
 $this->params['breadcrumbs'][] = ['label' => 'Поиск', 'url' => ['catalog/category', 'word' => implode(' ', $keywords)]];
-if (!empty($category)) {
-    $this->params['breadcrumbs'][] = $category->categoryName->value;
-    $page_data['category'] = $category->name;
-}
-$this->title =  Yii::t('product', "Search for \"{keywords}\"". (empty($category) ? '' : ' in category \"{category}\"'), $page_data);
 //$this->params['seo']['seo_text'] = 'TEST SEO TEXT';
 //$this->params['seo']['h1'] = 'TEST H1';
 //$this->params['seo']['description'] = 'TEST DESCRIPTION';
 //$this->params['seo']['fields']['name'] = 'TEST NAME FROM FIELD';
-//$this->params['seo']['key']= 'product_list';
+$this->params['seo']['meta']= 'noindex,follow';
 ?>
 <nav class="bread-crumbs">
@@ -277,6 +277,7 @@ class Seo extends Widget
             $query = SeoDynamic::find()->joinWith('seoCategory')->where(['controller' => \Yii::$app->controller->id, 'action' => \Yii::$app->controller->action->id, 'key' => $this->key]);
         } else {
+
             $query = SeoDynamic::find()->joinWith('seoCategory')->where(['controller' => \Yii::$app->controller->id, 'action' => \Yii::$app->controller->action->id]);
         }