From 30ea8a3591d8b8666869c49a414e873aa23d640d Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 5 Jul 2016 12:39:09 +0300 Subject: [PATCH] 29.06.16 --- backend/config/main.php | 7 +++++++ backend/views/layouts/main-sidebar.php | 20 +++++++++++++------- common/config/main.php | 4 ++-- common/modules/product/controllers/VariantController.php | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- common/modules/product/models/Category.php | 9 +++++++++ common/modules/product/models/ProductImage.php | 4 ++-- common/modules/product/models/ProductVariantListSearch.php | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/modules/product/views/variant/_form.php | 79 +++++++++++++++---------------------------------------------------------------- common/modules/product/views/variant/index.php | 39 +++++++++++++++++++++++++++++++++++++-- common/modules/product/views/variant/update.php | 4 ++-- common/modules/rubrication/controllers/TaxGroupController.php | 28 +++++++++++++++++----------- common/modules/rubrication/models/TaxGroup.php | 3 ++- common/modules/rubrication/models/TaxOption.php | 2 +- common/modules/rubrication/views/tax-group/index.php | 11 +++++++---- console/migrations/m160414_214746_add_level_to_tax_group.php | 26 ++++++++++++++++++++++++++ 15 files changed, 284 insertions(+), 111 deletions(-) create mode 100644 common/modules/product/models/ProductVariantListSearch.php create mode 100755 console/migrations/m160414_214746_add_level_to_tax_group.php diff --git a/backend/config/main.php b/backend/config/main.php index 31ce283..96e724e 100755 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -152,6 +152,13 @@ return [ 'rules' => [ 'slider-image///' => 'slider-image/', 'slider-image//' => 'slider-image/', + 'rubrication/tax-group/' => 'rubrication/tax-group', + 'rubrication/tax-group///' => 'rubrication/tax-group/', + 'rubrication/tax-group//' => 'rubrication/tax-group/', + 'product/manage/' => 'product/manage/', + 'product////' => 'product//', + 'product////' => 'product//', + 'product//' => 'product/', 'seo-dynamic///' => 'seo-dynamic/', 'seo-dynamic//' => 'seo-dynamic/', diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php index f098328..8c5449e 100755 --- a/backend/views/layouts/main-sidebar.php +++ b/backend/views/layouts/main-sidebar.php @@ -1,4 +1,5 @@