Importers CRUD

Administrator
1 parent 03bffb3b
Showing 19 changed files with 95 additions and 51 deletions Show diff stats
backend/controllers/MarginsImportersImportController.php
backend/controllers/OfficesController.php
backend/views/layouts/column.php
backend/views/margins-groups/_form.php
backend/views/margins-importers-import/_form.php
backend/views/margins-importers-import/create.php
backend/views/margins-importers-import/index.php
backend/views/margins-importers-import/update.php
backend/views/margins-importers/_form.php
backend/views/margins-importers/index.php
backend/views/offices/_form.php
backend/views/offices/create.php
backend/views/offices/index.php
backend/views/offices/update.php
common/models/MarginsGroupsSearch.php
common/models/MarginsImportersImport.php
common/models/MarginsImportersImportSearch.php
common/models/MarginsImportersSearch.php
common/models/Offices.php
@@ -2,6 +2,8 @@
 namespace backend\controllers;
+use backend\models\Importers;
+use common\models\Margins;
 use Yii;
 use common\models\MarginsImportersImport;
 use common\models\MarginsImportersImportSearch;
@@ -64,12 +66,15 @@ class MarginsImportersImportController extends Controller
     public function actionCreate()
     {
         $model = new MarginsImportersImport();
-
+        $importers= Importers::find()->all();
+        $margin = Margins::find()->all();
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('create', [
                 'model' => $model,
+                'importers' => $importers,
+                'margin'  => $margin,
             ]);
         }
     }
@@ -83,12 +88,15 @@ class MarginsImportersImportController extends Controller
     public function actionUpdate($id)
     {
         $model = $this->findModel($id);
-
+        $importers= Importers::find()->all();
+        $margin = Margins::find()->all();
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('update', [
                 'model' => $model,
+                'importers' => $importers,
+                'margin'  => $margin,
             ]);
         }
     }
@@ -2,6 +2,7 @@
 namespace backend\controllers;
+use common\models\DicCities;
 use Yii;
 use common\models\Offices;
 use common\models\OfficesSearch;
@@ -13,7 +14,7 @@ use yii\filters\VerbFilter;
  * OfficesController implements the CRUD actions for Offices model.
  */
 class OfficesController extends Controller
-{
+{    public $layout = "/column";
     public function behaviors()
     {
         return [
@@ -61,12 +62,13 @@ class OfficesController extends Controller
     public function actionCreate()
     {
         $model = new Offices();
-
+        $cities = DicCities::find()->all();
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('create', [
                 'model' => $model,
+                'cities' => $cities,
             ]);
         }
     }
@@ -80,12 +82,13 @@ class OfficesController extends Controller
     public function actionUpdate($id)
     {
         $model = $this->findModel($id);
-
+        $cities = DicCities::find()->all();
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('update', [
                 'model' => $model,
+                'cities' => $cities,
             ]);
         }
     }
@@ -316,7 +316,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                             ['label' => 'Категории товаров', 'url' => ['currency/index']],
                             ['label' => 'Vin коды', 'url' => ['currency/index']],
                             ['label' => 'Запросы по номеру', 'url' => ['currency/index']],
-                            ['label' => 'Офисы', 'url' => ['currency/index']],
+                            ['label' => 'Офисы', 'url' => ['offices/index']],
                         ],
                         ],
                         ['label' => 'Справочник', 'url' => ['#'], 'items' => [
@@ -11,9 +11,9 @@ use yii\helpers\ArrayHelper;
 <div class="margins-groups-form">
     <?php $form = ActiveForm::begin(); ?>
-    <?= $form->field($model, 'importer_id')->dropDownList(ArrayHelper::map($importers, 'id', 'name'), ['prompt' => 'Выберие город']) ?>
+    <?= $form->field($model, 'importer_id')->dropDownList(ArrayHelper::map($importers, 'id', 'name')) ?>
-    <?= $form->field($model, 'margin_id')->dropDownList(ArrayHelper::map($margin, 'id', 'name'), ['prompt' => 'Выберие город']) ?>
+    <?= $form->field($model, 'margin_id')->dropDownList(ArrayHelper::map($margin, 'id', 'name')) ?>
     <?= $form->field($model, 'group')->textInput(['maxlength' => true]) ?>
@@ -2,7 +2,7 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-
+use \yii\helpers\ArrayHelper;
 /* @var $this yii\web\View */
 /* @var $model common\models\MarginsImportersImport */
 /* @var $form yii\widgets\ActiveForm */
@@ -12,14 +12,13 @@ use yii\widgets\ActiveForm;
     <?php $form = ActiveForm::begin(); ?>
-    <?= $form->field($model, 'importer_id')->textInput() ?>
+    <?= $form->field($model, 'importer_id')->dropDownList(ArrayHelper::map($importers, 'id', 'name')) ?>
-    <?= $form->field($model, 'margin_id')->textInput() ?>
+    <?= $form->field($model, 'margin_id')->dropDownList(ArrayHelper::map($margin, 'id', 'name')) ?>
     <?= $form->field($model, 'koef')->textInput() ?>
-    <?= $form->field($model, 'finish')->textInput() ?>
-
+    <?= $form->field($model, 'finish')->checkbox() ?>
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
@@ -16,6 +16,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?= $this->render('_form', [
         'model' => $model,
+        'importers' => $importers,
+        'margin'  => $margin,
     ]) ?>
 </div>
@@ -25,9 +25,14 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
-            //'id',
-            'importer_id',
-            'margin_id',
+            [
+                'attribute' => 'importer_id',
+                'value' => 'importers.name'
+            ],
+            [
+                'attribute' => 'margin_id',
+                'value' => 'margins.name'
+            ],
             'koef',
             'finish',
@@ -16,6 +16,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = &#39;Update&#39;;
     <?= $this->render('_form', [
         'model' => $model,
+        'importers' => $importers,
+        'margin'  => $margin,
     ]) ?>
 </div>
@@ -12,9 +12,9 @@ use yii\helpers\ArrayHelper;
     <?php $form = ActiveForm::begin(); ?>
-    <?= $form->field($model, 'importer_id')->dropDownList(ArrayHelper::map($importers, 'id', 'name'), ['prompt' => 'Выберие город']) ?>
+    <?= $form->field($model, 'importer_id')->dropDownList(ArrayHelper::map($importers, 'id', 'name')) ?>
-    <?= $form->field($model, 'margin_id')->dropDownList(ArrayHelper::map($margin, 'id', 'name'), ['prompt' => 'Выберие город']) ?>
+    <?= $form->field($model, 'margin_id')->dropDownList(ArrayHelper::map($margin, 'id', 'name')) ?>
     <?= $form->field($model, 'koef')->textInput() ?>
@@ -25,8 +25,14 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
-            'importers.name',
-            'margins.name',
+            [
+                'attribute' => 'importer_id',
+                'value' => 'importers.name'
+            ],
+            [
+                'attribute' => 'margin_id',
+                'value' => 'margins.name'
+            ],
             'koef',
             ['class' => 'yii\grid\ActionColumn'],
@@ -16,11 +16,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'info')->textarea(['rows' => 6]) ?>
-    <?= $form->field($model, 'city_id')->textInput() ?>
-
-    <?= $form->field($model, 'is_default')->textInput() ?>
-
-    <?= $form->field($model, 'content_delete')->textarea(['rows' => 6]) ?>
+    <?= $form->field($model, 'city_id')->dropDownList(\yii\helpers\ArrayHelper::map($cities, 'id', 'name'), ['prompt' => 'Выберие город']) ?>
     <?= $form->field($model, 'coords')->textInput(['maxlength' => true]) ?>
@@ -16,6 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?= $this->render('_form', [
         'model' => $model,
+        'cities' => $cities,
     ]) ?>
 </div>
@@ -25,17 +25,17 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
-            'id',
             'name',
-            'info:ntext',
-            'city_id',
-            'is_default',
+            [
+                'attribute' => 'city_id',
+                'value' => 'dicCities.name'
+            ],
             // 'content_delete:ntext',
             // 'coords',
             // 'phones',
-            // 'address',
-            // 'email:email',
-            // 'skype',
+            'address',
+            'email:email',
+            'skype',
             ['class' => 'yii\grid\ActionColumn'],
         ],
@@ -16,6 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = &#39;Update&#39;;
     <?= $this->render('_form', [
         'model' => $model,
+        'cities' => $cities,
     ]) ?>
 </div>
@@ -68,7 +68,7 @@ class MarginsGroupsSearch extends MarginsGroups
         ]);
         $query->andFilterWhere(['like', 'group', $this->group]);
-        $query->andFilterWhere(['like', Importers::tableName().'name', $this->importer_id]);
+        $query->andFilterWhere(['like', Importers::tableName().'.name', $this->importer_id]);
         $query->andFilterWhere(['like', Margins::tableName().'.name', $this->margin_id]);
         return $dataProvider;
@@ -2,6 +2,7 @@
 namespace common\models;
+use backend\models\Importers;
 use Yii;
 /**
@@ -43,10 +44,20 @@ class MarginsImportersImport extends \yii\db\ActiveRecord
     {
         return [
             'id' => 'ID',
-            'importer_id' => 'Importer ID',
-            'margin_id' => 'Margin ID',
-            'koef' => 'Koef',
-            'finish' => 'Finish',
+            'importer_id' => 'Поставщик',
+            'margin_id' => 'Тип цены',
+            'koef' => 'Коэффициент',
+            'finish' => 'Активно',
         ];
     }
+
+    public function getImporters()
+    {
+        return $this->hasOne(Importers::className(), ['id' => 'importer_id']);
+    }
+
+    public function getMargins()
+    {
+        return $this->hasOne(Margins::className(), ['id' => 'margin_id']);
+    }
 }
@@ -2,6 +2,7 @@
 namespace common\models;
+use backend\models\Importers;
 use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
@@ -18,8 +19,9 @@ class MarginsImportersImportSearch extends MarginsImportersImport
     public function rules()
     {
         return [
-            [['id', 'importer_id', 'margin_id', 'finish'], 'integer'],
+            [['id', 'finish'], 'integer'],
             [['koef'], 'number'],
+            [[ 'importer_id', 'margin_id',], 'safe']
         ];
     }
@@ -54,15 +56,16 @@ class MarginsImportersImportSearch extends MarginsImportersImport
             // $query->where('0=1');
             return $dataProvider;
         }
-
+        $query->joinWith(['importers','margins']);
         $query->andFilterWhere([
             'id' => $this->id,
-            'importer_id' => $this->importer_id,
-            'margin_id' => $this->margin_id,
             'koef' => $this->koef,
             'finish' => $this->finish,
         ]);
+        $query->andFilterWhere(['like', Importers::tableName().'.name', $this->importer_id]);
+        $query->andFilterWhere(['like', Margins::tableName().'.name', $this->margin_id]);
+
         return $dataProvider;
     }
 }
@@ -2,6 +2,7 @@
 namespace common\models;
+use backend\models\Importers;
 use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
@@ -18,7 +19,8 @@ class MarginsImportersSearch extends MarginsImporters
     public function rules()
     {
         return [
-            [['id', 'importer_id', 'margin_id'], 'integer'],
+            [['id',], 'integer'],
+            [[ 'importer_id', 'margin_id',], 'safe'],
             [['koef'], 'number'],
         ];
     }
@@ -54,14 +56,14 @@ class MarginsImportersSearch extends MarginsImporters
             // $query->where('0=1');
             return $dataProvider;
         }
-
+        $query->joinWith(['importers','margins']);
         $query->andFilterWhere([
             'id' => $this->id,
-            'importer_id' => $this->importer_id,
-            'margin_id' => $this->margin_id,
             'koef' => $this->koef,
         ]);
+        $query->andFilterWhere(['like', Importers::tableName().'.name', $this->importer_id]);
+        $query->andFilterWhere(['like', Margins::tableName().'.name', $this->margin_id]);
         return $dataProvider;
     }
 }
@@ -52,16 +52,21 @@ class Offices extends \yii\db\ActiveRecord
     {
         return [
             'id' => 'ID',
-            'name' => 'Name',
-            'info' => 'Info',
-            'city_id' => 'City ID',
+            'name' => 'Название',
+            'info' => 'Описание',
+            'city_id' => 'Город',
             'is_default' => 'Is Default',
             'content_delete' => 'Content Delete',
-            'coords' => 'Coords',
-            'phones' => 'Phones',
-            'address' => 'Address',
+            'coords' => 'Координаты карты Google',
+            'phones' => 'Телефоны',
+            'address' => 'Адрес',
             'email' => 'Email',
             'skype' => 'Skype',
         ];
     }
+
+    public function getDicCities()
+    {
+        return $this->hasOne(DicCities::className(), ['id' => 'city_id']);
+    }
 }