From 6fb4a7325edf0505f56f0738159524db0e804550 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 29 Sep 2016 10:53:08 +0300 Subject: [PATCH] Changes: - Slider integration - Default product variants update --- backend/views/category/_form.php | 4 ++++ common/modules/product/models/Category.php | 6 +++++- console/migrations/m160928_151947_baccara_custom_category_columns.php | 19 +++++++++++++++++++ frontend/controllers/CatalogController.php | 10 ++++++++++ frontend/views/catalog/products.php | 70 +++++++++++++++++++++++----------------------------------------------- 5 files changed, 61 insertions(+), 48 deletions(-) create mode 100644 console/migrations/m160928_151947_baccara_custom_category_columns.php diff --git a/backend/views/category/_form.php b/backend/views/category/_form.php index eae84ca..dd73f59 100755 --- a/backend/views/category/_form.php +++ b/backend/views/category/_form.php @@ -104,6 +104,10 @@ use kartik\select2\Select2; ) ]) ?> + 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/common/modules/product/models/Category.php b/common/modules/product/models/Category.php index 36241ac..22e5969 100755 --- a/common/modules/product/models/Category.php +++ b/common/modules/product/models/Category.php @@ -36,6 +36,8 @@ use yii\helpers\VarDumper; * @property Product[] $products * @property ProductUnit $productUnit * @property ProductCategory[] $productCategories + * @property boolean $stock_program + * @property boolean $on_order */ class Category extends \yii\db\ActiveRecord { @@ -84,7 +86,7 @@ class Category extends \yii\db\ActiveRecord [['imageUpload', 'brandImageUpload'], 'safe'], [['imageUpload', 'brandImageUpload'], 'file', 'extensions' => 'jpg, gif, png'], [['first_text', 'second_text'], 'string', 'max' => 255], - [['new_collection'], 'boolean'], + [['new_collection', 'stock_program', 'on_order'], 'boolean'], ]; } @@ -114,6 +116,8 @@ class Category extends \yii\db\ActiveRecord 'second_text' => 'Подзаголовок', 'new_collection' => 'Новая коллекция', 'brand_image' => 'Картинка бренда', + 'stock_program' => 'Складская программа', + 'on_order' => 'Под заказ', ]; } diff --git a/console/migrations/m160928_151947_baccara_custom_category_columns.php b/console/migrations/m160928_151947_baccara_custom_category_columns.php new file mode 100644 index 0000000..8f9b707 --- /dev/null +++ b/console/migrations/m160928_151947_baccara_custom_category_columns.php @@ -0,0 +1,19 @@ +addColumn('category', 'stock_program', $this->boolean()->defaultValue(false)); + $this->addColumn('category', 'on_order', $this->boolean()->defaultValue(false)); + + } + + public function down() + { + $this->dropColumn('category', 'stock_program'); + $this->dropColumn('category', 'on_order'); + } +} diff --git a/frontend/controllers/CatalogController.php b/frontend/controllers/CatalogController.php index b96936a..a586edd 100755 --- a/frontend/controllers/CatalogController.php +++ b/frontend/controllers/CatalogController.php @@ -152,6 +152,14 @@ class CatalogController extends \yii\web\Controller 'pageSize' => 15, ], ]); + $stockProgram = Category::find() + ->where([ + 'stock_program' => true, + ])->all(); + $onOrder = Category::find() + ->where([ + 'on_order' => true, + ])->all(); return $this->render('products', [ 'category' => $category, 'brandModel' => $brandModel, @@ -163,6 +171,8 @@ class CatalogController extends \yii\web\Controller 'productsProvider' => $dataProvider, 'groups' => $groups, 'priceLimits' => $priceLimits, + 'stockProgram' => $stockProgram, + 'onOrder' => $onOrder, ]); } diff --git a/frontend/views/catalog/products.php b/frontend/views/catalog/products.php index 272eed5..15593eb 100755 --- a/frontend/views/catalog/products.php +++ b/frontend/views/catalog/products.php @@ -5,9 +5,12 @@ * @var View $this * @var ActiveDataProvider $productsProvider * @var Category $category + * @var Category[] $stockProgram + * @var Category[] $onOrder */ use common\modules\product\models\Category; use yii\data\ActiveDataProvider; +use yii\helpers\Url; use yii\web\View; use yii\widgets\ListView; use frontend\widgets\FilterWidget; @@ -23,13 +26,16 @@ $this->params['breadcrumbs'][] = $this->title; Складская программа
@@ -37,46 +43,16 @@ $this->params['breadcrumbs'][] = $this->title; Под заказ
-- libgit2 0.21.4