-

Karnovsky A
1 parent 0ac5c50c
Showing 5 changed files with 257 additions and 60 deletions Show diff stats
common/modules/product/CatalogUrlManager.php
common/modules/product/models/Product.php
frontend/controllers/CatalogController.php
frontend/views/catalog/brand.php
frontend/widgets/Rubrics.php
@@ -45,27 +45,7 @@ class CatalogUrlManager implements UrlRuleInterface {
             if (!empty($paths[2])) {
                 // Filter
                 if (strpos($paths[2], 'filter:') === 0) {
-                    $params['filter'] = [];
-                    $filter_str = substr($paths[2], 7);
-                    $filter_options = explode(';', $filter_str);
-                    foreach ($filter_options as $filter_option) {
-                        if (empty($filter_option)) {
-                            continue;
-                        }
-                        list($filter_key, $filter_option) = explode('=', $filter_option);
-                        if($filter_key == 'prices') { // price-interval section
-                            $prices = explode(':', $filter_option);
-                            $params['filter'][$filter_key] = [
-                                'min' => floatval($prices[0]),
-                                'max' => floatval($prices[1]),
-                            ];
-                        } elseif (strpos($filter_key, $this->option_prefix) === 0) { // options section
-                            $params['filter']['options'][substr($filter_key, 2)] = explode(',', $filter_option);
-                        } else { // brands and other sections
-                            $params['filter'][$filter_key] = explode(',', $filter_option);
-                        }
-
-                    }
+                    $this->parseFilter($paths[2], $params);
                 } elseif (strpos($paths[2], 'word:') === 0) {
                     $params['word'] = substr($paths[2], 5);
                 }
@@ -83,8 +63,14 @@ class CatalogUrlManager implements UrlRuleInterface {
             if (empty($paths[1]) || $paths[1] == 'index') {
                 $route = 'catalog/brands';
             } elseif (($brand = BrandSearch::findByAlias($paths[1]))) {
-                $route = 'catalog/brands';
+                $route = 'catalog/brand';
                 $params['brand'] = $brand;
+                if (!empty($paths[2])) {
+                    // Filter
+                    if (strpos($paths[2], 'filter:') === 0) {
+                        $this->parseFilter($paths[2], $params);
+                    }
+                }
             } else {
                 // @todo redirect or return FALSE
             }
@@ -123,40 +109,7 @@ class CatalogUrlManager implements UrlRuleInterface {
                     unset($params['word']);
                 }
-                $filter = [];
-                if (!empty($params['filter'])) {
-                    foreach ($params['filter'] as $key => $values) {
-                        switch($key) {
-                            case 'prices':
-                                $filter[] = $key .'='. implode(':', $values);
-                                break;
-
-                            case 'options':
-                                foreach($values as $group => &$value_items) {
-                                    foreach($value_items as &$value_item) {
-                                        $value_item = $this->option_value_encode($value_item);
-                                        if (empty($value_item)) {
-                                            unset($value_item);
-                                        }
-                                    }
-                                    $filter[] = $this->option_prefix. $group .'='. implode(',', $value_items);
-                                }
-                                break;
-
-                            default:
-                                foreach($values as &$value) {
-                                    $value = $this->option_value_encode($value);
-                                    if (empty($value)) {
-                                        unset($value);
-                                    }
-                                }
-                                $filter[] = $key .'='. implode(',', $values);
-                                break;
-                        }
-                    }
-                    $url .= 'filter:'. implode(';', $filter);
-                    unset($params['filter']);
-                }
+                $this->setFilterUrl($params, $url);
                 if (!empty($params) && ($query = http_build_query($params)) !== '') {
                     $url .= '?' . $query;
@@ -184,7 +137,9 @@ class CatalogUrlManager implements UrlRuleInterface {
                 } else {
                     $brand_alias = is_object($params['brand']) ? $params['brand']->alias : strtolower($params['brand']);
                 }
-                $url = 'brands/'. $brand_alias;
+                $url = 'brands/'. $brand_alias .'/';
+
+                $this->setFilterUrl($params, $url);
                 if (!empty($params) && ($query = http_build_query($params)) !== '') {
                     $url .= '?' . $query;
@@ -198,4 +153,64 @@ class CatalogUrlManager implements UrlRuleInterface {
     private function option_value_encode($value) {
         return str_replace(array(',', '/'), array('~', '&s;'), $value);
     }
+
+    private function setFilterUrl(&$params, &$url) {
+        $filter = [];
+        if (!empty($params['filter'])) {
+            foreach ($params['filter'] as $key => $values) {
+                switch($key) {
+                    case 'prices':
+                        $filter[] = $key .'='. implode(':', $values);
+                        break;
+
+                    case 'options':
+                        foreach($values as $group => &$value_items) {
+                            foreach($value_items as &$value_item) {
+                                $value_item = $this->option_value_encode($value_item);
+                                if (empty($value_item)) {
+                                    unset($value_item);
+                                }
+                            }
+                            $filter[] = $this->option_prefix. $group .'='. implode(',', $value_items);
+                        }
+                        break;
+
+                    default:
+                        foreach($values as &$value) {
+                            $value = $this->option_value_encode($value);
+                            if (empty($value)) {
+                                unset($value);
+                            }
+                        }
+                        $filter[] = $key .'='. implode(',', $values);
+                        break;
+                }
+            }
+            $url .= 'filter:'. implode(';', $filter);
+            unset($params['filter']);
+        }
+    }
+
+    private function parseFilter($paths, &$params) {
+        $params['filter'] = [];
+        $filter_str = substr($paths, 7);
+        $filter_options = explode(';', $filter_str);
+        foreach ($filter_options as $filter_option) {
+            if (empty($filter_option)) {
+                continue;
+            }
+            list($filter_key, $filter_option) = explode('=', $filter_option);
+            if($filter_key == 'prices') { // price-interval section
+                $prices = explode(':', $filter_option);
+                $params['filter'][$filter_key] = [
+                    'min' => floatval($prices[0]),
+                    'max' => floatval($prices[1]),
+                ];
+            } elseif (strpos($filter_key, $this->option_prefix) === 0) { // options section
+                $params['filter']['options'][substr($filter_key, 2)] = explode(',', $filter_option);
+            } else { // brands and other sections
+                $params['filter'][$filter_key] = explode(',', $filter_option);
+            }
+        }
+    }
 }
 \ No newline at end of file
@@ -7,6 +7,7 @@ use common\modules\rubrication\models\TaxOption;
 use Yii;
 use common\modules\relation\relationBehavior;
 use yii\db\ActiveQuery;
+use yii\db\ActiveRecord;
 use yii\helpers\Html;
 use yii\web\UploadedFile;
@@ -237,6 +238,12 @@ class Product extends \yii\db\ActiveRecord
         }
     }
+    public function beforeDelete() {
+        ProductImage::deleteAll(['product_id' => $this->product_id]);
+        ProductCategory::deleteAll(['product_id' => $this->product_id]);
+        ProductVariant::deleteAll(['product_id' => $this->product_id]);
+    }
+
     public function imagesUpload()
     {
         if ($this->validate()) {
@@ -203,9 +203,30 @@ class CatalogController extends \yii\web\Controller
         ]);
     }
-    public function actionBrand($alias)
+    public function actionBrand($brand)
     {
-        return 'actionBrand:'. $alias;
+        $filter = Yii::$app->request->get('filter', []);
+
+        $params = [
+            'brand_id' => $brand->brand_id,
+        ];
+
+        if ( !empty($filter['prices']) ) {
+            $params['prices'] = $filter['prices'];
+        }
+
+        $productModel = new ProductFrontendSearch();
+        $productProvider = $productModel->search(null, $params);
+
+        $priceLimits = $productModel->priceLimits(null, $params);
+
+        return $this->render('brand', [
+            'productModel'      => $productModel,
+            'productProvider'   => $productProvider,
+            'brand'             => $brand,
+            'priceLimits'       => $priceLimits,
+            'filter'            => $filter,
+        ]);
     }
 }
+<?php
+/** @var $this \yii\web\View */
+/** @var $productProvider \yii\data\ActiveDataProvider */
+/** @var $brandProvider \yii\data\ActiveDataProvider */
+
+
+use yii\helpers\Url;
+use yii\widgets\Breadcrumbs;
+use yii\web\View;
+use common\modules\product\helpers\ProductHelper;
+
+$this->title =  $brand->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('products', 'Brands'), 'url' => ['catalog/brands']];
+$this->params['breadcrumbs'][] = $brand->name;
+
+$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->registerCssFile (Yii::getAlias('@web/css/ion.rangeSlider.css'));
+$this->registerCssFile (Yii::getAlias('@web/css/ion.rangeSlider.skinHTML5.css'));
+$this->registerJsFile (Yii::getAlias('@web/js/ion.rangeSlider.js'));
+?>
+
+<script type="text/javascript">
+    <?php if ($priceLimits['min'] < $priceLimits['max']) :?>
+    $(document).ready(function() {
+        // price rangeslider (filter price slider)
+        $("#price_interval").ionRangeSlider({
+            type: "double",
+            min: <?= $priceLimits['min']?>,
+            max: <?= $priceLimits['max']?>,
+            from: <?= empty($filter['prices']['min']) ? $priceLimits['min'] : $filter['prices']['min']?>,
+            to: <?= empty($filter['prices']['max']) ? $priceLimits['max'] : $filter['prices']['max']?>,
+            grid: false,
+            onFinish: function(e) {
+                <?php
+                $filterWhitoutPrice = $filter;
+                $filterWhitoutPrice['prices'] = [
+                    'min' => '{from}',
+                    'max' => '{to}',
+                ];
+                ?>
+                var url = "<?= Url::to(['catalog/brands', 'brand' => $brand, 'filter' => $filterWhitoutPrice])?>";
+                var from = e.from;
+                var to = e.to;
+                document.location = url.replace('{from}', from).replace('{to}', to);
+            }
+        });
+    });
+    <?php endif?>
+</script>
+
+<nav class="bread-crumbs">
+    <?= Breadcrumbs::widget ([
+        'links' => $this->params['breadcrumbs'],
+    ])
+    ?>
+
+
+    <div class="both"></div>
+</nav>
+
+<div class="loyout">
+    <div class="leftbar">
+        <div class="filters">
+            <ul>
+                <li class="new">
+                    <?php
+                    $checked = !empty($filter['special']) && in_array('new', $filter['special']);
+                    $option_url = Url::to(['catalog/brands', 'brand' => $brand, 'filter' => ProductHelper::getFilterForOption($filter, 'special', 'new', $checked)]);
+                    ?>
+                    <input type="checkbox" class="special-option" <?= $checked ? ' checked' : ''?> onchange="document.location='<?= $option_url?>'" />
+                    <a href="<?= $option_url?>"><?= Yii::t('product', 'New products')?></a>
+                </li>
+                <li class="top">
+                    <?php
+                    $checked = !empty($filter['special']) && in_array('top', $filter['special']);
+                    $option_url = Url::to(['catalog/brands', 'brand' => $brand, 'filter' => ProductHelper::getFilterForOption($filter, 'special', 'top', $checked)]);
+                    ?>
+                    <input type="checkbox" class="special-option" <?= $checked ? ' checked' : ''?> onchange="document.location='<?= $option_url?>'" />
+                    <a href="<?= $option_url?>"><?= Yii::t('product', 'Top products')?></a>
+                </li>
+                <li class="promo">
+                    <?php
+                    $checked = !empty($filter['special']) && in_array('promo', $filter['special']);
+                    $option_url = Url::to(['catalog/brands', 'brand' => $brand, 'filter' => ProductHelper::getFilterForOption($filter, 'special', 'promo', $checked)]);
+                    ?>
+                    <input type="checkbox" class="special-option" <?= $checked ? ' checked' : ''?> onchange="document.location='<?= $option_url?>'" />
+                    <a href="<?= $option_url?>"><?= Yii::t('product', 'Promo products')?></a>
+                </li>
+            </ul>
+        </div>
+        <form action="#" name="filter_catalog_page_form" class="filter-catalog-form">
+            <?php if (!empty($filter)) :?>
+                <div class="filter_accept_bloc">
+                    <!--                    <button type="submit" class="filter_accept_btn">применить</button>-->
+                    <a href="<?= Url::to(['catalog/brands', 'brand' => $brand])?>" class="_form_checkbox_reset">сбросить фильтры</a>
+                </div>
+            <?php endif?>
+
+                <?php if ($priceLimits['min'] < $priceLimits['max']) :?>
+                <div class="cost_box filters">
+                    <div class="begin">Цена</div>
+                    <div class="price_filter first_price_li">
+                        <div class="price_slider">
+                            <input type="text" id="price_interval" name="price_interval" value="" />
+                        </div>
+                    </div>
+                </div>
+                <?php endif?>
+        </form>
+    </div>
+
+    <div class="content">
+        <h1><?= $brand->name ?></h1>
+        <div class="sort_menu">
+
+            <div class="sort_block">
+                <span>Сортировка:</span>
+                <?= \yii\widgets\LinkSorter::widget([
+                    'sort' => $productProvider->sort,
+                    'attributes' => [
+                        'name',
+                        'price',
+                    ]
+                ]);
+                ?>
+            </div>
+        </div>
+        <div class="products pn">
+            <ul>
+                <?php foreach($productProvider->models as $product) :?>
+                    <?php require(__DIR__ .'/product_item.php')?>
+                <?php endforeach?>
+            </ul>
+            <div class="both"></div>
+        </div>
+        <?php if ($productProvider->totalCount > $productProvider->pagination->pageSize) :?>
+            <?= \yii\widgets\LinkPager::widget([
+                'pagination' => $productProvider->pagination,
+                'options' => ['class' => 'pagination pull-right'],
+                'registerLinkTags' => true,
+            ]);
+            ?>
+        <?php endif?>
+        <div class="both"></div>
+    </div>
+    <div class="both"></div>
+
+    <?= \common\modules\product\widgets\lastProducts::widget()?>
+</div>
 \ No newline at end of file
@@ -32,7 +32,7 @@ class Rubrics extends Widget {
         $items = [];
         if (empty($this->categories)) {
-            $this->categories = Category::find ()->all();
+            $this->categories = Category::find ()->orderBy('category_id', SORT_ASC)->all();
         }
         foreach ($this->categories as $category) {
             if (!empty($this->includes) && !in_array($category->category_id, $this->includes)) {