From 5a29abd6f8cb151713b7644ff93e95c589b16a32 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 7 Oct 2016 16:44:18 +0300 Subject: [PATCH] -Admin panel prettify --- backend/controllers/BlogCategoryController.php | 0 backend/views/blog-category/_form.php | 0 backend/views/blog-category/_search.php | 0 backend/views/blog-category/create.php | 0 backend/views/blog-category/index.php | 0 backend/views/blog-category/update.php | 0 backend/views/blog-category/view.php | 0 backend/views/blog/_form.php | 5 ----- backend/views/category/_form.php | 12 ++++++------ backend/views/layouts/main-sidebar.php | 103 ++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------- backend/views/page/_form.php | 12 ++++++------ common/behaviors/DefaultVariantBehavior.php | 0 common/behaviors/ManyToManyBehavior.php | 0 common/models/Articles.php | 11 ++++++----- common/models/Blog.php | 10 ++++++---- common/models/BlogCategory.php | 13 ++++++++++++- common/models/BlogCategorySearch.php | 0 common/models/BlogToCategory.php | 0 common/models/Comments.php | 0 common/models/Page.php | 10 +++++----- common/modules/comment/views/manage/index.php | 38 +++++++++++++++++++------------------- common/modules/product/models/Category.php | 11 +++++++---- common/modules/product/views/manage/_form.php | 12 +----------- common/modules/product/views/manage/index.php | 66 +++++++++++++++++++++++++++++++++--------------------------------- console/migrations/m160928_104309_add_is_default_column_to_stock_table.php | 0 console/migrations/m160928_141017_add_main_page_column_to_slider.php | 0 console/migrations/m160928_151947_baccara_custom_category_columns.php | 0 console/migrations/m160929_141228_columns_for_page_table.php | 0 console/migrations/m160930_082338_add_categories_to_blog.php | 0 frontend/controllers/CommentsController.php | 0 frontend/controllers/DiscountController.php | 0 frontend/views/comments/index.php | 0 frontend/views/discount/discount.php | 0 frontend/views/discount/empty.php | 0 frontend/web/css/style.css | 0 frontend/web/images/arrow_down_bold.png | Bin 54583 -> 0 bytes frontend/web/images/close.png | Bin 54835 -> 0 bytes frontend/web/images/close_hover.png | Bin 54897 -> 0 bytes frontend/widgets/SliderWidget.php | 0 frontend/widgets/views/_slider_view.php | 0 source/ProductStock.php | 0 source/Stock.php | 0 source/VariantController.php | 0 source/actions.html | 0 44 files changed, 147 insertions(+), 156 deletions(-) mode change 100644 => 100755 backend/controllers/BlogCategoryController.php mode change 100644 => 100755 backend/views/blog-category/_form.php mode change 100644 => 100755 backend/views/blog-category/_search.php mode change 100644 => 100755 backend/views/blog-category/create.php mode change 100644 => 100755 backend/views/blog-category/index.php mode change 100644 => 100755 backend/views/blog-category/update.php mode change 100644 => 100755 backend/views/blog-category/view.php mode change 100644 => 100755 common/behaviors/DefaultVariantBehavior.php mode change 100644 => 100755 common/behaviors/ManyToManyBehavior.php mode change 100644 => 100755 common/models/BlogCategory.php mode change 100644 => 100755 common/models/BlogCategorySearch.php mode change 100644 => 100755 common/models/BlogToCategory.php mode change 100644 => 100755 common/models/Comments.php mode change 100644 => 100755 console/migrations/m160928_104309_add_is_default_column_to_stock_table.php mode change 100644 => 100755 console/migrations/m160928_141017_add_main_page_column_to_slider.php mode change 100644 => 100755 console/migrations/m160928_151947_baccara_custom_category_columns.php mode change 100644 => 100755 console/migrations/m160929_141228_columns_for_page_table.php mode change 100644 => 100755 console/migrations/m160930_082338_add_categories_to_blog.php mode change 100644 => 100755 frontend/controllers/CommentsController.php mode change 100644 => 100755 frontend/controllers/DiscountController.php mode change 100644 => 100755 frontend/views/comments/index.php mode change 100644 => 100755 frontend/views/discount/discount.php mode change 100644 => 100755 frontend/views/discount/empty.php mode change 100644 => 100755 frontend/web/css/style.css mode change 100644 => 100755 frontend/web/images/arrow_down_bold.png mode change 100644 => 100755 frontend/web/images/close.png mode change 100644 => 100755 frontend/web/images/close_hover.png mode change 100644 => 100755 frontend/widgets/SliderWidget.php mode change 100644 => 100755 frontend/widgets/views/_slider_view.php mode change 100644 => 100755 source/ProductStock.php mode change 100644 => 100755 source/Stock.php mode change 100644 => 100755 source/VariantController.php mode change 100644 => 100755 source/actions.html diff --git a/backend/controllers/BlogCategoryController.php b/backend/controllers/BlogCategoryController.php old mode 100644 new mode 100755 index ad21394..ad21394 --- a/backend/controllers/BlogCategoryController.php +++ b/backend/controllers/BlogCategoryController.php diff --git a/backend/views/blog-category/_form.php b/backend/views/blog-category/_form.php old mode 100644 new mode 100755 index f9b4fbb..f9b4fbb --- a/backend/views/blog-category/_form.php +++ b/backend/views/blog-category/_form.php diff --git a/backend/views/blog-category/_search.php b/backend/views/blog-category/_search.php old mode 100644 new mode 100755 index df88ac7..df88ac7 --- a/backend/views/blog-category/_search.php +++ b/backend/views/blog-category/_search.php diff --git a/backend/views/blog-category/create.php b/backend/views/blog-category/create.php old mode 100644 new mode 100755 index d9c4e78..d9c4e78 --- a/backend/views/blog-category/create.php +++ b/backend/views/blog-category/create.php diff --git a/backend/views/blog-category/index.php b/backend/views/blog-category/index.php old mode 100644 new mode 100755 index 5caa36d..5caa36d --- a/backend/views/blog-category/index.php +++ b/backend/views/blog-category/index.php diff --git a/backend/views/blog-category/update.php b/backend/views/blog-category/update.php old mode 100644 new mode 100755 index 7438663..7438663 --- a/backend/views/blog-category/update.php +++ b/backend/views/blog-category/update.php diff --git a/backend/views/blog-category/view.php b/backend/views/blog-category/view.php old mode 100644 new mode 100755 index 5e2cfe4..5e2cfe4 --- a/backend/views/blog-category/view.php +++ b/backend/views/blog-category/view.php diff --git a/backend/views/blog/_form.php b/backend/views/blog/_form.php index 61e7bfe..025198e 100755 --- a/backend/views/blog/_form.php +++ b/backend/views/blog/_form.php @@ -25,11 +25,6 @@ 'dateFormat' => 'dd-MM-yyyy', ]) ?> - field($model, 'date_end') - ->widget(DatePicker::className(), [ - 'dateFormat' => 'dd-MM-yyyy', - ]) ?> - field($model, 'title') ->textInput([ 'maxlength' => true ]) ?> diff --git a/backend/views/category/_form.php b/backend/views/category/_form.php index dd73f59..8fbd004 100755 --- a/backend/views/category/_form.php +++ b/backend/views/category/_form.php @@ -22,6 +22,10 @@ use kartik\select2\Select2; field($model, 'name')->textInput() ?> field($model, 'new_collection')->checkbox() ?> + + field($model, 'stock_program')->checkbox() ?> + + field($model, 'on_order')->checkbox() ?> field($model, 'first_text')->textInput() ?> @@ -30,11 +34,11 @@ use kartik\select2\Select2; field($model, 'alias')->textInput(['maxlength' => true]) ?> 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('Родительская категория') ?> - field($model, 'stock_program')->checkbox() ?> - - field($model, 'on_order')->checkbox() ?> -
isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> isNewRecord) :?> diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php index 8f9a6c3..a5374be 100755 --- a/backend/views/layouts/main-sidebar.php +++ b/backend/views/layouts/main-sidebar.php @@ -10,15 +10,15 @@ use yii\widgets\Menu; // die(); $items = [ - [ - 'label' => 'Заказы', - 'url' => ['/orders/index'], - 'template'=>' {label}', - 'options' => ['class'=>\Yii::$app->user->can('orders') ? '' :'hide'], - ], +// [ +// 'label' => 'Заказы', +// 'url' => ['/orders/index'], +// 'template'=>' {label}', +// 'options' => ['class'=>\Yii::$app->user->can('orders') ? '' :'hide'], +// ], [ 'label' => 'eCommerce', - 'template'=>' {label}', + 'template'=>' {label}', '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'=>' {label}', + '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'=>' {label}', + 'template'=>' {label}', 'url' => ['/articles/index'], 'options' => ['class'=>\Yii::$app->user->can('articles') ? '' :'hide'], ], - [ - 'label' => 'Акции', - 'template'=>' {label}', - 'url' => ['/event/index'], - 'options' => ['class'=>\Yii::$app->user->can('event') ? '' :'hide'], - ], +// [ +// 'label' => 'Акции', +// 'template'=>' {label}', +// 'url' => ['/event/index'], +// 'options' => ['class'=>\Yii::$app->user->can('event') ? '' :'hide'], +// ], [ 'label' => 'SEO', 'template'=>' {label}', @@ -148,36 +137,36 @@ use yii\widgets\Menu; ] ], - [ - 'label' => 'Фон', - 'url' => ['/bg/index'], - 'template'=>' {label}', - 'options' => ['class'=>\Yii::$app->user->can('bg')? '' :'hide'] - ], - [ - 'label' => 'Подписка', - 'template'=>' {label}', - 'url' => ['/subscribe/index'], - 'options' => ['class'=>\Yii::$app->user->can('subscribe') ? '' :'hide'], - ], - [ - 'template'=>' {label}', - 'label' => 'Пользователи', - 'url' => ['/customer/index'], - 'options' => ['class'=>\Yii::$app->user->can('customer') ? '' :'hide'], - ], +// [ +// 'label' => 'Фон', +// 'url' => ['/bg/index'], +// 'template'=>' {label}', +// 'options' => ['class'=>\Yii::$app->user->can('bg')? '' :'hide'] +// ], +// [ +// 'label' => 'Подписка', +// 'template'=>' {label}', +// 'url' => ['/subscribe/index'], +// 'options' => ['class'=>\Yii::$app->user->can('subscribe') ? '' :'hide'], +// ], +// [ +// 'template'=>' {label}', +// 'label' => 'Пользователи', +// 'url' => ['/customer/index'], +// 'options' => ['class'=>\Yii::$app->user->can('customer') ? '' :'hide'], +// ], [ 'template'=>' {label}', 'label' => 'Комментарии', 'url' => ['/artbox-comments'], 'options' => ['class'=>\Yii::$app->user->can('artbox-comments') ? '' :'hide'], ], - [ - 'template'=>' {label}', - 'label' => 'Обратная связь', - 'url' => ['/feedback'], - 'options' => ['class'=>\Yii::$app->user->can('feedback') ? '' :'hide'], - ], +// [ +// 'template'=>' {label}', +// 'label' => 'Обратная связь', +// 'url' => ['/feedback'], +// 'options' => ['class'=>\Yii::$app->user->can('feedback') ? '' :'hide'], +// ], [ 'label' => 'Настройка ролей', 'template'=>' {label}', diff --git a/backend/views/page/_form.php b/backend/views/page/_form.php index daf471a..e670b7d 100755 --- a/backend/views/page/_form.php +++ b/backend/views/page/_form.php @@ -16,6 +16,12 @@ use mihaildev\elfinder\ElFinder; field($model, 'title')->textInput(['maxlength' => true]) ?> field($model, 'translit')->textInput(['maxlength' => true]) ?> + + field($model, 'in_menu')->checkbox() ?> + + field($model, 'in_top_menu')->checkbox() ?> + + field($model, 'sort_order')->textInput() ?> field($model, 'body')->widget(CKEditor::className(), [ @@ -37,12 +43,6 @@ use mihaildev\elfinder\ElFinder; field($model, 'seo_text')->textarea(['rows' => 6]) ?> field($model, 'h1')->textInput(['maxlength' => true]) ?> - - field($model, 'in_menu')->checkbox() ?> - - field($model, 'in_top_menu')->checkbox() ?> - - field($model, 'sort_order')->textInput() ?>
isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> diff --git a/common/behaviors/DefaultVariantBehavior.php b/common/behaviors/DefaultVariantBehavior.php old mode 100644 new mode 100755 index ce5be67..ce5be67 --- a/common/behaviors/DefaultVariantBehavior.php +++ b/common/behaviors/DefaultVariantBehavior.php diff --git a/common/behaviors/ManyToManyBehavior.php b/common/behaviors/ManyToManyBehavior.php old mode 100644 new mode 100755 index 6e9d57d..6e9d57d --- a/common/behaviors/ManyToManyBehavior.php +++ b/common/behaviors/ManyToManyBehavior.php diff --git a/common/models/Articles.php b/common/models/Articles.php index a23ceec..6c47da1 100755 --- a/common/models/Articles.php +++ b/common/models/Articles.php @@ -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' => 'Картинка', ]; } diff --git a/common/models/Blog.php b/common/models/Blog.php index ed8728f..de98c23 100755 --- a/common/models/Blog.php +++ b/common/models/Blog.php @@ -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' => 'Категории', ]; } diff --git a/common/models/BlogCategory.php b/common/models/BlogCategory.php old mode 100644 new mode 100755 index 548e725..e408702 --- a/common/models/BlogCategory.php +++ b/common/models/BlogCategory.php @@ -25,7 +25,18 @@ ], ]; } - + + /** + * @inheritdoc + * @return array + */ + public function attributeLabels() + { + return [ + 'name' => 'Название категории', + ]; + } + public static function tableName() { return 'blog_category'; diff --git a/common/models/BlogCategorySearch.php b/common/models/BlogCategorySearch.php old mode 100644 new mode 100755 index 50ab904..50ab904 --- a/common/models/BlogCategorySearch.php +++ b/common/models/BlogCategorySearch.php diff --git a/common/models/BlogToCategory.php b/common/models/BlogToCategory.php old mode 100644 new mode 100755 index 6849b8e..6849b8e --- a/common/models/BlogToCategory.php +++ b/common/models/BlogToCategory.php diff --git a/common/models/Comments.php b/common/models/Comments.php old mode 100644 new mode 100755 index 50d1dd3..50d1dd3 --- a/common/models/Comments.php +++ b/common/models/Comments.php diff --git a/common/models/Page.php b/common/models/Page.php index b8329d5..1794869 100755 --- a/common/models/Page.php +++ b/common/models/Page.php @@ -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' => 'Порядок сортировки', ]; } } diff --git a/common/modules/comment/views/manage/index.php b/common/modules/comment/views/manage/index.php index dcd3f50..9c72868 100755 --- a/common/modules/comment/views/manage/index.php +++ b/common/modules/comment/views/manage/index.php @@ -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 diff --git a/common/modules/product/models/Category.php b/common/modules/product/models/Category.php index 6777f9e..76032fd 100755 --- a/common/modules/product/models/Category.php +++ b/common/modules/product/models/Category.php @@ -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' => 'Картинка (бренда)' + ]; } diff --git a/common/modules/product/views/manage/_form.php b/common/modules/product/views/manage/_form.php index 73f3176..5f581ba 100755 --- a/common/modules/product/views/manage/_form.php +++ b/common/modules/product/views/manage/_form.php @@ -23,20 +23,10 @@ ]); ?> field($model, 'name')->textInput(['maxlength' => true]) ?> - - field($model, 'is_top')->checkbox(['label' => 'ТОП']) ?> - field($model, 'is_new')->checkbox(['label' => 'Новинка']) ?> + field($model, 'akciya')->checkbox(['label' => 'Акционный']) ?> field($model, 'description')->widget(\mihaildev\ckeditor\CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ], ]); ?> - field($model, 'video')->textarea(); ?> - - field($model, 'brand_id')->dropDownList( - ArrayHelper::map(ProductHelper::getBrands()->all(), 'brand_id', 'name'), - [ - 'prompt' => Yii::t('product', 'Select brand') - ] - ) ?> field($model, 'categories')->widget(Select2::className(), [ 'data' => ArtboxTreeHelper::treeMap(ProductHelper::getCategories(), 'category_id', 'name'), diff --git a/common/modules/product/views/manage/index.php b/common/modules/product/views/manage/index.php index eace124..8f3008e 100755 --- a/common/modules/product/views/manage/index.php +++ b/common/modules/product/views/manage/index.php @@ -28,25 +28,25 @@ $this->params['breadcrumbs'][] = $this->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->params['breadcrumbs'][] = $this->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->params['breadcrumbs'][] = $this->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('', $url, [ - 'title' => Yii::t('product', ($model->is_top ? 'Set not is top' : 'Set is top')), - ]); - }, - 'is_new' => function ($url, $model) { - return Html::a('', $url, [ - 'title' => Yii::t('product', ($model->is_new ? 'Set not is new' : 'Set is new')), - ]); - }, +// 'is_top' => function ($url, $model) { +// return Html::a('', $url, [ +// 'title' => Yii::t('product', ($model->is_top ? 'Set not is top' : 'Set is top')), +// ]); +// }, +// 'is_new' => function ($url, $model) { +// return Html::a('', $url, [ +// 'title' => Yii::t('product', ($model->is_new ? 'Set not is new' : 'Set is new')), +// ]); +// }, 'akciya' => function ($url, $model) { - return Html::a('', $url, [ - 'title' => Yii::t('product', ($model->akciya ? 'Set not is promotion' : 'Set is promotion')), + return Html::a('', $url, [ + 'title' => Yii::t('product', ($model->akciya ? 'Отметить как не акционный' : 'Отметить как акционный')), ]); }, 'items' => function ($url, $model) { diff --git a/console/migrations/m160928_104309_add_is_default_column_to_stock_table.php b/console/migrations/m160928_104309_add_is_default_column_to_stock_table.php old mode 100644 new mode 100755 index 3d232e1..3d232e1 --- a/console/migrations/m160928_104309_add_is_default_column_to_stock_table.php +++ b/console/migrations/m160928_104309_add_is_default_column_to_stock_table.php diff --git a/console/migrations/m160928_141017_add_main_page_column_to_slider.php b/console/migrations/m160928_141017_add_main_page_column_to_slider.php old mode 100644 new mode 100755 index b73f1e3..b73f1e3 --- a/console/migrations/m160928_141017_add_main_page_column_to_slider.php +++ b/console/migrations/m160928_141017_add_main_page_column_to_slider.php diff --git a/console/migrations/m160928_151947_baccara_custom_category_columns.php b/console/migrations/m160928_151947_baccara_custom_category_columns.php old mode 100644 new mode 100755 index 8f9b707..8f9b707 --- a/console/migrations/m160928_151947_baccara_custom_category_columns.php +++ b/console/migrations/m160928_151947_baccara_custom_category_columns.php diff --git a/console/migrations/m160929_141228_columns_for_page_table.php b/console/migrations/m160929_141228_columns_for_page_table.php old mode 100644 new mode 100755 index 7ee7125..7ee7125 --- a/console/migrations/m160929_141228_columns_for_page_table.php +++ b/console/migrations/m160929_141228_columns_for_page_table.php diff --git a/console/migrations/m160930_082338_add_categories_to_blog.php b/console/migrations/m160930_082338_add_categories_to_blog.php old mode 100644 new mode 100755 index f475708..f475708 --- a/console/migrations/m160930_082338_add_categories_to_blog.php +++ b/console/migrations/m160930_082338_add_categories_to_blog.php diff --git a/frontend/controllers/CommentsController.php b/frontend/controllers/CommentsController.php old mode 100644 new mode 100755 index 4a7d581..4a7d581 --- a/frontend/controllers/CommentsController.php +++ b/frontend/controllers/CommentsController.php diff --git a/frontend/controllers/DiscountController.php b/frontend/controllers/DiscountController.php old mode 100644 new mode 100755 index dbfdadc..dbfdadc --- a/frontend/controllers/DiscountController.php +++ b/frontend/controllers/DiscountController.php diff --git a/frontend/views/comments/index.php b/frontend/views/comments/index.php old mode 100644 new mode 100755 index 273c8c2..273c8c2 --- a/frontend/views/comments/index.php +++ b/frontend/views/comments/index.php diff --git a/frontend/views/discount/discount.php b/frontend/views/discount/discount.php old mode 100644 new mode 100755 index 852a6d1..852a6d1 --- a/frontend/views/discount/discount.php +++ b/frontend/views/discount/discount.php diff --git a/frontend/views/discount/empty.php b/frontend/views/discount/empty.php old mode 100644 new mode 100755 index ff58473..ff58473 --- a/frontend/views/discount/empty.php +++ b/frontend/views/discount/empty.php diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css old mode 100644 new mode 100755 index 466acc8..466acc8 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css diff --git a/frontend/web/images/arrow_down_bold.png b/frontend/web/images/arrow_down_bold.png old mode 100644 new mode 100755 index 7d21b88..7d21b88 Binary files a/frontend/web/images/arrow_down_bold.png and b/frontend/web/images/arrow_down_bold.png differ diff --git a/frontend/web/images/close.png b/frontend/web/images/close.png old mode 100644 new mode 100755 index d4fff08..d4fff08 Binary files a/frontend/web/images/close.png and b/frontend/web/images/close.png differ diff --git a/frontend/web/images/close_hover.png b/frontend/web/images/close_hover.png old mode 100644 new mode 100755 index be0481d..be0481d Binary files a/frontend/web/images/close_hover.png and b/frontend/web/images/close_hover.png differ diff --git a/frontend/widgets/SliderWidget.php b/frontend/widgets/SliderWidget.php old mode 100644 new mode 100755 index 87dd563..87dd563 --- a/frontend/widgets/SliderWidget.php +++ b/frontend/widgets/SliderWidget.php diff --git a/frontend/widgets/views/_slider_view.php b/frontend/widgets/views/_slider_view.php old mode 100644 new mode 100755 index d983e88..d983e88 --- a/frontend/widgets/views/_slider_view.php +++ b/frontend/widgets/views/_slider_view.php diff --git a/source/ProductStock.php b/source/ProductStock.php old mode 100644 new mode 100755 index f6db347..f6db347 --- a/source/ProductStock.php +++ b/source/ProductStock.php diff --git a/source/Stock.php b/source/Stock.php old mode 100644 new mode 100755 index a4a80f1..a4a80f1 --- a/source/Stock.php +++ b/source/Stock.php diff --git a/source/VariantController.php b/source/VariantController.php old mode 100644 new mode 100755 index 35acda2..35acda2 --- a/source/VariantController.php +++ b/source/VariantController.php diff --git a/source/actions.html b/source/actions.html old mode 100644 new mode 100755 index c94f12e..c94f12e --- a/source/actions.html +++ b/source/actions.html -- libgit2 0.21.4