From b7d40aed597aee597188060cf01c6d49bb9f57f2 Mon Sep 17 00:00:00 2001 From: yarik Date: Thu, 20 Oct 2016 01:12:36 +0300 Subject: [PATCH] Another one admin fix --- backend/views/layouts/main-sidebar.php | 19 +++++++++++-------- common/modules/rubrication/controllers/TaxGroupController.php | 24 +++++++++--------------- common/modules/rubrication/controllers/TaxOptionController.php | 64 ++++++++++++++++++++++++++++++++++++++-------------------------- common/modules/rubrication/models/TaxOption.php | 52 +++++++++++++++++++++++++++------------------------- common/modules/rubrication/models/TaxOptionSearch.php | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- common/modules/rubrication/views/tax-group/index.php | 41 ++++++++++++++++++++++------------------- common/modules/rubrication/views/tax-group/update.php | 14 ++++---------- common/modules/rubrication/views/tax-option/create.php | 19 ++++++++++++------- common/modules/rubrication/views/tax-option/index.php | 43 ++++++++++++++++++++++++++++++------------- common/modules/rubrication/views/tax-option/update.php | 21 +++++++++++++-------- 10 files changed, 252 insertions(+), 202 deletions(-) diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php index 4f41d2a..1ab5d82 100755 --- a/backend/views/layouts/main-sidebar.php +++ b/backend/views/layouts/main-sidebar.php @@ -6,9 +6,6 @@ use yii\widgets\Menu;
context->id); -// die(); - $items = [ [ 'label' => 'Заказы', @@ -34,43 +31,50 @@ use yii\widgets\Menu; [ 'label' => 'Товары', 'url' => ['/product/manage'], - 'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'] + 'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'], + 'active' => preg_match('/^manage.*$/', $this->context->id), ], [ 'label' => 'Доставка', 'url' => ['/delivery'], - 'options' => ['class'=>\Yii::$app->user->can('delivery') ? '' :'hide'] + 'options' => ['class'=>\Yii::$app->user->can('delivery') ? '' :'hide'], + 'active' => preg_match('/^delivery.*$/', $this->context->id), ], [ 'label' => 'Статус товара', 'url' => ['/label'], - 'options' => ['class'=>\Yii::$app->user->can('label') ? '' :'hide'] + 'options' => ['class'=>\Yii::$app->user->can('label') ? '' :'hide'], + 'active' => preg_match('/^label.*$/', $this->context->id), ], [ 'label' => 'Категории', 'url' => ['/category'], 'options' => ['class'=>\Yii::$app->user->can('category') ? '' :'hide'], - + 'active' => preg_match('/^category.*$/', $this->context->id), ], [ 'label' => 'Бренды', 'url' => ['/brand'], 'options' => ['class'=>\Yii::$app->user->can('brand') ? '' :'hide'], + 'active' => preg_match('/^brand.*$/', $this->context->id), ], [ 'label' => 'Единицы измерения', 'url' => ['/product/product-unit'], 'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'], + 'active' => preg_match('/^product-unit.*$/', $this->context->id), ], [ 'label' => 'Импорт товаров', 'url' => ['/product/manage/import'], 'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'], + 'active' => preg_match('/^import.*$/', $this->context->id), ], [ 'label' => 'Экспорт товаров', 'url' => ['/product/manage/export'], 'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'], + 'active' => preg_match('/^export.*$/', $this->context->id), ], [ 'label' => 'Характеристики Товаров', @@ -227,7 +231,6 @@ use yii\widgets\Menu; echo Menu::widget([ 'options' => ['class' => 'sidebar-menu'], 'submenuTemplate' => "\n\n", - 'items' =>$items, ]); diff --git a/common/modules/rubrication/controllers/TaxGroupController.php b/common/modules/rubrication/controllers/TaxGroupController.php index ba84ed2..efc7f95 100755 --- a/common/modules/rubrication/controllers/TaxGroupController.php +++ b/common/modules/rubrication/controllers/TaxGroupController.php @@ -42,6 +42,9 @@ { $dataProvider = new ActiveDataProvider([ 'query' => TaxGroup::find() + ->with('lang') + ->with('options') + ->with('categories') ->where([ 'level' => $level ]), ]); @@ -52,20 +55,6 @@ } /** - * Displays a single TaxGroup model. - * - * @param integer $id - * - * @return mixed - */ - public function actionView($level, $id) - { - return $this->render('view', [ - 'model' => $this->findModel($id), - ]); - } - - /** * Creates a new TaxGroup model. * If creation is successful, the browser will be redirected to the 'view' page. * @@ -118,6 +107,7 @@ return $this->render('update', [ 'model' => $model, 'model_langs' => $model->model_langs, + 'level' => $level, ]); } @@ -161,7 +151,11 @@ */ protected function findModel($id) { - if(( $model = TaxGroup::findOne($id) ) !== NULL) { + if(( $model = TaxGroup::find() + ->with('lang') + ->where([ 'tax_group_id' => $id ]) + ->one() ) !== NULL + ) { return $model; } else { throw new NotFoundHttpException('The requested page does not exist.'); diff --git a/common/modules/rubrication/controllers/TaxOptionController.php b/common/modules/rubrication/controllers/TaxOptionController.php index ac0733b..51c2521 100755 --- a/common/modules/rubrication/controllers/TaxOptionController.php +++ b/common/modules/rubrication/controllers/TaxOptionController.php @@ -37,10 +37,15 @@ */ public function actionIndex() { + $group = $this->findGroup(Yii::$app->request->queryParams[ 'group' ]); $searchModel = new TaxOptionSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); - - $group = TaxGroup::findOne(Yii::$app->request->queryParams[ 'group' ]); + $dataProvider->query->andWhere([ 'tax_group_id' => $group->tax_group_id ]); + if($group->level) { + $dataProvider->query->with('productVariants'); + } else { + $dataProvider->query->with('products'); + } return $this->render('index', [ 'searchModel' => $searchModel, @@ -50,32 +55,17 @@ } /** - * Displays a single TaxOption model. - * - * @param string $id - * - * @return mixed - */ - public function actionView($id) - { - $model = $this->findModel($id); - $group = TaxGroup::findOne($model->tax_group_id); - return $this->render('view', [ - 'model' => $model, - 'group' => $group, - ]); - } - - /** * Creates a new TaxOption model. * If creation is successful, the browser will be redirected to the 'view' page. * @return mixed */ public function actionCreate() { - $model = new TaxOption(); + $group = $this->findGroup(Yii::$app->request->queryParams[ 'group' ]); + $model = new TaxOption([ + 'tax_group_id' => $group->tax_group_id, + ]); $model->generateLangs(); - $group = TaxGroup::findOne(Yii::$app->request->queryParams[ 'group' ]); if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request); if($model->save() && $model->transactionStatus) { @@ -85,7 +75,6 @@ ]) : $this->redirect(array_merge([ 'create' ], Yii::$app->request->queryParams)); } } - $model->tax_group_id = $group->tax_group_id; if(!empty( Yii::$app->request->queryParams[ 'parent' ] )) { $model->parent_id = Yii::$app->request->queryParams[ 'parent' ]; } @@ -107,12 +96,12 @@ public function actionUpdate($id) { $model = $this->findModel($id); + $group = $this->findGroup($model->tax_group_id); $model->generateLangs(); - $group = TaxGroup::findOne($model->tax_group_id); if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request); -// TaxOption::find() -// ->rebuildMP($model->tax_group_id); + // TaxOption::find() + // ->rebuildMP($model->tax_group_id); if($model->save() && $model->transactionStatus) { return $this->redirect([ 'view', @@ -159,7 +148,30 @@ */ protected function findModel($id) { - if(( $model = TaxOption::findOne($id) ) !== NULL) { + if(( $model = TaxOption::find() + ->with('lang') + ->where([ 'tax_option_id' => $id ]) + ->one() ) !== NULL + ) { + return $model; + } else { + throw new NotFoundHttpException('The requested page does not exist.'); + } + } + + /** + * @param int $id + * + * @return null|TaxGroup + * @throws NotFoundHttpException + */ + protected function findGroup($id) + { + if(( $model = TaxGroup::find() + ->with('lang') + ->where([ 'tax_group_id' => $id ]) + ->one() ) !== NULL + ) { return $model; } else { throw new NotFoundHttpException('The requested page does not exist.'); diff --git a/common/modules/rubrication/models/TaxOption.php b/common/modules/rubrication/models/TaxOption.php index 1d4ac15..5f650db 100755 --- a/common/modules/rubrication/models/TaxOption.php +++ b/common/modules/rubrication/models/TaxOption.php @@ -5,6 +5,7 @@ use common\behaviors\SaveImgBehavior; use common\modules\language\behaviors\LanguageBehavior; use common\modules\product\models\Product; + use common\modules\product\models\ProductVariant; use Yii; use common\components\artboxtree\ArtboxTreeBehavior; use yii\db\ActiveQuery; @@ -13,26 +14,27 @@ /** * This is the model class for table "{{%tax_option}}". - * @property string $tax_option_id - * @property integer $tax_group_id - * @property integer $parent_id - * @property integer $tree - * @property string $path_int - * @property integer $depth - * @property integer $sort - * @property string $image - * @property TaxGroup $taxGroup - * @property TaxOption $parent - * @property TaxOption[] $taxOptions - * @property Product[] $products + * @property string $tax_option_id + * @property integer $tax_group_id + * @property integer $parent_id + * @property integer $tree + * @property string $path_int + * @property integer $depth + * @property integer $sort + * @property string $image + * @property TaxGroup $taxGroup + * @property TaxOption $parent + * @property TaxOption[] $taxOptions + * @property Product[] $products + * @property ProductVariant[] $productVariants * * From language behavior * - * @property TaxOptionLang $lang - * @property TaxOptionLang[] $langs - * @property TaxOptionLang $object_lang - * @property string $ownerKey - * @property string $langKey - * @property TaxOptionLang[] $model_langs - * @property bool $transactionStatus + * @property TaxOptionLang $lang + * @property TaxOptionLang[] $langs + * @property TaxOptionLang $object_lang + * @property string $ownerKey + * @property string $langKey + * @property TaxOptionLang[] $model_langs + * @property bool $transactionStatus * @method string getOwnerKey() * @method void setOwnerKey( string $value ) * @method string getLangKey() @@ -93,12 +95,6 @@ [ [ 'tax_group_id', - ], - 'required', - ], - [ - [ - 'tax_group_id', 'parent_id', 'sort', ], @@ -175,4 +171,10 @@ return $this->hasMany(Product::className(), [ 'product_id' => 'product_id' ]) ->viaTable('product_option', [ 'option_id' => 'tax_option_id' ]); } + + public function getProductVariants() + { + return $this->hasMany(ProductVariant::className(), [ 'product_variant_id' => 'product_variant_id' ]) + ->viaTable('product_variant_option', [ 'option_id' => 'tax_option_id' ]); + } } diff --git a/common/modules/rubrication/models/TaxOptionSearch.php b/common/modules/rubrication/models/TaxOptionSearch.php index 7d5e52d..838b61a 100755 --- a/common/modules/rubrication/models/TaxOptionSearch.php +++ b/common/modules/rubrication/models/TaxOptionSearch.php @@ -1,80 +1,95 @@ tax_group_id = intval($params['group']); - unset($params['group']); + + public $value; + + public function behaviors() + { + $behaviors = parent::behaviors(); + if(isset( $behaviors[ 'language' ] )) { + unset( $behaviors[ 'language' ] ); + } + return $behaviors; } - - $dataProvider = new ActiveDataProvider([ - 'query' => $query, - ]); - - $this->load($params); - -// if (!$this->validate()) { -// return $dataProvider; -// } - - // grid filtering conditions - $query->andFilterWhere([ - 'tax_option_id' => $this->tax_option_id, - 'tax_group_id' => $this->tax_group_id, - 'parent_id' => $this->parent_id, - 'sort' => $this->sort, - ]); - $query->orderBy(['path_int' => SORT_ASC, 'depth' => SORT_ASC, 'sort' => SORT_ASC]); - - return $dataProvider; + /** + * @inheritdoc + */ + public function rules() + { + return [ + [ + [ 'value' ], + 'safe', + ], + [ + [ 'tax_option_id' ], + 'integer', + ], + ]; + } + + /** + * @inheritdoc + */ + public function scenarios() + { + // bypass scenarios() implementation in the parent class + return Model::scenarios(); + } + + /** + * Creates data provider instance with search query applied + * + * @param array $params + * + * @return ActiveDataProvider + */ + public function search($params) + { + $query = TaxOption::find() + ->joinWith('lang'); + + $dataProvider = new ActiveDataProvider([ + 'query' => $query, + 'sort' => [ + 'attributes' => [ + 'tax_option_id', + 'value' => [ + 'asc' => [ 'tax_option_lang.value' => SORT_ASC ], + 'desc' => [ 'tax_option_lang.value' => SORT_DESC ], + ], + ], + ], + ]); + + $this->load($params); + + // if (!$this->validate()) { + // return $dataProvider; + // } + + // grid filtering conditions + $query->andFilterWhere([ + 'tax_option_id' => $this->tax_option_id, + ]) + ->andFilterWhere([ + 'like', + 'tax_option_lang.value', + $this->value, + ]); + + return $dataProvider; + } } -} diff --git a/common/modules/rubrication/views/tax-group/index.php b/common/modules/rubrication/views/tax-group/index.php index a196425..9074101 100755 --- a/common/modules/rubrication/views/tax-group/index.php +++ b/common/modules/rubrication/views/tax-group/index.php @@ -1,4 +1,5 @@ title = Yii::t('rubrication', 'Groups'); + $this->title = $level?Yii::t('rubrication', 'Modification Groups'):Yii::t('rubrication', 'Product Groups'); $this->params[ 'breadcrumbs' ][] = $this->title; ?> @@ -31,34 +32,39 @@ [ 'class' => 'yii\grid\SerialColumn' ], 'tax_group_id', 'is_filter:boolean', - + 'lang.name', + [ + 'label' => \Yii::t('rubrication', 'Options count'), + 'value' => function($model) { + /** + * @var TaxGroup $model + */ + return count($model->options); + } + ], + [ + 'label' => \Yii::t('rubrication', 'Categories count'), + 'value' => function($model) { + /** + * @var TaxGroup $model + */ + return count($model->categories); + } + ], [ 'class' => 'yii\grid\ActionColumn', - 'template' => '{update} {options} {relations} {delete} {rebuild}', + 'template' => '{update} {options} {delete}', 'buttons' => [ 'options' => function($url, $model) { return Html::a('', $url, [ 'title' => Yii::t('rubrication', 'Options'), ]); }, - 'relations' => function($url, $model) { - return Html::a('', $url, [ - 'title' => Yii::t('rubrication', 'Relations'), - ]); - }, - 'rebuild' => function($url, $model) { - return Html::a('', $url, [ - 'title' => Yii::t('rubrication', 'Rebuild cache'), - ]); - }, ], 'urlCreator' => function($action, $model, $key, $index) use ($level) { if($action === 'options') { $url = '/admin/rubrication/tax-option?group=' . $model->tax_group_id; return $url; - } elseif($action === 'relations') { - $url = '/admin/rubrication/tax-group/relation&id=' . $model->tax_group_id; - return $url; } elseif($action === 'update') { $url = Url::to([ '/rubrication/tax-group/update', @@ -73,9 +79,6 @@ 'id' => $model->tax_group_id, ]); return $url; - } elseif($action === 'rebuild') { - $url = '/admin/rubrication/tax-group/rebuild?id=' . $model->tax_group_id; - return $url; } return ''; }, diff --git a/common/modules/rubrication/views/tax-group/update.php b/common/modules/rubrication/views/tax-group/update.php index 47eefa0..401ff32 100755 --- a/common/modules/rubrication/views/tax-group/update.php +++ b/common/modules/rubrication/views/tax-group/update.php @@ -9,21 +9,15 @@ * @var View $this * @var TaxGroup $model * @var TaxGroupLang[] $model_langs + * @var int $level */ $this->title = Yii::t('rubrication', 'Update {modelClass}: ', [ 'modelClass' => 'Tax Group', - ]) . ' ' . $model->tax_group_id; + ]) . ' ' . $model->lang->name; $this->params[ 'breadcrumbs' ][] = [ - 'label' => Yii::t('rubrication', 'Groups'), - 'url' => [ 'index' ], - ]; - $this->params[ 'breadcrumbs' ][] = [ - 'label' => $model->tax_group_id, - 'url' => [ - 'view', - 'id' => $model->tax_group_id, - ], + 'label' => $level?Yii::t('rubrication', 'Modification Groups'):Yii::t('rubrication', 'Product Groups'), + 'url' => [ 'index', 'level' => $level ], ]; $this->params[ 'breadcrumbs' ][] = Yii::t('rubrication', 'Update'); ?> diff --git a/common/modules/rubrication/views/tax-option/create.php b/common/modules/rubrication/views/tax-option/create.php index f23688c..951c2a7 100755 --- a/common/modules/rubrication/views/tax-option/create.php +++ b/common/modules/rubrication/views/tax-option/create.php @@ -12,21 +12,26 @@ */ $this->title = Yii::t('rubrication', 'Create Tax Option'); $this->params[ 'breadcrumbs' ][] = [ - 'label' => Yii::t('rubrication', 'Groups'), - 'url' => [ 'tax-group/index' ], + 'label' => $group->level ? Yii::t('rubrication', 'Modification Groups') : Yii::t('rubrication', 'Product Groups'), + 'url' => [ + 'tax-group/index', + 'level' => $group->level, + ], ]; $this->params[ 'breadcrumbs' ][] = [ - 'label' => Yii::t('rubrication', $group->tax_group_id), + 'label' => $group->lang->name, 'url' => [ - 'index', - 'group' => $group->tax_group_id, + 'tax-group/update', + 'id' => $group->tax_group_id, + 'level' => $group->level, ], ]; $this->params[ 'breadcrumbs' ][] = [ - 'label' => Yii::t('rubrication', Yii::t('rubrication', 'Options of {name}', [ 'name' => $group->tax_group_id ])), + 'label' => Yii::t('rubrication', 'Options for group {group}', [ 'group' => $group->lang->name ]), 'url' => [ 'index', - 'group' => $group->tax_group_id, + 'group' => $group->tax_group_id, + 'level' => $group->level, ], ]; $this->params[ 'breadcrumbs' ][] = $this->title; diff --git a/common/modules/rubrication/views/tax-option/index.php b/common/modules/rubrication/views/tax-option/index.php index a1a7350..ddc042e 100755 --- a/common/modules/rubrication/views/tax-option/index.php +++ b/common/modules/rubrication/views/tax-option/index.php @@ -1,6 +1,7 @@ title = Yii::t('rubrication', 'Options for group "{group}"', [ 'group' => $group->tax_group_id ]); + $this->title = Yii::t('rubrication', 'Options for group {group}', [ 'group' => $group->lang->name ]); $this->params[ 'breadcrumbs' ][] = [ - 'label' => Yii::t('rubrication', 'Groups'), - 'url' => [ 'tax-group/index' ], + 'label' => $group->level ? Yii::t('rubrication', 'Modification Groups') : Yii::t('rubrication', 'Product Groups'), + 'url' => [ + 'tax-group/index', + 'level' => $group->level, + ], + ]; + $this->params[ 'breadcrumbs' ][] = [ + 'label' => $group->lang->name, + 'url' => [ + 'tax-group/update', + 'id' => $group->tax_group_id, + 'level' => $group->level, + ], ]; $this->params[ 'breadcrumbs' ][] = $this->title; ?> @@ -28,22 +40,27 @@ $dataProvider, + 'filterModel' => $searchModel, 'columns' => [ [ 'class' => 'yii\grid\SerialColumn' ], 'tax_option_id', [ + 'attribute' => 'value', + 'value' => 'lang.value', + ], + 'imageUrl:image', + [ + 'label' => $group->level?\Yii::t('rubrication', 'Variants count'):\Yii::t('rubrication', 'Products count'), + 'value' => function($model)use($group) { + /** + * @var TaxOption $model + */ + return count($group->level?$model->productVariants:$model->products); + } + ], + [ 'class' => 'yii\grid\ActionColumn', 'template' => '{update} {delete}', - 'urlCreator' => function($action, $model, $key, $index) { - if($action === 'update') { - $url = '/admin/rubrication/tax-option/update?id=' . $model->tax_option_id; - return $url; - } elseif($action === 'delete') { - $url = '/admin/rubrication/tax-option/delete?id=' . $model->tax_option_id; - return $url; - } - return ''; - }, ], ], ]); ?> diff --git a/common/modules/rubrication/views/tax-option/update.php b/common/modules/rubrication/views/tax-option/update.php index e2b28f5..d0d6613 100755 --- a/common/modules/rubrication/views/tax-option/update.php +++ b/common/modules/rubrication/views/tax-option/update.php @@ -12,26 +12,31 @@ */ $this->title = Yii::t('rubrication', 'Update {modelClass}: ', [ 'modelClass' => 'Tax Option', - ]) . ' ' . $model->tax_option_id; + ]) . ' ' . $model->lang->value; $this->params[ 'breadcrumbs' ][] = [ - 'label' => Yii::t('rubrication', 'Groups'), - 'url' => [ 'tax-group/index' ], + 'label' => $group->level ? Yii::t('rubrication', 'Modification Groups') : Yii::t('rubrication', 'Product Groups'), + 'url' => [ + 'tax-group/index', + 'level' => $group->level, + ], ]; $this->params[ 'breadcrumbs' ][] = [ - 'label' => $group->tax_group_id, + 'label' => $group->lang->name, 'url' => [ - 'view', - 'id' => $group->tax_group_id, + 'tax-group/update', + 'id' => $group->tax_group_id, + 'level' => $group->level, ], ]; $this->params[ 'breadcrumbs' ][] = [ - 'label' => Yii::t('rubrication', Yii::t('rubrication', 'Options of {name}', [ 'name' => $group->tax_group_id ])), + 'label' => Yii::t('rubrication', 'Options for group {group}', [ 'group' => $group->lang->name ]), 'url' => [ 'index', 'group' => $group->tax_group_id, + 'level' => $group->level, ], ]; - $this->params[ 'breadcrumbs' ][] = Yii::t('rubrication', 'Update'); + $this->params[ 'breadcrumbs' ][] = $this->title; ?>
-- libgit2 0.21.4