edit brand-replace page

Mihail
1 parent 2d4b1514
Showing 12 changed files with 48 additions and 25 deletions Show diff stats
backend/views/brands-replace/_form.php
backend/views/brands-replace/create.php
backend/views/brands-replace/index.php
backend/views/brands-replace/update.php
backend/views/brands-replace/view.php
backend/views/details/_form.php
backend/views/details/index.php
common/components/parsers/Converter.php
common/models/BrandsReplace.php
common/models/BrandsReplaceSearch.php
common/models/Details.php
frontend/tmp/sess_p4qt4plherihoah2i54pkdda02
@@ -16,12 +16,9 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'to_brand')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'finish')->textInput() ?>
-
-    <?= $form->field($model, 'timestamp')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Редактировать', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\BrandsReplace */
-$this->title = 'Добавить Brands Replace';
+$this->title = 'Добавить';
 $this->params['breadcrumbs'][] = ['label' => 'Brands Replaces', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -7,7 +7,7 @@ use yii\grid\GridView;
 /* @var $searchModel common\models\BrandsReplaceSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Brands Replaces';
+$this->title = 'Замена брендов';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="brands-replace-index">
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Добавить Brands Replace', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -28,7 +28,21 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'id',
             'from_brand',
             'to_brand',
-            'finish',
+            ['attribute' => 'finish',
+                'format' => 'raw',
+                'filter' => [
+                    '1'=>'Закончена',
+                    '0'=>'Не закончена',
+                ],
+                'value' => function($data){
+                    if($data->finish){
+                        $status_img = '<i style="color: #008000" class="glyphicon glyphicon-ok"></i>';
+                    } else {
+                        $status_img = '<i style="color: red" class="glyphicon glyphicon-remove"></i>';
+                    }
+                    return $status_img;
+                },
+            ],
             'timestamp',
             ['class' => 'yii\grid\ActionColumn'],
@@ -5,7 +5,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\BrandsReplace */
-$this->title = 'Update Brands Replace: ' . ' ' . $model->from_brand;
+$this->title = 'Редактирование: ' . ' ' . $model->from_brand;
 $this->params['breadcrumbs'][] = ['label' => 'Brands Replaces', 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->from_brand, 'url' => ['view', 'from_brand' => $model->from_brand, 'to_brand' => $model->to_brand]];
 $this->params['breadcrumbs'][] = 'Update';
@@ -15,8 +15,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <h1><?= Html::encode($this->title) ?></h1>
     <p>
-        <?= Html::a('Update', ['update', 'from_brand' => $model->from_brand, 'to_brand' => $model->to_brand], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a('Delete', ['delete', 'from_brand' => $model->from_brand, 'to_brand' => $model->to_brand], [
+        <?= Html::a('Редактировать', ['update', 'from_brand' => $model->from_brand, 'to_brand' => $model->to_brand], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a('Удалить', ['delete', 'from_brand' => $model->from_brand, 'to_brand' => $model->to_brand], [
             'class' => 'btn btn-danger',
             'data' => [
                 'confirm' => 'Are you sure you want to delete this item?',
@@ -12,9 +12,13 @@ use backend\models\Importers;
 <div class="details-form">
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin();
+    // первый элемент массива должен быть пустым
+    $arr_importers = [ null => '' ];
+    $arr_importers = array_merge( $arr_importers, ArrayHelper::map( Importers::find()->orderBy('name')->all(), 'id','name' ) );
+    ?>
-    <?= $form->field($model, 'IMPORT_ID')->dropDownList( ArrayHelper::map( Importers::find()->orderBy('name')->all(), 'id','name' ) ) ?>
+    <?= $form->field($model, 'IMPORT_ID')->dropDownList( $arr_importers ) ?>
     <?= $form->field($model, 'BRAND')->textInput(['maxlength' => true]) ?>
@@ -27,10 +27,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             ['class' => 'yii\grid\SerialColumn'],
             'ARTICLE',
             'BRAND',
-
             ['attribute' => 'IMPORT_ID',
-            'value' => function($model){return $model->importer;}],
-
+            'value' => function($model)
+            {
+                return $model->importer;
+            }
+            ],
             'DESCR',
             'BOX',
             'ADD_BOX',
@@ -44,7 +44,7 @@ class Converter implements ConverterInterface
         if ($value == '') {
             return '';
         }
-        $value = round((int)$value, 2);
+        $value = (int)$value;
         return $value;
     }
@@ -43,10 +43,10 @@ class BrandsReplace extends \yii\db\ActiveRecord
     {
         return [
             'id' => 'ID',
-            'from_brand' => 'From Brand',
-            'to_brand' => 'To Brand',
-            'finish' => 'Finish',
-            'timestamp' => 'Timestamp',
+            'from_brand' => 'Не правильный бренд',
+            'to_brand' => 'Правильный бренд',
+            'finish' => 'Замена закончена',
+            'timestamp' => 'Время',
         ];
     }
 }
@@ -19,7 +19,7 @@ class BrandsReplaceSearch extends BrandsReplace
     {
         return [
             [['id', 'finish'], 'integer'],
-            [['from_brand', 'to_brand', 'timestamp'], 'safe'],
+            [['from_brand', 'to_brand'], 'safe'],
         ];
     }
@@ -58,7 +58,6 @@ class BrandsReplaceSearch extends BrandsReplace
         $query->andFilterWhere([
             'id' => $this->id,
             'finish' => $this->finish,
-            'timestamp' => $this->timestamp,
         ]);
         $query->andFilterWhere(['like', 'from_brand', $this->from_brand])
@@ -52,7 +52,13 @@ class Details extends BaseActiveRecord
     public function getImporter ()
     {
-        return Importers::findOne(['id' => $this->IMPORT_ID])->name;
+        $importer = Importers::findOne(['id' => $this->IMPORT_ID]);
+        if ($importer) {
+            return $importer->name;
+        } else {
+            return null;
+        }
+
     }
     /**
@@ -83,7 +89,7 @@ class Details extends BaseActiveRecord
             'Importer' => Yii::t('app', 'ПОСТАВЩИК'),
             'BRAND' => Yii::t('app', 'БРЕНД'),
             'ARTICLE' => Yii::t('app', 'АРТИКУЛ'),
-            'FULL_ARTICLE' => Yii::t('app', 'Full  Article'),
+            'FULL_ARTICLE' => Yii::t('app', 'ПОЛНЫЙ АРТИКУЛ'),
             'PRICE' => Yii::t('app', 'ЦЕНА'),
             'DESCR' => Yii::t('app', 'ОПИСАНИЕ'),
             'BOX' => Yii::t('app', 'НАЛИЧИЕ'),
+__flash|a:0:{}__captcha/site/captcha|s:6:"jiwego";__captcha/site/captchacount|i:1;
 \ No newline at end of file