From 10e0f427440b7e9319c9fbf5b8544d1581ad4c0e Mon Sep 17 00:00:00 2001
From: Karnovsky A <Karnovsky.a@gmail.com>
Date: Wed, 1 Jun 2016 13:52:05 +0300
Subject: [PATCH] -

---
 common/modules/product/controllers/ManageController.php             |   8 +++++++-
 common/modules/product/controllers/ProductVariantTypeController.php | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/modules/product/models/import.php                            |   2 +-
 common/modules/product/views/product-variant-type/_form.php         |  25 +++++++++++++++++++++++++
 common/modules/product/views/product-variant-type/_search.php       |  31 +++++++++++++++++++++++++++++++
 common/modules/product/views/product-variant-type/create.php        |  21 +++++++++++++++++++++
 common/modules/product/views/product-variant-type/index.php         |  32 ++++++++++++++++++++++++++++++++
 common/modules/product/views/product-variant-type/update.php        |  23 +++++++++++++++++++++++
 common/modules/product/views/product-variant-type/view.php          |  37 +++++++++++++++++++++++++++++++++++++
 9 files changed, 301 insertions(+), 2 deletions(-)
 create mode 100644 common/modules/product/controllers/ProductVariantTypeController.php
 create mode 100644 common/modules/product/views/product-variant-type/_form.php
 create mode 100644 common/modules/product/views/product-variant-type/_search.php
 create mode 100644 common/modules/product/views/product-variant-type/create.php
 create mode 100644 common/modules/product/views/product-variant-type/index.php
 create mode 100644 common/modules/product/views/product-variant-type/update.php
 create mode 100644 common/modules/product/views/product-variant-type/view.php

diff --git a/common/modules/product/controllers/ManageController.php b/common/modules/product/controllers/ManageController.php
index 6b56c18..495ae00 100755
--- a/common/modules/product/controllers/ManageController.php
+++ b/common/modules/product/controllers/ManageController.php
@@ -268,7 +268,13 @@ class ManageController extends Controller
         if ($model->load(Yii::$app->request->post())) {
             $file = UploadedFile::getInstances($model, 'file');
             $method = 'go'. ucfirst($model->type);
-            if (!empty($file) && $model->validate()) {
+            if (empty($file)) {
+                $model->errors[] = 'File not upload';
+            } elseif ($method == 'goPrices' && $file[0]->name != 'file_1.csv') {
+                $model->errors[] = 'File need "file_1.csv"';
+            } elseif ($method == 'goProducts' && $file[0]->name == 'file_1.csv') {
+                $model->errors[] = 'File can not "file_1.csv"';
+            } elseif ($model->validate()) {
                 $file[0]->saveAs(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFile'. ucfirst($model->type)));
                 $model->$method();
             }
diff --git a/common/modules/product/controllers/ProductVariantTypeController.php b/common/modules/product/controllers/ProductVariantTypeController.php
new file mode 100644
index 0000000..840f498
--- /dev/null
+++ b/common/modules/product/controllers/ProductVariantTypeController.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace common\modules\product\controllers;
+
+use Yii;
+use common\modules\product\models\ProductVariantType;
+use common\modules\product\models\ProductVariantTypeSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * ProductVariantTypeController implements the CRUD actions for ProductVariantType model.
+ */
+class ProductVariantTypeController extends Controller
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all ProductVariantType models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new ProductVariantTypeSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single ProductVariantType model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new ProductVariantType model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new ProductVariantType();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->product_variant_type_id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing ProductVariantType model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->product_variant_type_id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing ProductVariantType model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the ProductVariantType model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return ProductVariantType the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = ProductVariantType::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/common/modules/product/models/import.php b/common/modules/product/models/import.php
index 6737fa2..f1de8f5 100644
--- a/common/modules/product/models/import.php
+++ b/common/modules/product/models/import.php
@@ -32,7 +32,7 @@ class Import extends Model {
         return [
             [['type'], 'required'],
             [['type'], 'string'],
-            [['file'], 'safe'],
+//            [['file'], 'safe'],
             [['file'], 'file', 'extensions' => 'csv'],
         ];
     }
diff --git a/common/modules/product/views/product-variant-type/_form.php b/common/modules/product/views/product-variant-type/_form.php
new file mode 100644
index 0000000..f0a7cfc
--- /dev/null
+++ b/common/modules/product/views/product-variant-type/_form.php
@@ -0,0 +1,25 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\ProductVariantType */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="product-variant-type-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'name2')->textInput(['maxlength' => true]) ?>
+
+    <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']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/common/modules/product/views/product-variant-type/_search.php b/common/modules/product/views/product-variant-type/_search.php
new file mode 100644
index 0000000..7b3cdec
--- /dev/null
+++ b/common/modules/product/views/product-variant-type/_search.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\ProductVariantTypeSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="product-variant-type-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'product_variant_type_id') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'name2') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('product', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('product', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/common/modules/product/views/product-variant-type/create.php b/common/modules/product/views/product-variant-type/create.php
new file mode 100644
index 0000000..e7d68c8
--- /dev/null
+++ b/common/modules/product/views/product-variant-type/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\ProductVariantType */
+
+$this->title = Yii::t('product', 'Create Product Variant Type');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Product Variant Types'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-variant-type-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/common/modules/product/views/product-variant-type/index.php b/common/modules/product/views/product-variant-type/index.php
new file mode 100644
index 0000000..4e44be0
--- /dev/null
+++ b/common/modules/product/views/product-variant-type/index.php
@@ -0,0 +1,32 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel common\modules\product\models\ProductVariantTypeSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('product', 'Product Variant Types');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-variant-type-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('product', 'Create Product Variant Type'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+            'name',
+            'name2',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+</div>
diff --git a/common/modules/product/views/product-variant-type/update.php b/common/modules/product/views/product-variant-type/update.php
new file mode 100644
index 0000000..d4eb6de
--- /dev/null
+++ b/common/modules/product/views/product-variant-type/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\ProductVariantType */
+
+$this->title = Yii::t('product', 'Update {modelClass}: ', [
+    'modelClass' => 'Product Variant Type',
+]) . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Product Variant Types'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->product_variant_type_id]];
+$this->params['breadcrumbs'][] = Yii::t('product', 'Update');
+?>
+<div class="product-variant-type-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/common/modules/product/views/product-variant-type/view.php b/common/modules/product/views/product-variant-type/view.php
new file mode 100644
index 0000000..1a54e27
--- /dev/null
+++ b/common/modules/product/views/product-variant-type/view.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\product\models\ProductVariantType */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('product', 'Product Variant Types'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-variant-type-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('product', 'Update'), ['update', 'id' => $model->product_variant_type_id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('product', 'Delete'), ['delete', 'id' => $model->product_variant_type_id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('product', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'product_variant_type_id',
+            'name',
+            'name2',
+        ],
+    ]) ?>
+
+</div>
--
libgit2 0.21.4