change query for check price view and action

Mihail
1 parent dd6fce49
Showing 4 changed files with 15 additions and 7 deletions Show diff stats
backend/components/parsers/CustomCsvParser.php
backend/controllers/ParserController.php
backend/models/Importer.php
backend/views/parser/checkPrice.php
@@ -11,7 +11,7 @@ namespace backend\components\parsers;
 class CustomCsvParser extends  \yii\multiparser\CsvParser {
-    public $last_line = 10;
+    //public $last_line = 10;
     //public $hasHeaderRow = true;
    // public $keys = ['first','second', 'third', 'forth', 'fifth'];
     public function setupConverter()
@@ -178,14 +178,15 @@ class ParserController extends BaseController
                         // попытаемся вставить данные в БД с апдейтом по ключам
                         $details_model->save($data);
-                        // 3. зафиксируем дату конца загрузки в файлах поставщика
+                        // 3. зафиксируем дату начала и конца загрузки в файлах поставщика (для ручной загрузки начало приравниваем time_start и update_date)
+                        $files_model->time_start = $update_date;
                         $files_model->time_end = date('Y-m-d H:i:s');
                        // CustomVarDamp::dumpAndDie($files_model);
                         $files_model->save();
                         // 4. зафиксируем дату загрузки в таблице поставщиков
                         $imp_model = Importer::findOne( $configuration['importer_id'] );
-                        $imp_model->price_date_update = ''.strtotime($update_date);
+                        $imp_model->price_date_update = $update_date;
                         if (!$imp_model->save()) {
                             CustomVarDamp::dumpAndDie( $imp_model->getErrors() );
@@ -220,7 +221,8 @@ class ParserController extends BaseController
     public function actionCheck_price ()
     {
-        $query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
+        //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
+        $query = Importer::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
         $provider = new ActiveDataProvider([
             'query' => $query,
@@ -54,7 +54,7 @@ class Importer extends BaseActiveRecord
             [['PARSER_FIELD_MULTIPLIER'], 'number'],
             [['code', 'name', 'name_price', 'delivery', 'email'], 'string', 'max' => 254],
             [['PARSER_FIELD_SIGN'], 'string', 'max' => 1],
-            [['price_date_update'], 'string', 'max' => 15],
+         //   [['price_date_update'], 'string', 'max' => 15],
             [['code'], 'unique'],
             [['name'], 'unique']
         ];
@@ -18,7 +18,13 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?= GridView::widget( ['dataProvider' => $dataProvider,
         'columns' => [['class' => SerialColumn::className()],
-                          'importer_id',
-                           'upload_time' ]] );?>
+            [
+                'label' =>'Поставщик',
+                'value' => function ($data) {
+                    return '№ ' . $data->id . $data->name;
+                },
+            ],
+                           ['label' =>'Дата обновления',
+                           'attribute' => 'price_date_update' ]]] );?>
 </div>
 \ No newline at end of file