Merge remote-tracking branch 'origin/master'

Eugeny Galkovskiy
2 parents 3f349ac0 69bea869
Showing 48 changed files with 185 additions and 163 deletions Show diff stats
backend/controllers/BlogCategoryController.php
backend/views/blog-category/_form.php
backend/views/blog-category/_search.php
backend/views/blog-category/create.php
backend/views/blog-category/index.php
backend/views/blog-category/update.php
backend/views/blog-category/view.php
backend/views/blog/_form.php
backend/views/category/_form.php
backend/views/layouts/main-sidebar.php
backend/views/page/_form.php
common/behaviors/DefaultVariantBehavior.php
common/behaviors/ManyToManyBehavior.php
common/models/Articles.php
common/models/Blog.php
common/models/BlogCategory.php
common/models/BlogCategorySearch.php
common/models/BlogToCategory.php
common/models/Comments.php
common/models/Page.php
@@ -25,11 +25,6 @@
                  'dateFormat' => 'dd-MM-yyyy',
              ]) ?>
-    <?= $form->field($model, 'date_end')
-             ->widget(DatePicker::className(), [
-                 'dateFormat' => 'dd-MM-yyyy',
-             ]) ?>
-    
     <?= $form->field($model, 'title')
              ->textInput([ 'maxlength' => true ]) ?>
@@ -22,6 +22,10 @@ use kartik\select2\Select2;
     <?= $form->field($model, 'name')->textInput() ?>
     <?= $form->field($model, 'new_collection')->checkbox() ?>
+    
+    <?= $form->field($model, 'stock_program')->checkbox() ?>
+    
+    <?= $form->field($model, 'on_order')->checkbox() ?>
     <?= $form->field($model, 'first_text')->textInput() ?>
@@ -30,11 +34,11 @@ use kartik\select2\Select2;
     <?= $form->field($model, 'alias')->textInput(['maxlength' => true]) ?>
     <?= $form->field($model, 'parent_id')->dropDownList($categories, [
-        'prompt' => Yii::t('rubrication', 'Root category'),
+        'prompt' => Yii::t('rubrication', 'Корневая'),
         'options' => [
             $model->category_id => ['disabled' => true]
         ]
-    ])->label(Yii::t('product', 'Parent category')) ?>
+    ])->label('Родительская категория') ?>
     <?php
     /* Tax group - add to controller
@@ -104,10 +108,6 @@ use kartik\select2\Select2;
             )
         ]) ?>
-    <?= $form->field($model, 'stock_program')->checkbox() ?>
-
-    <?= $form->field($model, 'on_order')->checkbox() ?>
-
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
         <?php if ($model->isNewRecord) :?>
@@ -10,15 +10,15 @@ use yii\widgets\Menu;
 //        die();
         $items = [
-            [
-                'label' => 'Заказы',
-                'url' => ['/orders/index'],
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-shopping-cart"></i> <span>{label}</span></a>',
-                'options' => ['class'=>\Yii::$app->user->can('orders') ? '' :'hide'],
-            ],
+//            [
+//                'label' => 'Заказы',
+//                'url' => ['/orders/index'],
+//                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-shopping-cart"></i> <span>{label}</span></a>',
+//                'options' => ['class'=>\Yii::$app->user->can('orders') ? '' :'hide'],
+//            ],
             [
                 'label' => 'eCommerce',
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-barcode"></i> <span>{label}</span></a>',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-shopping-cart"></i> <span>{label}</span></a>',
                 'url' => ['/product/manage'],
                 'active' => preg_match('/^manage.*$/', $this->context->id) ||
                             preg_match('/^category.*$/', $this->context->id) ||
@@ -45,11 +45,11 @@ use yii\widgets\Menu;
                         'options' => ['class'=>\Yii::$app->user->can('category') ? '' :'hide'],
                     ],
-                    [
-                        'label' => 'Бренды',
-                        'url' => ['/brand'],
-                        'options' => ['class'=>\Yii::$app->user->can('brand') ? '' :'hide'],
-                    ],
+//                    [
+//                        'label' => 'Бренды',
+//                        'url' => ['/brand'],
+//                        'options' => ['class'=>\Yii::$app->user->can('brand') ? '' :'hide'],
+//                    ],
                     [
                         'label' => 'Единицы измерения',
                         'url' => ['/product/product-unit'],
@@ -78,22 +78,11 @@ use yii\widgets\Menu;
                 ]
             ],
             [
-                'label' => 'Слайдер/Банеры',
+                'label' => 'Слайдер',
                 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-picture"></i> <span>{label}</span></a>',
+                'url' => ['/slider/index'],
                 'options' => ['class'=>\Yii::$app->user->can('banner') || \Yii::$app->user->can('slider') ? '' :'hide'],
                 'active' => preg_match('/^slider.*$/', $this->context->id) || preg_match('/^banner.*$/', $this->context->id) ? true : false,
-                'items' => [
-                    [
-                        'label' => 'Слайдер',
-                        'url' => ['/slider/index'],
-                        'options' => ['class'=>\Yii::$app->user->can('slider') ? '' :'hide'],
-                    ],
-                    [
-                        'label' => 'Банер',
-                        'url' => ['/banner/index'],
-                        'options' => ['class'=>\Yii::$app->user->can('banner') ? '' :'hide'],
-                    ],
-                ]
             ],
             [
                 'label' => 'Текстовые страницы',
@@ -113,22 +102,22 @@ use yii\widgets\Menu;
                     ],
                     [
                         'label' => 'Категории блога',
-                        'url' => '/admin/blog-category/index'
+                        'url' => ['/blog-category/index'],
                     ],
                 ],
             ],
             [
                 'label' => 'События',
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-pencil"></i> <span>{label}</span></a>',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-calendar"></i> <span>{label}</span></a>',
                 'url' => ['/articles/index'],
                 'options' => ['class'=>\Yii::$app->user->can('articles') ? '' :'hide'],
             ],
-            [
-                'label' => 'Акции',
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-piggy-bank"></i> <span>{label}</span></a>',
-                'url' => ['/event/index'],
-                'options' => ['class'=>\Yii::$app->user->can('event') ? '' :'hide'],
-            ],
+//            [
+//                'label' => 'Акции',
+//                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-piggy-bank"></i> <span>{label}</span></a>',
+//                'url' => ['/event/index'],
+//                'options' => ['class'=>\Yii::$app->user->can('event') ? '' :'hide'],
+//            ],
             [
                 'label' => 'SEO',
                 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
@@ -148,36 +137,36 @@ use yii\widgets\Menu;
                 ]
             ],
-            [
-                'label' => 'Фон',
-                'url' => ['/bg/index'],
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-picture"></i> <span>{label}</span></a>',
-                'options' => ['class'=>\Yii::$app->user->can('bg')? '' :'hide']
-            ],
-            [
-                'label' => 'Подписка',
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-envelope"></i> <span>{label}</span></a>',
-                'url' => ['/subscribe/index'],
-                'options' => ['class'=>\Yii::$app->user->can('subscribe') ? '' :'hide'],
-            ],
-            [
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-user"></i> <span>{label}</span></a>',
-                'label' => 'Пользователи',
-                'url' => ['/customer/index'],
-                'options' => ['class'=>\Yii::$app->user->can('customer') ? '' :'hide'],
-            ],
+//            [
+//                'label' => 'Фон',
+//                'url' => ['/bg/index'],
+//                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-picture"></i> <span>{label}</span></a>',
+//                'options' => ['class'=>\Yii::$app->user->can('bg')? '' :'hide']
+//            ],
+//            [
+//                'label' => 'Подписка',
+//                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-envelope"></i> <span>{label}</span></a>',
+//                'url' => ['/subscribe/index'],
+//                'options' => ['class'=>\Yii::$app->user->can('subscribe') ? '' :'hide'],
+//            ],
+//            [
+//                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-user"></i> <span>{label}</span></a>',
+//                'label' => 'Пользователи',
+//                'url' => ['/customer/index'],
+//                'options' => ['class'=>\Yii::$app->user->can('customer') ? '' :'hide'],
+//            ],
             [
                 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-comment"></i> <span>{label}</span></a>',
                 'label' => 'Комментарии',
                 'url' => ['/artbox-comments'],
                 'options' => ['class'=>\Yii::$app->user->can('artbox-comments') ? '' :'hide'],
             ],
-            [
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-comment"></i> <span>{label}</span></a>',
-                'label' => 'Обратная связь',
-                'url' => ['/feedback'],
-                'options' => ['class'=>\Yii::$app->user->can('feedback') ? '' :'hide'],
-            ],
+//            [
+//                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-comment"></i> <span>{label}</span></a>',
+//                'label' => 'Обратная связь',
+//                'url' => ['/feedback'],
+//                'options' => ['class'=>\Yii::$app->user->can('feedback') ? '' :'hide'],
+//            ],
             [
                 'label' => 'Настройка ролей',
                 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-cog"></i> <span>{label}</span></a>',
@@ -16,6 +16,12 @@ use mihaildev\elfinder\ElFinder;
     <?= $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
     <?= $form->field($model, 'translit')->textInput(['maxlength' => true]) ?>
+    
+    <?= $form->field($model, 'in_menu')->checkbox() ?>
+    
+    <?= $form->field($model, 'in_top_menu')->checkbox() ?>
+    
+    <?= $form->field($model, 'sort_order')->textInput() ?>
     <?= $form->field($model, 'body')->widget(CKEditor::className(),
         [
@@ -37,12 +43,6 @@ use mihaildev\elfinder\ElFinder;
     <?= $form->field($model, 'seo_text')->textarea(['rows' => 6]) ?>
     <?= $form->field($model, 'h1')->textInput(['maxlength' => true]) ?>
-    
-    <?= $form->field($model, 'in_menu')->checkbox() ?>
-
-    <?= $form->field($model, 'in_top_menu')->checkbox() ?>
-
-    <?= $form->field($model, 'sort_order')->textInput() ?>
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
@@ -81,11 +81,11 @@ class Articles extends \yii\db\ActiveRecord
     {
         return [
             'id' => 'ID',
-            'date' => 'Date',
-            'date_end' => 'Date end',
-            'title' => 'Title',
-            'body' => 'Body',
-            'body_preview' => 'Body preview',
+            'date' => 'Дата (Дата начала)',
+            'date_end' => '(Дата окончания)',
+            'title' => 'Название',
+            'body' => 'Текст',
+            'body_preview' => 'Текст (предпросмотр)',
             'image' => 'Image',
             'imageUrl' => Yii::t('app', 'Image'),
             'translit' => 'Translit',
@@ -94,6 +94,7 @@ class Articles extends \yii\db\ActiveRecord
             'meta_description' => 'Meta Description',
             'seo_text' => 'Seo Text',
             'h1' => 'H1',
+            'imageUpload' => 'Картинка',
         ];
     }
@@ -141,11 +141,11 @@
         {
             return [
                 'id'               => 'ID',
-                'date'             => 'Date',
+                'date'             => 'Дата публикации',
                 'date_end'         => 'Date end',
-                'title'            => 'Title',
-                'body'             => 'Body',
-                'body_preview'     => 'Body preview',
+                'title'            => 'Название',
+                'body'             => 'Текст',
+                'body_preview'     => 'Текс (предпросмотр)',
                 'image'            => 'Image',
                 'imageUrl'         => Yii::t('app', 'Image'),
                 'translit'         => 'Translit',
@@ -154,6 +154,8 @@
                 'meta_description' => 'Meta Description',
                 'seo_text'         => 'Seo Text',
                 'h1'               => 'H1',
+                'imageUpload'      => 'Картинка',
+                'categoryItems'    => 'Категории',
             ];
         }
@@ -25,7 +25,18 @@
                 ],
             ];
         }
-        
+    
+        /**
+         * @inheritdoc
+         * @return array
+         */
+        public function attributeLabels()
+        {
+            return [
+                'name' => 'Название категории',
+            ];
+        }
+    
         public static function tableName()
         {
             return 'blog_category';
@@ -100,16 +100,16 @@
             return [
                 'id'               => 'ID',
                 'translit'         => 'Translit',
-                'title'            => 'Title',
-                'body'             => 'Body',
+                'title'            => 'Название',
+                'body'             => 'Текст',
                 'meta_title'       => 'Meta Title',
                 'meta_keywords'    => 'Meta Keywords',
                 'meta_description' => 'Meta Description',
                 'seo_text'         => 'Seo Text',
                 'h1'               => 'H1',
-                'in_menu'          => 'Show in main menu',
-                'in_top_menu'      => 'Show in top menu',
-                'sort_order'       => 'Sort order',
+                'in_menu'          => 'Отображать в главном меню',
+                'in_top_menu'      => 'Отображать в верхнем меню',
+                'sort_order'       => 'Порядок сортировки',
             ];
         }
     }
@@ -54,25 +54,25 @@
                     return $statuses[$model->status];
                 }
             ],
-            [
-                'attribute' => 'rating_value',
-                'label' => $searchModel->getAttributeLabel('rating_value'),
-                'value' => function($model) {
-                    if(!empty($model->rating)) {
-                        return $model->rating->value;
-                    }
-                    return NULL;
-                }
-            ],
-            'entity',
-            'entity_id',
-            [
-                'attribute' => 'children_count',
-                'label' => $searchModel->getAttributeLabel('children_count'),
-                'value' => function($model) {
-                    return count($model->children);
-                }
-            ],
+//            [
+//                'attribute' => 'rating_value',
+//                'label' => $searchModel->getAttributeLabel('rating_value'),
+//                'value' => function($model) {
+//                    if(!empty($model->rating)) {
+//                        return $model->rating->value;
+//                    }
+//                    return NULL;
+//                }
+//            ],
+//            'entity',
+//            'entity_id',
+//            [
+//                'attribute' => 'children_count',
+//                'label' => $searchModel->getAttributeLabel('children_count'),
+//                'value' => function($model) {
+//                    return count($model->children);
+//                }
+//            ],
         ],
     ]);
     Pjax::end();
 \ No newline at end of file
@@ -109,15 +109,18 @@ class Category extends \yii\db\ActiveRecord
             'h1' => Yii::t('product', 'h1'),
             'seo_text' => Yii::t('product', 'Seo Text'),
             'product_unit_id' => Yii::t('product', 'Product Unit ID'),
-            'alias' => Yii::t('product', 'Alias'),
+            'alias' => 'url',
             'name' => Yii::t('product', 'Name'),
             'remote_id' => Yii::t('product', 'Remote ID'),
             'first_text' => 'Заголовок',
             'second_text' => 'Подзаголовок',
-            'new_collection' => 'Новая коллекция',
+            'new_collection' => 'Новая коллекция (для коллекций)',
             'brand_image' => 'Картинка бренда',
-            'stock_program' => 'Складская программа',
-            'on_order' => 'Под заказ',
+            'stock_program' => 'Складская программа (для брендов)',
+            'on_order' => 'Под заказ (для брендов)',
+            'imageUpload' => 'Картинка',
+            'brandImageUpload' => 'Картинка (бренда)'
+            
         ];
     }
@@ -37,6 +37,8 @@
      * @property TaxOption[]     $options
      * @property ProductVariant[] $variants
      * @property string $alias
+     * @property string $size
+     * @property string $material
      */
     class Product extends \yii\db\ActiveRecord
     {
@@ -92,7 +94,11 @@
                     'max' => 150,
                 ],
                 [
-                    [ 'alias' ],
+                    [
+                        'alias',
+                        'size',
+                        'material',
+                    ],
                     'string',
                     'max' => 250,
                 ],
@@ -138,12 +144,15 @@
                 // relation behavior field
                 'image'       => Yii::t('product', 'Image'),
                 'images'      => Yii::t('product', 'Images'),
-                'description' => Yii::t('product', 'Description'),
+                'description' => 'Описание',
                 'video'       => Yii::t('product', 'Video embeded'),
                 'variants'    => Yii::t('product', 'Variants'),
                 'is_top'      => Yii::t('product', 'Is top'),
                 'is_new'      => Yii::t('product', 'Is new'),
                 'akciya'      => Yii::t('product', 'Is promo'),
+                'imagesUpload'=> 'Картинки',
+                'size'        => 'Размер',
+                'material'    => 'Состав',
             ];
         }
@@ -23,20 +23,14 @@
     ]); ?>
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'is_top')->checkbox(['label' => 'ТОП']) ?>
-    <?= $form->field($model, 'is_new')->checkbox(['label' => 'Новинка']) ?>
+    
     <?= $form->field($model, 'akciya')->checkbox(['label' => 'Акционный']) ?>
-
+    
+    <?= $form->field($model, 'size')->textInput() ?>
+    
+    <?= $form->field($model, 'material')->textInput() ?>
+    
     <?= $form->field($model, 'description')->widget(\mihaildev\ckeditor\CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ], ]); ?>
-    <?= $form->field($model, 'video')->textarea(); ?>
-
-    <?= $form->field($model, 'brand_id')->dropDownList(
-        ArrayHelper::map(ProductHelper::getBrands()->all(), 'brand_id', 'name'),
-        [
-            'prompt' => Yii::t('product', 'Select brand')
-        ]
-    ) ?>
     <?= $form->field($model, 'categories')->widget(Select2::className(), [
             'data' => ArtboxTreeHelper::treeMap(ProductHelper::getCategories(), 'category_id', 'name'),
@@ -28,25 +28,25 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
             'name',
-            [
-                'label' => Yii::t('product', 'Brand'),
-                'attribute' => 'brand_name',
-                'value' => 'brand.name',
-                'format' => 'raw',
-                'filter' => Select2::widget([
-                    'model' => $searchModel,
-                    'attribute' => 'brand_id',
-                    'data' => ArrayHelper::map(ProductHelper::getBrands()->all(), 'brand_id', 'name'),
-                    'language' => 'ru',
-                    'options' => [
-                        'placeholder' => Yii::t('product', 'Select brand'),
-                        'multiple' => false,
-                    ],
-                    'pluginOptions' => [
-                        'allowClear' => true
-                    ],
-                ])
-            ],
+//            [
+//                'label' => Yii::t('product', 'Brand'),
+//                'attribute' => 'brand_name',
+//                'value' => 'brand.name',
+//                'format' => 'raw',
+//                'filter' => Select2::widget([
+//                    'model' => $searchModel,
+//                    'attribute' => 'brand_id',
+//                    'data' => ArrayHelper::map(ProductHelper::getBrands()->all(), 'brand_id', 'name'),
+//                    'language' => 'ru',
+//                    'options' => [
+//                        'placeholder' => Yii::t('product', 'Select brand'),
+//                        'multiple' => false,
+//                    ],
+//                    'pluginOptions' => [
+//                        'allowClear' => true
+//                    ],
+//                ])
+//            ],
             [
                 'label' => Yii::t('product', 'Category'),
                 'attribute' => 'category_name',
@@ -78,7 +78,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 'value' => 'variant.sku',
             ],
             'variant.price',
-            'variant.price_old',
+//            'variant.price_old',
             [
                 'label' => Yii::t('product', 'Stock'),
                 'attribute' => 'variant_stock',
@@ -86,21 +86,21 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             ],
             [
                 'class' => 'yii\grid\ActionColumn',
-                'template' => '{items} {view} |{is_top} {is_new} {akciya}  | {update} {delete}',
+                'template' => '{items} {view} {akciya} {update} {delete}',
                 'buttons' => [
-                    'is_top' => function ($url, $model) {
-                        return Html::a('<span class="glyphicon glyphicon-star' . ($model->is_top ? '' : '-empty') . '"></span>', $url, [
-                            'title' => Yii::t('product', ($model->is_top ? 'Set not is top' : 'Set is top')),
-                        ]);
-                    },
-                    'is_new' => function ($url, $model) {
-                        return Html::a('<span class="glyphicon glyphicon-heart' . ($model->is_new ? '' : '-empty') . '"></span>', $url, [
-                            'title' => Yii::t('product', ($model->is_new ? 'Set not is new' : 'Set is new')),
-                        ]);
-                    },
+//                    'is_top' => function ($url, $model) {
+//                        return Html::a('<span class="glyphicon glyphicon-star' . ($model->is_top ? '' : '-empty') . '"></span>', $url, [
+//                            'title' => Yii::t('product', ($model->is_top ? 'Set not is top' : 'Set is top')),
+//                        ]);
+//                    },
+//                    'is_new' => function ($url, $model) {
+//                        return Html::a('<span class="glyphicon glyphicon-heart' . ($model->is_new ? '' : '-empty') . '"></span>', $url, [
+//                            'title' => Yii::t('product', ($model->is_new ? 'Set not is new' : 'Set is new')),
+//                        ]);
+//                    },
                     'akciya' => function ($url, $model) {
-                        return Html::a('<span class="glyphicon glyphicon-tag' . ($model->akciya ? 's' : '') . '"></span>', $url, [
-                            'title' => Yii::t('product', ($model->akciya ? 'Set not is promotion' : 'Set is promotion')),
+                        return Html::a('<span class="glyphicon glyphicon-star' . ($model->akciya ? '' : '-empty') . '"></span>', $url, [
+                            'title' => Yii::t('product', ($model->akciya ? 'Отметить как не акционный' : 'Отметить как акционный')),
                         ]);
                     },
                     'items' => function ($url, $model) {
+<?php
+
+use yii\db\Migration;
+
+class m161007_134913_custom_baccara_fields extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('product', 'size', $this->string(255));
+        $this->addColumn('product', 'material', $this->string(255));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('product', 'material');
+        $this->dropColumn('product', 'size');
+    }
+}
@@ -58,8 +58,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         <ul>
             <li><span>Артикул:</span> <?php echo $variant->sku; ?></li>
-            <li><span>Размер:</span> 384 x 300 см</li>
-            <li><span>Состав:</span> 100% шелк</li>
+            <li><span>Размер:</span> <?php echo $product->size; ?></li>
+            <li><span>Состав:</span> <?php echo $product->material; ?></li>
         </ul>
     </div>
     <div style="clear:both;"></div>
@@ -58,8 +58,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         <ul>
             <li><span>Артикул:</span> <?php echo $variant->sku; ?></li>
-            <li><span>Размер:</span> 384 x 300 см</li>
-            <li><span>Состав:</span> 100% шелк</li>
+            <li><span>Размер:</span> <?php echo $product->size; ?></li>
+            <li><span>Состав:</span> <?php echo $product->material; ?></li>
         </ul>
     </div>
     <div style="clear:both;"></div>