-

Karnovsky A
1 parent 1bdd1646
Showing 23 changed files with 214 additions and 25 deletions Show diff stats
backend/views/brand/index.php
common/config/main.php
common/modules/product/CatalogUrlManager.php
common/modules/product/models/BrandSearch.php
common/modules/product/models/Category.php
common/modules/product/models/CategorySearch.php
common/modules/product/models/Product.php
common/modules/product/models/ProductSearch.php
common/modules/product/models/ProductVariant.php
common/modules/product/models/ProductVariantSearch.php
common/modules/product/views/manage/index.php
common/modules/rubrication/models/TaxGroup.php
common/modules/rubrication/views/tax-group/index.php
common/modules/rubrication/views/tax-group/view.php
common/translation/ru/product.php
frontend/config/main.php
frontend/controllers/CatalogController.php
frontend/views/basket/ajax_items.php
frontend/views/basket/index.php
frontend/views/catalog/brands.php
@@ -26,6 +26,13 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'name',
             'alias',
+            [
+                'attribute' => 'title',
+                'format' => 'html',
+                'value' => function($data) {
+                    return Html::img($data->imageUrl, ['width'=>'100']);
+                },
+            ],
             ['class' => 'yii\grid\ActionColumn'],
         ],
@@ -90,6 +90,20 @@ return [
                         'master' => null
                     ],
                 ],
+                'product_basket' => [
+                    'resize' => [
+                        'width' => 100,
+                        'height' => 200,
+                        'master' => null
+                    ],
+                ],
+                'iam' => [
+                    'resize' => [
+                        'width' => 120,
+                        'height' => 240,
+                        'master' => null
+                    ],
+                ],
                 'slider' => [
                     'resize' => [
                         'width' => 720,
@@ -104,6 +118,18 @@ return [
                         'master' => null
                     ],
                 ],
+                'brand_item' => [
+                    'resize' => [
+                        'width' => 150,
+                        'height' => 150,
+                        'master' => null
+                    ],
+                    'crop' => [
+                        'width' => 150,
+                        'height' => 150,
+                        'master' => null
+                    ],
+                ],
                 'mainmenu' => [
                     'resize' => [
                         'width' => 160,
@@ -3,6 +3,7 @@
 namespace common\modules\product;
 use common\modules\product\models\Brand;
+use common\modules\product\models\BrandSearch;
 use common\modules\product\models\CategorySearch;
 use common\modules\product\models\ProductSearch;
 use common\modules\rubrication\models\TaxOption;
@@ -78,8 +79,15 @@ class CatalogUrlManager implements UrlRuleInterface {
             $params = [
                 'product' => $product,
             ];
-        } elseif ($paths[0] == 'brand') {
-
+        } elseif ($paths[0] == 'brands') {
+            if (empty($paths[1]) || $paths[1] == 'index') {
+                $route = 'catalog/brands';
+            } elseif (($brand = BrandSearch::findByAlias($paths[1]))) {
+                $route = 'catalog/brands';
+                $params['brand'] = $brand;
+            } else {
+                // @todo redirect or return FALSE
+            }
         }
         return [$route, $params];
@@ -169,6 +177,21 @@ class CatalogUrlManager implements UrlRuleInterface {
                 return $url;
                 break;
+
+            case 'catalog/brands':
+                if (empty($params['brand'])) {
+                    return 'brands';
+                } else {
+                    $brand_alias = is_object($params['brand']) ? $params['brand']->alias : strtolower($params['brand']);
+                }
+                $url = 'brands/'. $brand_alias;
+
+                if (!empty($params) && ($query = http_build_query($params)) !== '') {
+                    $url .= '?' . $query;
+                }
+
+                return $url;
+                break;
         }
     }
@@ -81,6 +81,8 @@ class BrandSearch extends Brand
             ->andFilterWhere(['ilike', 'seo_text', $this->seo_text])
             ->andFilterWhere(['ilike', 'brand_name.value', $this->brand_name]);
+        $query->orderBy('brand_id', 'asc');
+
         return $dataProvider;
     }
@@ -121,4 +123,16 @@ class BrandSearch extends Brand
         return $dataProvider;
     }
+
+    public static function findByAlias($alias) {
+        /** @var CategoryQuery $query */
+        $query = Brand::find()
+            ->with('brandName')
+            ->andFilterWhere(['alias' => $alias]);
+        if (($model = $query->one()) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
 }
@@ -176,12 +176,12 @@ class Category extends \yii\db\ActiveRecord
     }
     public function getImageFile() {
-        return empty($this->image) ? null : Yii::getAlias('@imagesDir/categories/'. $this->image);
+        return empty($this->image) ? '/images/no_photo.png' : Yii::getAlias('@imagesDir/categories/'. $this->image);
     }
     public function getImageUrl()
     {
-        return empty($this->image) ? null : Yii::getAlias('@imagesUrl/categories/' . $this->image);
+        return empty($this->image) ? '/images/no_photo.png' : Yii::getAlias('@imagesUrl/categories/' . $this->image);
     }
     public function beforeSave($insert)
@@ -82,7 +82,7 @@ class CategorySearch extends Category
         $query->andFilterWhere(['like', 'alias', $this->alias]);
-        $query->orderBy(['path' => SORT_ASC, 'depth' => SORT_ASC]);
+        $query->orderBy(['path' => SORT_ASC, 'depth' => SORT_ASC, 'category_id' => SORT_ASC]);
         return $dataProvider;
     }
@@ -221,7 +221,7 @@ class Product extends \yii\db\ActiveRecord
             if (!is_array($_variant)) {
                 return;
             }
-            if (!empty($_variant['product_variant_id'])) {
+                if (!empty($_variant['product_variant_id'])) {
                 unset($todel[$_variant['product_variant_id']]);
                 $model = ProductVariant::findOne($_variant['product_variant_id']);
             } else {
@@ -15,6 +15,7 @@ class ProductSearch extends Product
 {
     public $brand_name;
     public $category_name;
+    public $variant_sku;
     /**
      * @inheritdoc
@@ -22,9 +23,9 @@ class ProductSearch extends Product
     public function rules()
     {
         return [
-            [['name', 'brand_name', 'category_name'], 'safe'],
+            [['name', 'brand_name', 'category_name', 'variant_sku'], 'safe'],
             [['tax_brand_id', 'product_id'], 'integer'],
-            [['is_top', 'is_new'], 'boolean'],
+            [['is_top', 'is_new', 'akciya'], 'boolean'],
         ];
     }
@@ -65,12 +66,18 @@ class ProductSearch extends Product
         $dataProvider->setSort([
             'attributes' => [
                 'name',
-                'brand_name',
-                'category_name'
+                'brand_name' => [
+                    'asc' => ['brand_name.value' => SORT_ASC],
+                    'desc' => ['brand_name.value' => SORT_DESC],
+                    'default' => SORT_DESC,
+                    'label' => 'Brand name',
+                ],
+                'category_name',
+                'variant_sku',
             ]
         ]);
-        $query->joinWith(['brand', 'brand.brandNames', 'categories', 'categories.categoryNames']);
+        $query->joinWith(['brand', 'brand.brandNames', 'categories', 'categories.categoryNames', 'variant']);
         if (isset($this->is_top)) {
             $query->andFilterWhere([
@@ -95,7 +102,9 @@ class ProductSearch extends Product
         $query->andFilterWhere(['ilike', 'name', $this->name]);
         $query->andFilterWhere(['ilike', 'brand_name.value', $this->brand_name]);
         $query->andFilterWhere(['ilike', 'category_name.value', $this->category_name]);
+        $query->andFilterWhere(['ilike', 'product_variant.sku', $this->variant_sku]);
+        $query->groupBy(['product.product_id']);
         $query->orderBy('product.product_id', 'DESC');
         return $dataProvider;
@@ -132,6 +132,10 @@ class ProductVariant extends \yii\db\ActiveRecord
         return !empty($this->image) ? $this->image->imageUrl : '/images/no_photo.png';
     }
+    public function getFullname() {
+       return empty($this->product) ? null : ($this->product->name . (empty($this->name) ? '' : ' '. $this->name));
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -12,14 +12,21 @@ use yii\web\NotFoundHttpException;
  */
 class ProductVariantSearch extends ProductVariant
 {
+    public $brand_name;
+    public $category_name;
+    public $tax_group_id;
+    public $is_top;
+    public $is_new;
+    public $akciya;
     /**
      * @inheritdoc
      */
     public function rules()
     {
         return [
-            [['name', 'sku', 'price', 'price_old', 'stock'], 'safe'],
+            [['name', 'fullname', 'sku', 'price', 'price_old', 'stock', 'fullname', 'brand_name', 'category_name'], 'safe'],
             [['product_variant_id', 'product_id'], 'integer'],
+            [['is_top', 'is_new', 'akciya'], 'boolean'],
         ];
     }
@@ -57,14 +64,54 @@ class ProductVariantSearch extends ProductVariant
             return $dataProvider;
         }
+        $dataProvider->setSort([
+            'attributes' => [
+                'name',
+                'brand_name' => [
+                    'asc' => ['brand_name.value' => SORT_ASC],
+                    'desc' => ['brand_name.value' => SORT_DESC],
+                    'default' => SORT_DESC,
+                    'label' => 'Brand name',
+                ],
+                'category_name',
+                'sku',
+            ]
+        ]);
+
+        $query->joinWith(['product', 'product.brand.brandNames', 'product.categories', 'product.categories.categoryNames']);
+
+        if (isset($this->is_top)) {
+            $query->andFilterWhere([
+                'product.is_top' => (bool)$this->is_top,
+            ]);
+        }
+        if (isset($this->is_new)) {
+            $query->andFilterWhere([
+                'product.is_new' => (bool)$this->is_new,
+            ]);
+        }
+        if (isset($this->akciya)) {
+            $query->andFilterWhere([
+                'product.akciya' => (bool)$this->akciya,
+            ]);
+        }
+
         // grid filtering conditions
         $query->andFilterWhere([
+            'product.product_id' => $this->product_id,
             'product_variant_id' => $this->product_variant_id,
-            'product_id' => $this->product_id,
         ]);
-        $query->andFilterWhere(['like', 'name', $this->name])
-              ->andFilterWhere(['like', 'sku', $this->sku]);
+        if (!empty($this->fullname)) {
+            $query->orFilterWhere(['like', 'name', $this->fullname]);
+            $query->orFilterWhere(['ilike', 'product.name', $this->fullname]);
+        }
+        $query->andFilterWhere(['ilike', 'product.brand_name.value', $this->brand_name]);
+        $query->andFilterWhere(['ilike', 'product.category_name.value', $this->category_name]);
+        $query->andFilterWhere(['ilike', 'sku', $this->sku]);
+
+        $query->groupBy(['product_variant_id']);
+        $query->orderBy('product.product_id', 'DESC');
         return $dataProvider;
     }
@@ -34,6 +34,11 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 'attribute' => 'category_name',
                 'value' => 'category.name',
             ],
+            [
+                'label' => Yii::t('product', 'SKU'),
+                'attribute' => 'variant_sku',
+                'value' => 'variant.sku',
+            ],
             'variant.price',
             'variant.stock_caption',
@@ -15,7 +15,7 @@ use Yii;
  * @property string $module
  * @property boolean $hierarchical
  * @property string $settings
- * @property boolean is_filter
+ * @property boolean $is_filter
  *
  * @property TaxGroupToGroup[] $taxGroupToGroups
  * @property TaxGroupToGroup[] $taxGroupToGroups0
@@ -62,7 +62,7 @@ class TaxGroup extends \yii\db\ActiveRecord
         return [
             [['name', 'module'], 'required'],
             [['description', 'settings'], 'string'],
-            [['hierarchical'], 'boolean'],
+            [['hierarchical', 'is_filter'], 'boolean'],
             [['alias', 'module'], 'string', 'max' => 50],
             [['name'], 'string', 'max' => 255],
             [['group_to_category'], 'safe']
@@ -25,6 +25,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'description:ntext',
             'module',
              'hierarchical:boolean',
+             'is_filter:boolean',
             // 'settings:ntext',
             [
@@ -35,6 +35,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'description:ntext',
             'module',
             'hierarchical:boolean',
+            'is_filter:boolean',
             'settings:ntext',
         ],
     ]) ?>
@@ -11,5 +11,6 @@ return [
     'Promo products' => 'Акционные товары',
     'New products' => 'Новинки',
     'Top products' => 'Популярные',
-    '' => '',
+    'Brands' => 'Бренды',
+    'Brand' => 'Бренд',
 ];
 \ No newline at end of file
@@ -71,7 +71,7 @@ return [
                     'route_map' => [
                         'catalog' => 'catalog/category',
                         'product' => 'catalog/product',
-                        'brand' => 'catalog/brand',
+                        'brands' => 'catalog/brands',
                     ]
                 ],
 //                'catalog'                                                          => 'catalog/all',
@@ -191,7 +191,16 @@ class CatalogController extends \yii\web\Controller
     public function actionBrands()
     {
-        return 'actionBrands';
+        $dataProvider = new ActiveDataProvider([
+            'query' => Brand::find()->joinWith('brandName')->orderBy('brand_name.value'),
+            'pagination' => [
+                'pageSize' => -1,
+            ]
+        ]);
+
+        return $this->render('brands', [
+            'dataProvider' => $dataProvider,
+        ]);
     }
     public function actionBrand($alias)
@@ -7,7 +7,9 @@ use yii\helpers\Html;
 <div class="basket_item">
     <?php echo $form->field($item,'['.$i.']id')->hiddenInput()->label(false); ?>
     <div style="display: table-cell;vertical-align: middle;"><a href="#" data-id="<?=$item->id?>" class="delete_button" style="margin-right:20px;"></a></div>
-    <div style="width:100px;height:100px;display: table-cell;vertical-align: middle; border:1px solid #d2d2d2;text-align:center;margin-left:10px;margin-right:10px;"><img src="<?=Yii::$app->request->baseUrl.'/upload/products/ico/'.$item->image->image?>" style="margin:0;" width="100"></div>
+    <div style="width:100px;height:100px;display: table-cell;vertical-align: middle; border:1px solid #d2d2d2;text-align:center;margin-left:10px;margin-right:10px;">
+        <?= \common\components\artboximage\ArtboxImageHelper::getImage($item->imageUrl, 'product_basket')?>
+    </div>
     <div style="display: table-cell;vertical-align: middle; font-size:15px;width:210px; font-weight:normal;padding-left:15px;">
         <div><?=$item->product_name?></div>
         <div style="text-transform:none; margin-top:20px; font-weight:bold;">
@@ -77,7 +77,9 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
 <?php foreach($basket_mods as $i=>$item):?>
 			<div class="basket_item">
-				<a href="<?=Url::to(['products/show','translit_rubric'=>$item->translit_rubric,'translit'=>$item->translit,'id'=>$item->product_id])?>"><img src="<?=Yii::$app->request->baseUrl.'/upload/products/ico/'.$item->image->image?>" border="0" width="90" height="120" align="left" /></a>
+				<a href="<?=Url::to(['products/show','translit_rubric'=>$item->translit_rubric,'translit'=>$item->translit,'id'=>$item->product_id])?>">
+                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($item->imageUrl, 'product_basket')?>
+                </a>
 				<div class="info">
 				<a href="<?=Url::to(['products/show','translit_rubric'=>$item->translit_rubric,'translit'=>$item->translit,'id'=>$item->product_id])?>" class="link2"><?=$item->product_name?></a>
 				<p>Код: <?=$item->sku?>, цвет: <?=$item->name?></p>
+<?php
+use yii\widgets\Breadcrumbs;
+use yii\grid\GridView;
+
+$this->params['breadcrumbs'][] = Yii::t('product', 'Brands');
+
+$this->params['seo']['seo_text'] = 'Brands SEO-text';
+$this->params['seo']['h1'] = Yii::t('product', 'Brands');
+$this->params['seo']['description'] = 'Brands DESCRIPTION';
+$this->params['seo']['fields']['name'] = 'Brands NAME FROM FIELD';
+$this->params['seo']['key']= 'brands';
+?>
+
+<nav class="bread-crumbs">
+    <?= Breadcrumbs::widget ([
+    'links' => $this->params['breadcrumbs'],
+])
+    ?>
+<div class="both"></div>
+</nav>
+
+<div class="loyout">
+    <h1><?= $this->params['seo']['h1']?></h1>
+    <ul class="brends_list">
+    <?php foreach($dataProvider->models as $brand) :?>
+    <li>
+        <a href="<?= \yii\helpers\Url::to(['catalog/brands', 'brand' => $brand])?>"><?= \common\components\artboximage\ArtboxImageHelper::getImage($brand->imageUrl, 'brand_item')?></a>
+        <br>
+        <a href="<?= \yii\helpers\Url::to(['catalog/brands', 'brand' => $brand])?>" class="name"><?= $brand->name?></a>
+    </li>
+    <?php endforeach?>
+    </ul>
+    <div class="both"></div>
+</div>
 \ No newline at end of file
@@ -55,7 +55,9 @@ $this-&gt;registerJs(&quot;
 							<?foreach($item->shareList as $item_p):if(!empty($item_p->product)):?>
 								<div class="order">
 									<div><a href="<?=Url::to(['iam/share','deleteID'=>$item_p->id])?>" class="delete_button"></a></div>
-									<div class="pixbox"><a href="<?=Url::to(['products/show','translit_rubric'=>$item_p->product->catalog->translit,'translit'=>$item_p->product->translit,'id'=>$item_p->product->id])?>"><img width="120" src="<?=Yii::$app->request->baseUrl.'/upload/products/ico/'.$item_p->product->imageAvator?>"></a></div>
+									<div class="pixbox"><a href="<?=Url::to(['products/show','translit_rubric'=>$item_p->product->catalog->translit,'translit'=>$item_p->product->translit,'id'=>$item_p->product->id])?>">
+											<?= \common\components\artboximage\ArtboxImageHelper::getImage($item_p->product->imageUrl, 'iam')?>
+									</div>
 									<div class="order_title"><a href="<?=Url::to(['products/show','translit_rubric'=>$item_p->product->catalog->translit,'translit'=>$item_p->product->translit,'id'=>$item_p->product->id])?>" class="name"><?=$item_p->product->name?></a></div>
 									<?if(!empty($item_p->product->cost->cost)):?><div class="order_price"><span><?=$item_p->product->cost->cost?></span> грн.</div><?endif;?>
 									<p class="note"></p>
@@ -7,6 +7,6 @@ use yii\helpers\Url;
 <div class="fr">
     <ul>
         <li class="akciya"><a href="<?= Url::to (['event/index',]) ?>">Акции</a></li>
-        <li class="brands"><a href="<?= Url::to (['brand/index']) ?>">Бренды</a></li>
+        <li class="brands"><a href="<?= Url::to (['catalog/brands']) ?>">Бренды</a></li>
     </ul>
 </div>
@@ -244,11 +244,13 @@ ul.product_colors li img{border:1px solid #d2d2d2;}
 }
 .help-block{color:red;font-size:12px;margin-bottom:5px;}
-.basket_item{padding:10px 0px;border-bottom:1px solid #b7b7b7;}
+.basket_item{padding:10px 0px;border-bottom:1px solid #b7b7b7;clear: both}
 .basket_item img{margin-right:20px;}
 .basket_item .count{margin:20px 0px;}
 .basket_item  .fr{margin-top:5px;}
 .basket_item .info{overflow:hidden;}
+.basket_item > a{display: block;
+    float: left;}
 a.del:visited,a.del:link{background:url('../img/del.png') left center no-repeat;padding:2px 25px;font-size:12px;font-weight:normal;color:#787878;text-decoration: underline;}
 a.del:hover{color:#a52828;text-decoration: underline;}