Merge branch 'master' of gitlab.artweb.com.ua:root/test_1

Conflicts: backend/components/parsers/CustomCsvParser.php backend/components/parsers/config.php backend/config/main.php backend/controllers/CheckPriceController.php backend/controllers/ParserController.php backend/views/layouts/column.php backend/views/parser/index.php backend/views/parser/server-files.php backend/web/css/plugins/daterangepicker/daterangepicker-bs3.css backend/web/css/plugins/daterangepicker/daterangepicker.js backend/web/css/plugins/daterangepicker/moment.js backend/web/css/plugins/daterangepicker/moment.min.js console/config/main.php console/migrations/m150925_111922_add_foreign_key_ImportFiles.php framework/core/Convert.php framework/lang/da.yml framework/lang/fr.yml framework/lang/nb.yml vendor/yiisoft/multiparser/Converter.php vendor/yiisoft/multiparser/CsvParser.php vendor/yiisoft/multiparser/YiiMultiparser.php

Merge branch 'master' of gitlab.artweb.com.ua:root/test_1
Conflicts: backend/components/parsers/CustomCsvParser.php backend/components/parsers/config.php backend/config/main.php backend/controllers/CheckPriceController.php backend/controllers/ParserController.php backend/views/layouts/column.php backend/views/parser/index.php backend/views/parser/server-files.php backend/web/css/plugins/daterangepicker/daterangepicker-bs3.css backend/web/css/plugins/daterangepicker/daterangepicker.js backend/web/css/plugins/daterangepicker/moment.js backend/web/css/plugins/daterangepicker/moment.min.js console/config/main.php console/migrations/m150925_111922_add_foreign_key_ImportFiles.php framework/core/Convert.php framework/lang/da.yml framework/lang/fr.yml framework/lang/nb.yml vendor/yiisoft/multiparser/Converter.php vendor/yiisoft/multiparser/CsvParser.php vendor/yiisoft/multiparser/YiiMultiparser.php
Administrator
2 parents e4e4ce76 ead5cb60
Showing 24 changed files with 809 additions and 106 deletions Show diff stats
backend/components/parsers/CustomCsvParser.php
backend/components/parsers/config.php
backend/config/main.php
backend/controllers/CheckPriceController.php
backend/controllers/ParserController.php
backend/models/Importers.php
backend/views/parser/error.php
backend/views/parser/index.php
backend/views/parser/server-files.php
common/components/PriceWriter.php
common/models/WAccounts.php
common/models/WAccountsSearch.php
common/models/WDicCities.php
console/.gitignore
console/config/main.php
console/controllers/ParserController.php
console/migrations/m150925_111922_add_foreign_key_ImportFiles.php
console/migrations/m150929_110456_addTempTableUser.php
console/migrations/m150929_113358_change_Importer_dataPrice.php
framework/core/Convert.php
@@ -9,6 +9,8 @@
 namespace backend\components\parsers;
+use common\components\CustomVarDamp;
+
 class CustomCsvParser extends  \yii\multiparser\CsvParser {
     public $last_line = 10;
@@ -33,9 +35,8 @@ class CustomCsvParser extends  \yii\multiparser\CsvParser {
      */
     protected function convert($arr)
     {
-        $result = \Yii::$app->multiparser->convertByConfiguration( $arr, $this->converter_conf );
-
-        return $result;
+        $arr = \Yii::$app->multiparser->convertByConfiguration($arr, $this->converter_conf);
+        return $arr;
     }
 <?php
  return [
-     'global' =>
-         ['ini' => ['upload_max_filesize' => '20M',
-                    'post_max_size integer' => '30M',
-         ]],
      'csv' =>
          ['web' =>
              ['class' => 'backend\components\parsers\CustomCsvParser',
@@ -22,6 +18,27 @@
                  "ADD_BOX"=> 'В пути',
                  "GROUP"  => 'Группа RG'
              ],
+          'console' =>
+             ['class' => 'backend\components\parsers\CustomCsvParser',
+                 'auto_detect_first_line' => true,
+                 'hasHeaderRow' => true,
+                 'converter_conf' => ['class' => ' backend\components\parsers\CustomConverter',
+                     'hasKey' => 1,
+                     'configuration' => ["string"   => 'DESCR',
+                                         "float"   => 'PRICE',
+                                        "integer"   => ['BOX','ADD_BOX']
+                     ]
+             ],],
+
+             'basic_column' => [
+                 "BRAND"  => 'Бренд',
+                 "ARTICLE"=> 'Артикул',
+                 "PRICE"  => 'Цена',
+                 "DESCR"  => 'Наименование',
+                 "BOX"    => 'Колво',
+                 "ADD_BOX"=> 'В пути',
+                 "GROUP"  => 'Группа RG'
+             ],
              ],
       'xml' =>
          ['web' =>
@@ -28,7 +28,7 @@ return [
             ],
         ],
         'errorHandler' => [
-            'errorAction' => 'site/error',
+            'errorAction' => 'parser/error',
         ],
         'request'=>[
@@ -8,8 +8,8 @@ use yii\filters\AccessControl;
 use backend\components\base\BaseController;
 use yii\filters\VerbFilter;
 use backend\models\Details;
-use backend\models\ImporterFiles;
-use backend\models\Importer;
+use backend\models\ImportersFiles;
+use backend\models\Importers;
 use yii\base\ErrorException;
 use common\components\CustomVarDamp;
@@ -66,7 +66,11 @@ class CheckPriceController extends BaseController
         }
         //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
+<<<<<<< HEAD
         $query = Importer::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
+=======
+        $query = Importers::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
+>>>>>>> ead5cb60ac983cdb680ec70731de195b537be6cd
         $provider = new ActiveDataProvider([
             'query' => $query,
@@ -299,7 +299,7 @@ class ParserController extends BaseController
                     }
                 } else {
                     // Yii::$app->log->
-                    // не дошли до конца по этому остаки вернем в кеш
+                    // не дошли до конца по этому остатки вернем в кеш
                     Yii::$app->cache->set( 'files_to_parse',json_encode( $arr_id_files ) );
                 }
             }
+<?php
+
+namespace backend\models;
+
+use Yii;
+use backend\components\base\BaseActiveRecord;
+
+/**
+ * This is the model class for table "{{%importer}}".
+ *
+ * @property integer $id
+ * @property string $code
+ * @property string $name
+ * @property string $name_price
+ * @property string $currency_id
+ * @property string $delivery
+ * @property string $email
+ * @property string $info
+ * @property integer $active
+ * @property integer $PARSER_IS_ACTIVE
+ * @property string $PARSER_COLUMN_COUNT
+ * @property string $PARSER_FIELD_BRAND
+ * @property string $PARSER_FIELD_ARTICLE
+ * @property integer $PARSER_FIELD_ARTICLE_PREFIX
+ * @property string $PARSER_FIELD_PRICE
+ * @property string $PARSER_FIELD_DESCR
+ * @property string $PARSER_FIELD_BOX
+ * @property string $PARSER_FIELD_ADD_BOX
+ * @property string $PARSER_FIELD_GROUP_RG
+ * @property string $PARSER_FIELD_SIGN
+ * @property double $PARSER_FIELD_MULTIPLIER
+ * @property string $price_date_update
+ */
+class Importers extends BaseActiveRecord
+{
+
+    public function rules()
+    {
+        return [
+            [['code', 'name', 'currency_id', 'delivery', 'price_date_update'], 'required'],
+            [['name_price', 'email', 'PARSER_FIELD_SIGN', 'info'], 'safe'],
+            [['currency_id', 'active', 'PARSER_IS_ACTIVE', 'PARSER_COLUMN_COUNT', 'PARSER_FIELD_BRAND', 'PARSER_FIELD_ARTICLE', 'PARSER_FIELD_ARTICLE_PREFIX', 'PARSER_FIELD_PRICE', 'PARSER_FIELD_DESCR', 'PARSER_FIELD_BOX', 'PARSER_FIELD_ADD_BOX', 'PARSER_FIELD_GROUP_RG'], 'integer'],
+            [['info'], 'string'],
+            [['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],
+            [['code'], 'unique'],
+            [['name'], 'unique']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => Yii::t('app', 'ID'),
+            'code' => Yii::t('app', 'Code'),
+            'name' => Yii::t('app', 'Name'),
+            'name_price' => Yii::t('app', 'Name Price'),
+            'currency_id' => Yii::t('app', 'Currency ID'),
+            'delivery' => Yii::t('app', 'Delivery'),
+            'email' => Yii::t('app', 'Email'),
+            'info' => Yii::t('app', 'Info'),
+            'active' => Yii::t('app', 'Active'),
+            'PARSER_IS_ACTIVE' => Yii::t('app', 'Parser  Is  Active'),
+            'PARSER_COLUMN_COUNT' => Yii::t('app', 'Parser  Column  Count'),
+            'PARSER_FIELD_BRAND' => Yii::t('app', 'Parser  Field  Brand'),
+            'PARSER_FIELD_ARTICLE' => Yii::t('app', 'Parser  Field  Article'),
+            'PARSER_FIELD_ARTICLE_PREFIX' => Yii::t('app', 'Parser  Field  Article  Prefix'),
+            'PARSER_FIELD_PRICE' => Yii::t('app', 'Parser  Field  Price'),
+            'PARSER_FIELD_DESCR' => Yii::t('app', 'Parser  Field  Descr'),
+            'PARSER_FIELD_BOX' => Yii::t('app', 'Parser  Field  Box'),
+            'PARSER_FIELD_ADD_BOX' => Yii::t('app', 'Parser  Field  Add  Box'),
+            'PARSER_FIELD_GROUP_RG' => Yii::t('app', 'Parser  Field  Group  Rg'),
+            'PARSER_FIELD_SIGN' => Yii::t('app', 'Parser  Field  Sign'),
+            'PARSER_FIELD_MULTIPLIER' => Yii::t('app', 'Parser  Field  Multiplier'),
+            'price_date_update' => Yii::t('app', 'Price Date Update'),
+        ];
+    }
+
+
+    public function getKeys ()
+    {
+        // возьмем только поля описанные в fields() - там как раз наши настройки парсера
+        $arr = $this->toArray();
+        // отсортируем по ключам с учетом преобразования в число
+        asort($arr, SORT_NUMERIC);
+        // уберем нулевые колонки
+        $arr = array_filter($arr, function($val){
+            return $val <> '0';
+        });
+        // нам нужны именно ключи
+        $arr = array_keys($arr);
+        return $arr;
+
+    }
+
+    public function fields()
+    {
+        return [
+            'BRAND' => 'PARSER_FIELD_BRAND',
+            'ARTICLE' => 'PARSER_FIELD_ARTICLE',
+            'PRICE' => 'PARSER_FIELD_PRICE',
+            'DESCR' => 'PARSER_FIELD_DESCR',
+            'BOX' => 'PARSER_FIELD_BOX',
+            'ADD_BOX' => 'PARSER_FIELD_ADD_BOX',
+            'GROUP_RG' => 'PARSER_FIELD_GROUP_RG'
+        ];
+
+    }
+
+
+}
+<?php
+
+/* @var $this yii\web\View */
+/* @var $name string */
+/* @var $message string */
+/* @var $exception Exception */
+
+use yii\helpers\Html;
+
+$this->title = $name;
+?>
+<div class="site-error">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <div class="alert alert-danger">
+        <?= nl2br(Html::encode($message)) ?>
+    </div>
+
+    <p>
+
+    </p>
+    <p>
+    </p>
+
+</div>
 <?php
 use yii\widgets\ActiveForm;
 use yii\helpers\Html;
-use backend\models\Importer;
+use backend\models\Importers;
 use yii\helpers\ArrayHelper;
 if ( $model->mode ) {
     // авто загрузка
@@ -27,7 +27,7 @@ if ( $model-&gt;mode ) {
         <h3>Загрузка прайсов поставщиков</h3>
-        <?= $form->field($model, 'importer_id')->dropDownList(ArrayHelper::map( Importer::find()->all(), 'id','name' )); ?>
+        <?= $form->field($model, 'importer_id')->dropDownList(ArrayHelper::map( Importers::find()->all(), 'id','name' )); ?>
         <?php if ( !$mode ) {
             echo $form->field($model, 'delete_price')->checkbox(['label' => 'Загрузить с удалением старого прайса']);
 <?php
 use yii\helpers\Html;
+use yii\helpers\Url;
 use yii\grid\GridView;
 use yii\grid\SerialColumn;
 use yii\grid\ActionColumn;
@@ -44,7 +45,7 @@ Pjax::begin([&#39;id&#39; =&gt; &#39;server_files_grid&#39;]);
             ]] );?>
-
+        <?= Html::a('Загрузить файлы', ['parse'],['class' => 'btn btn-success']) ?>
     </div>
 <?php
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Cibermag
+ * Date: 30.09.2015
+ * Time: 9:34
+ */
+
+namespace common\components;
+
+
+use yii\base\ErrorException;
+use backend\models\ImportersFiles;
+use backend\models\Importers;
+use backend\models\Details;
+
+class PriceWriter {
+    public $mode;
+    public $configuration;
+    public $data;
+   // public $errors = [];
+
+    public function writeDataToDB ()
+    {
+        // 1. запишем дату старта в таблицу файлов поставщика (ImportersFiles)
+        // id  загруженного файла получим из конфигурации
+        $files_model = ImportersFiles::findOne( $this->configuration['record_id'] );
+
+        //$files_model->load(['ImportersFiles' => $this->configuration->toArray()]);
+        $update_date = date('Y-m-d H:i:s');
+        $files_model->time_start = $update_date;
+        // запишем дату начала загрузки
+        if (!$files_model->save()) {
+            $this->errors[] = implode( ', ', $files_model->getErrors());
+            return false;
+            //CustomVarDamp::dumpAndDie($files_model->implode ( ', ', getErrors())());
+        }
+
+
+        // 2. запишем полученные данные в таблицу товаров (Details)
+        $details_model = new Details();
+        // преобразуем числовые значения
+        foreach ($this->data as &$row) {
+            $row['PRICE'] = \Yii::$app->multiparser->convertToFloat($row['PRICE']);
+            $row['BOX'] = \Yii::$app->multiparser->convertToInteger($row['BOX']);
+            // присвоим полный артикул
+            $row['FULL_ARTICLE'] = $row['ARTICLE'];
+            if(isset($row['ADD_BOX']))
+                $row['ADD_BOX'] = \Yii::$app->multiparser->convertToInteger($row['ADD_BOX']);
+
+            // проверим все ли обязательные колонки были указаны пользователем
+            $details_model->load(['Details' => $row]);
+
+            if (!$details_model->validate())
+                break;
+        }
+
+        if ($details_model->hasErrors()) {
+            //@todo предоставить более детальную информацию об ошибке
+            throw new \ErrorException('Ошибка записи товаров');
+        }
+            else{
+            // дополним данные значением импортера и даты обновления цены
+            $this->data = \Yii::$app->multiparser->addColumns($this->data, ['IMPORT_ID' => $this->configuration['importer_id'], 'timestamp' => $update_date]);
+
+            try {
+                //@todo add transaction
+                // попытаемся вставить данные в БД с апдейтом по ключам
+                $details_model->ManualInsert($this->data);
+
+                // 3. зафиксируем дату конца загрузки в файлах поставщика
+
+                $files_model->time_end = date('Y-m-d H:i:s');
+                // CustomVarDamp::dumpAndDie($files_model);
+                if (!$files_model->save()) {
+                    throw new \ErrorException(implode( ', ', $files_model->getErrors()));
+//                    $this->errors[] = $files_model->implode ( ', ', getErrors());
+//                    return false;
+                   // CustomVarDamp::dumpAndDie($files_model->implode ( ', ', getErrors())());
+                }
+
+                // 4. зафиксируем дату загрузки в таблице поставщиков
+                $imp_model = Importers::findOne($this->configuration['importer_id']);
+                $imp_model->price_date_update = $update_date;
+
+                if (!$imp_model->save()) {
+//                    $this->errors[] = $imp_model->implode ( ', ', getErrors())();
+//                    return false;
+                    throw new \ErrorException(implode( ', ', $imp_model->getErrors()));
+                   // CustomVarDamp::dumpAndDie($imp_model->implode ( ', ', getErrors())());
+                }
+
+
+            } catch (ErrorException  $e) {
+                //CustomVarDamp::dump($e->getMessage());
+                throw new \ErrorException( $e->getMessage() );
+            }
+        }
+
+
+        return true;
+    }
+}
 \ No newline at end of file
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "w_accounts".
+ *
+ * @property integer $id
+ * @property integer $if_manager
+ * @property string $email
+ * @property string $pass
+ * @property integer $margin_id
+ * @property string $name
+ * @property string $phones
+ * @property integer $country
+ * @property integer $city
+ * @property string $address
+ * @property string $comment
+ * @property integer $rating
+ * @property string $dt
+ * @property integer $is_active
+ * @property integer $is_firm
+ * @property string $last_loginin
+ * @property string $firm_inn
+ * @property string $firm_bank
+ * @property double $balance
+ * @property integer $office_id
+ * @property integer $is_scribe
+ * @property integer $set_manager_id
+ * @property string $phones2
+ * @property string $phones3
+ * @property integer $car
+ * @property integer $mod
+ * @property string $snumb
+ * @property integer $deliveries
+ * @property integer $scode
+ * @property string $firm_ur_adr
+ * @property string $firm_fiz_adr
+ * @property string $firm_code_eg
+ * @property string $firm_rs
+ * @property string $firm_mfo
+ * @property string $firm_site
+ * @property string $company
+ */
+class WAccounts extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'w_accounts';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['if_manager', 'margin_id', 'country', 'city', 'rating', 'dt', 'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'],
+            [['email', 'pass', 'name', 'phones', 'comment', 'dt', 'set_manager_id'], 'required'],
+            [['comment'], 'string'],
+            [['balance'], 'number'],
+            [['email', 'name', 'firm_site'], 'string', 'max' => 150],
+            [['pass'], 'string', 'max' => 30],
+            [['phones', 'phones2', 'phones3'], 'string', 'max' => 50],
+            [['address', 'firm_inn', 'firm_bank'], 'string', 'max' => 254],
+            [['last_loginin'], 'string', 'max' => 15],
+            [['snumb', 'firm_ur_adr', 'firm_fiz_adr', 'firm_code_eg', 'firm_rs', 'firm_mfo', 'company'], 'string', 'max' => 255],
+            [['email'], 'unique']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => Yii::t('app', 'ID'),
+            'if_manager' => Yii::t('app', 'If Manager'),
+            'email' => Yii::t('app', 'Email'),
+            'pass' => Yii::t('app', 'Pass'),
+            'margin_id' => Yii::t('app', 'Margin ID'),
+            'name' => Yii::t('app', 'Name'),
+            'phones' => Yii::t('app', 'Phones'),
+            'country' => Yii::t('app', 'Country'),
+            'city' => Yii::t('app', 'City'),
+            'address' => Yii::t('app', 'Address'),
+            'comment' => Yii::t('app', 'Comment'),
+            'rating' => Yii::t('app', 'Rating'),
+            'dt' => Yii::t('app', 'Dt'),
+            'is_active' => Yii::t('app', 'Is Active'),
+            'is_firm' => Yii::t('app', 'Is Firm'),
+            'last_loginin' => Yii::t('app', 'Last Loginin'),
+            'firm_inn' => Yii::t('app', 'Firm Inn'),
+            'firm_bank' => Yii::t('app', 'Firm Bank'),
+            'balance' => Yii::t('app', 'Balance'),
+            'office_id' => Yii::t('app', 'Office ID'),
+            'is_scribe' => Yii::t('app', 'Is Scribe'),
+            'set_manager_id' => Yii::t('app', 'Set Manager ID'),
+            'phones2' => Yii::t('app', 'Phones2'),
+            'phones3' => Yii::t('app', 'Phones3'),
+            'car' => Yii::t('app', 'Car'),
+            'mod' => Yii::t('app', 'Mod'),
+            'snumb' => Yii::t('app', 'Snumb'),
+            'deliveries' => Yii::t('app', 'Deliveries'),
+            'scode' => Yii::t('app', 'Scode'),
+            'firm_ur_adr' => Yii::t('app', 'Firm Ur Adr'),
+            'firm_fiz_adr' => Yii::t('app', 'Firm Fiz Adr'),
+            'firm_code_eg' => Yii::t('app', 'Firm Code Eg'),
+            'firm_rs' => Yii::t('app', 'Firm Rs'),
+            'firm_mfo' => Yii::t('app', 'Firm Mfo'),
+            'firm_site' => Yii::t('app', 'Firm Site'),
+            'company' => Yii::t('app', 'Company'),
+        ];
+    }
+}
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\WAccounts;
+
+/**
+ * WAccountsSearch represents the model behind the search form about `common\models\WAccounts`.
+ */
+class WAccountsSearch extends WAccounts
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id', 'if_manager', 'margin_id', 'country', 'city', 'rating', 'dt', 'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'],
+            [['email', 'pass', 'name', 'phones', 'address', 'comment', 'last_loginin', 'firm_inn', 'firm_bank', 'phones2', 'phones3', 'snumb', 'firm_ur_adr', 'firm_fiz_adr', 'firm_code_eg', 'firm_rs', 'firm_mfo', 'firm_site', 'company'], 'safe'],
+            [['balance'], 'number'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = WAccounts::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id' => $this->id,
+            'if_manager' => $this->if_manager,
+            'margin_id' => $this->margin_id,
+            'country' => $this->country,
+            'city' => $this->city,
+            'rating' => $this->rating,
+            'dt' => $this->dt,
+            'is_active' => $this->is_active,
+            'is_firm' => $this->is_firm,
+            'balance' => $this->balance,
+            'office_id' => $this->office_id,
+            'is_scribe' => $this->is_scribe,
+            'set_manager_id' => $this->set_manager_id,
+            'car' => $this->car,
+            'mod' => $this->mod,
+            'deliveries' => $this->deliveries,
+            'scode' => $this->scode,
+        ]);
+
+        $query->andFilterWhere(['like', 'email', $this->email])
+            ->andFilterWhere(['like', 'pass', $this->pass])
+            ->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'phones', $this->phones])
+            ->andFilterWhere(['like', 'address', $this->address])
+            ->andFilterWhere(['like', 'comment', $this->comment])
+            ->andFilterWhere(['like', 'last_loginin', $this->last_loginin])
+            ->andFilterWhere(['like', 'firm_inn', $this->firm_inn])
+            ->andFilterWhere(['like', 'firm_bank', $this->firm_bank])
+            ->andFilterWhere(['like', 'phones2', $this->phones2])
+            ->andFilterWhere(['like', 'phones3', $this->phones3])
+            ->andFilterWhere(['like', 'snumb', $this->snumb])
+            ->andFilterWhere(['like', 'firm_ur_adr', $this->firm_ur_adr])
+            ->andFilterWhere(['like', 'firm_fiz_adr', $this->firm_fiz_adr])
+            ->andFilterWhere(['like', 'firm_code_eg', $this->firm_code_eg])
+            ->andFilterWhere(['like', 'firm_rs', $this->firm_rs])
+            ->andFilterWhere(['like', 'firm_mfo', $this->firm_mfo])
+            ->andFilterWhere(['like', 'firm_site', $this->firm_site])
+            ->andFilterWhere(['like', 'company', $this->company]);
+
+        return $dataProvider;
+    }
+}
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "w_dic_cities".
+ *
+ * @property integer $id
+ * @property string $name
+ * @property integer $is_active
+ * @property integer $parent
+ */
+class WDicCities extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'w_dic_cities';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name', 'parent'], 'required'],
+            [['is_active', 'parent'], 'integer'],
+            [['name'], 'string', 'max' => 254],
+            [['parent', 'name'], 'unique', 'targetAttribute' => ['parent', 'name'], 'message' => 'The combination of Name and Parent has already been taken.']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => Yii::t('app', 'ID'),
+            'name' => Yii::t('app', 'Name'),
+            'is_active' => Yii::t('app', 'Is Active'),
+            'parent' => Yii::t('app', 'Parent'),
+        ];
+    }
+}
+/old_migrations
 \ No newline at end of file
@@ -18,8 +18,14 @@ return [
                     'class' => 'yii\log\FileTarget',
                     'levels' => ['error', 'warning'],
                 ],
-            ],
+                    [
+                        'class' => 'yii\log\FileTarget',
+                        'logFile' => 'C:\xampp\htdocs\ital\console\runtime\logs\parser.log',
+                        'levels' => ['info', 'error'],
+                //        'categories' => ['parser'],
+                    ],
         ],
     ],
     'params' => $params,
+]
 ];
+<?php
+namespace console\controllers;
+
+use yii\console\Controller;
+use yii\helpers\Console;
+use common\components\PriceWriter;
+use backend\models\ImportersFiles;
+
+class ParserController extends Controller{
+    public function actionParseCSV ()
+    {
+        \common\components\CustomVarDamp::dumpAndDie(45);
+        if( $arr_id_files = Yii::$app->cache->get( 'files_to_parse' ) ) {
+            $arr_id_files = json_decode( $arr_id_files );
+            foreach ( $arr_id_files as $file_name ) {
+                $file_path = Yii::getAlias('@auto_upload') . '/' . $file_name . '.csv';
+                $config = ['record_id' => $file_name,
+                            'importer_id' => ImportersFiles::findOne(['id' => $file_name])->id,
+                    'parser_config' => ['keys' => ['DESCR', 'ARTICLE', 'BRAND', 'PRICE', 'BOX']]
+                ];
+                if( $this->parseFileConsole( $file_path, $config ) ){
+                    unlink( $file_path );
+                    if (isset( $arr_id_files[$file_path] ) ) {
+                        unset($arr_id_files[$file_path]);
+                    }
+                } else {
+                   // Yii::$app->log->
+                    // не дошли до конца по этому остаки вернем в кеш
+                    Yii::$app->cache->set( 'files_to_parse',json_encode( $arr_id_files ) );
+                }
+            }
+            if ( !count( $arr_id_files ) ) {
+                Yii::$app->cache->delete( 'files_to_parse' );
+            }
+        }
+    }
+    public function actionParseXML ()
+    {
+
+    }
+    protected function parseFileConsole( $file_path, $configuration ){
+        $parser_config = [];
+        if ( isset( $configuration['parser_config'] ) ) {
+            $parser_config = $configuration['parser_config'];
+        }
+
+        $data = Yii::$app->multiparser->parse( $file_path, $parser_config );
+
+        $writer = new PriceWriter();
+        $writer->configuration = $configuration;
+        $writer->data = $data;
+        $writer->mode = 1; //console-режим
+        if ( $writer->writeDataToDB() ){
+            Console::output('It is working');
+            return true;
+        }
+
+        return false;
+    }
+
+    public function actionTest ()
+    {
+       // Console::output('It is working ');
+        \Yii::warning('1');
+        \Yii::info('2');
+//        \Yii::info('3');
+//        \Yii::warning('4');
+
+    }
+}
 \ No newline at end of file
@@ -2,17 +2,29 @@
 use yii\db\Schema;
 use yii\db\Migration;
+use backend\models\ImportersFiles;
 class m150925_111922_add_foreign_key_ImportFiles extends Migration
 {
-    public function up()
+    public function safeUp()
     {
-        $this->addForeignKey('importer_fk', '{{%importer_files}}', 'importer_id', '{{%importer}}', 'id');
+        // сначала отберем записи которых нет уже в поставщиках
+        $id_arr = (new \yii\db\Query())
+            ->select(['{{%importers_files}}.id'])
+            ->from('{{%importers_files}}')
+            ->leftJoin('{{%importers}}', 'importer_id = {{%importers}}.id')
+            ->where(['name' => null])
+            ->all();
+        $id_arr = array_column($id_arr,'id');
+        // удалим их
+        $this->delete('{{%importers_files}}',['id' => $id_arr]);
+
+        $this->addForeignKey('importer_fk', '{{%importers_files}}', 'importer_id', '{{%importers}}', 'id');
     }
     public function down()
     {
-        $this->dropForeignKey('importer_fk', '{{%importer_files}}');
+        $this->dropForeignKey('importer_fk', '{{%importers_files}}');
     }
 }
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150929_110456_addTempTableUser extends Migration
+{
+    public function up()
+    {
+        $tableOptions = null;
+        if ($this->db->driverName === 'mysql') {
+            // http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+        }
+
+        $this->createTable('user', [
+            'id' => $this->primaryKey(),
+            'username' => $this->string()->notNull()->unique(),
+            'auth_key' => $this->string(32)->notNull(),
+            'password_hash' => $this->string()->notNull(),
+            'password_reset_token' => $this->string()->unique(),
+            'email' => $this->string()->notNull()->unique(),
+
+            'status' => $this->smallInteger()->notNull()->defaultValue(10),
+            'created_at' => $this->integer()->notNull(),
+            'updated_at' => $this->integer()->notNull(),
+        ], $tableOptions);
+
+        $user_array = [
+            'username' => 'admin',
+            'auth_key' => 'admin',
+            'password_hash' => Yii::$app->security->generatePasswordHash('admin'),
+            'password_reset_token' => 'admin',
+            'email'=> 'admin@test.com',
+            'status' => '10',
+            'created_at'=>'000000',
+            'updated_at' => '000000'
+        ];
+        $this->insert('user', $user_array);
+    }
+
+    public function down()
+    {
+        $this->dropTable('user');
+    }
+}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150929_113358_change_Importer_dataPrice extends Migration
+{
+    public function safeUp()
+    {
+        // увеличим размерность строки, так как при преобразовании из таймстампа в дату может не хватить символов
+        $this->alterColumn('{{%importers}}','price_date_update','VARCHAR(80)' );
+        // конвертем в дату
+        $this->update('{{%importers}}',['price_date_update'=> new yii\db\Expression('FROM_UNIXTIME(price_date_update)')]);
+        // а из даты в таймстамп
+        $this->alterColumn('{{%importers}}','price_date_update','TIMESTAMP NOT NULL' );
+        $this->createIndex('price_date', '{{%importers}}', 'price_date_update', false);
+
+    }
+
+
+    public function safedown()
+    {
+        $this->alterColumn('{{%importers}}','price_date','varchar(15)' );
+        $this->dropIndex('price_date', '{{%importers}}');
+    }
+
+}
@@ -166,63 +166,63 @@ class Convert {
 	}
 	/**
-	 * Converts an XML string to a PHP array
-	 * See http://phpsecurity.readthedocs.org/en/latest/Injection-Attacks.html#xml-external-entity-injection
-	 *
-	 * @uses recursiveXMLToArray()
-	 * @param string $val
-	 * @param boolean $disableDoctypes Disables the use of DOCTYPE, and will trigger an error if encountered.
-	 * false by default.
-	 * @param boolean $disableExternals Disables the loading of external entities. false by default.
-	 * @return array
-	 */
-	public static function xml2array($val, $disableDoctypes = false, $disableExternals = false) {
-		// Check doctype
-		if($disableDoctypes && preg_match('/\<\!DOCTYPE.+]\>/', $val)) {
-			throw new InvalidArgumentException('XML Doctype parsing disabled');
-		}
+ * Converts an XML string to a PHP array
+ * See http://phpsecurity.readthedocs.org/en/latest/Injection-Attacks.html#xml-external-entity-injection
+ *
+ * @uses recursiveXMLToArray()
+ * @param string $val
+ * @param boolean $disableDoctypes Disables the use of DOCTYPE, and will trigger an error if encountered.
+ * false by default.
+ * @param boolean $disableExternals Disables the loading of external entities. false by default.
+ * @return array
+ */
+    public static function xml2array($val, $disableDoctypes = false, $disableExternals = false) {
+        // Check doctype
+        if($disableDoctypes && preg_match('/\<\!DOCTYPE.+]\>/', $val)) {
+            throw new InvalidArgumentException('XML Doctype parsing disabled');
+        }
-		// Disable external entity loading
-		if($disableExternals) $oldVal = libxml_disable_entity_loader($disableExternals);
-		try {
-			$xml = new SimpleXMLElement($val);
-			$result = self::recursiveXMLToArray($xml);
-		} catch(Exception $ex) {
-			if($disableExternals) libxml_disable_entity_loader($oldVal);
-			throw $ex;
-		}
-		if($disableExternals) libxml_disable_entity_loader($oldVal);
-		return $result;
-	}
+        // Disable external entity loading
+        if($disableExternals) $oldVal = libxml_disable_entity_loader($disableExternals);
+        try {
+            $xml = new SimpleXMLElement($val);
+            $result = self::recursiveXMLToArray($xml);
+        } catch(Exception $ex) {
+            if($disableExternals) libxml_disable_entity_loader($oldVal);
+            throw $ex;
+        }
+        if($disableExternals) libxml_disable_entity_loader($oldVal);
+        return $result;
+    }
-	/**
-	 * Convert a XML string to a PHP array recursively. Do not 
-	 * call this function directly, Please use {@link Convert::xml2array()}
-	 * 
-	 * @param SimpleXMLElement
-	 * 
-	 * @return mixed
-	 */
-	protected static function recursiveXMLToArray($xml) {
-		if(is_object($xml) && get_class($xml) == 'SimpleXMLElement') {
-			$attributes = $xml->attributes();
-			foreach($attributes as $k => $v) {
-				if($v) $a[$k] = (string) $v;
-			}
-			$x = $xml;
-			$xml = get_object_vars($xml);
-		}
-		if(is_array($xml)) {
-			if(count($xml) == 0) return (string) $x; // for CDATA
-			foreach($xml as $key => $value) {
-				$r[$key] = self::recursiveXMLToArray($value);
-			}
-			if(isset($a)) $r['@'] = $a; // Attributes
-			return $r;
-		}
-		
-		return (string) $xml;
-	}
+    /**
+     * Convert a XML string to a PHP array recursively. Do not
+     * call this function directly, Please use {@link Convert::xml2array()}
+     *
+     * @param SimpleXMLElement
+     *
+     * @return mixed
+     */
+    protected static function recursiveXMLToArray($xml) {
+        if(is_object($xml) && get_class($xml) == 'SimpleXMLElement') {
+            $attributes = $xml->attributes();
+            foreach($attributes as $k => $v) {
+                if($v) $a[$k] = (string) $v;
+            }
+            $x = $xml;
+            $xml = get_object_vars($xml);
+        }
+        if(is_array($xml)) {
+            if(count($xml) == 0) return (string) $x; // for CDATA
+            foreach($xml as $key => $value) {
+                $r[$key] = self::recursiveXMLToArray($value);
+            }
+            if(isset($a)) $r['@'] = $a; // Attributes
+            return $r;
+        }
+
+        return (string) $xml;
+    }
 	/**
 	 * Create a link if the string is a valid URL
@@ -403,7 +403,11 @@ fr:
     DELETE: Supprime
     DELETEDRECORDS: '{count} enregistrements supprimés.'
     EMPTYBEFOREIMPORT: 'Remplacer les données'
+<<<<<<< HEAD
     IMPORT: 'Importer de CSV'
+=======
+    IMPORT: 'Importers de CSV'
+>>>>>>> ead5cb60ac983cdb680ec70731de195b537be6cd
     IMPORTEDRECORDS: '{count} enregistrements importés.'
     NOCSVFILE: 'Veuillez choisir un fichier CSV à importer'
     NOIMPORT: 'Rien à importer'
@@ -417,9 +421,15 @@ fr:
     IMPORTSPECTITLE: 'Spécification de %s'
   ModelAdmin_Tools_ss:
     FILTER: Filtrer
+<<<<<<< HEAD
     IMPORT: Importer
   ModelSidebar_ss:
     IMPORT_TAB_HEADER: Importer
+=======
+    IMPORT: Importers
+  ModelSidebar_ss:
+    IMPORT_TAB_HEADER: Importers
+>>>>>>> ead5cb60ac983cdb680ec70731de195b537be6cd
     SEARCHLISTINGS: Rechercher
   MoneyField:
     FIELDLABELAMOUNT: Quantité
@@ -7,6 +7,7 @@
 */
 namespace yii\multiparser;
+use common\components\CustomVarDamp;
 use yii\base\Behavior;
 // класс который содержит преобразователи значений (фильтры) используемые при парсинге
@@ -19,7 +20,6 @@ class Converter extends Behavior
     public static function convertToFloat($value)
     {
-        echo 1;
         if ($value == '') {
             $value = 0;
         }
@@ -51,8 +51,6 @@ class Converter extends Behavior
     public static function convertToString($value)
     {
-
-
         $res = '';
         if (is_array($value)) {
@@ -101,7 +99,7 @@ class Converter extends Behavior
     public static function convertByConfiguration( $arr, $configuration  )
     {
         $result = $arr;
-        //\common\components\CustomVarDamp::dumpAndDie($configuration);
+       // \common\components\CustomVarDamp::dumpAndDie( $result );
         $hasKey = isset( $configuration['hasKey'] );
         foreach ( $configuration['configuration'] as $key => $value ) {
@@ -111,7 +109,7 @@ class Converter extends Behavior
                     foreach ($value as $sub_value) {
                         if (isset($arr[$sub_value])) {
                             // конвертируем только те ячейки которые сопоставлены в прочитанном массиве с колонками в конфигурационном файле
-                            $result[$arr[$sub_value]] = self::$key( $arr[$sub_value] );
+                            $result[$sub_value] = self::$key( $arr[$sub_value] );
                         }
                     }
@@ -119,7 +117,7 @@ class Converter extends Behavior
                     if (isset($arr[$value])) {
                         // конвертируем только те ячейки которые сопоставлены в прочитанном массиве с колонками в конфигурационном файле
-                        $result[$arr[$value]] = self::$key( $arr[$value] );
+                        $result[$value] = self::$key( $arr[$value] );
                     }
                 }
@@ -3,6 +3,7 @@
  */
 namespace yii\multiparser;
+use common\components\CustomVarDamp;
 /**
@@ -97,7 +98,7 @@ class CsvParser implements ParserInterface
         while (!$finish) {
             $j = 0;
-            $row = $this->readRow();
+            $row = $this->file->fgetcsv();;
             if ($row === false) {
                 continue;
             }
@@ -129,7 +130,7 @@ class CsvParser implements ParserInterface
         $empty_lines = 0;
         while ( $empty_lines < 3 ) {
             // прочтем строку из файла. Если там есть значения - то в ней массив, иначе - false
-            $row = $this->readRow();
+            $row = $this->readRow( $current_line );
             if ($row === false) {
                 //счетчик пустых строк
@@ -139,19 +140,10 @@ class CsvParser implements ParserInterface
             // строка не пустая, имеем прочитанный массив значений
             $current_line++;
             if ($this->hasHeaderRow) {
+                // в файле есть заголовок, но он еще не назначен, назначим
                 if ($this->keys === NULL) {
                     $this->keys = array_values($row);
-                } else {
-
-                    if (count($this->keys) !== count($row)) {
-//
-                        throw new \ErrorException("Invalid columns detected on line # {$current_line}", 0, 1, $this->file->getBasename(), $current_line);
-                    }
-
-                    $return[] = array_combine($this->keys, $row);
                 }
-            } else {
-                $return[] = $row;
             }
             // если у нас установлен лимит, при  его достижении прекращаем парсинг
             if (($this->last_line) && ($current_line > $this->last_line)) {
@@ -159,6 +151,8 @@ class CsvParser implements ParserInterface
             }
             // обнуляем счетчик, так как считаюся пустые строки ПОДРЯД
             $empty_lines = 0;
+
+            $return[] = $row;
         }
         $this->closeHandler();
@@ -174,16 +168,24 @@ class CsvParser implements ParserInterface
     /**
      * @return array - одномерный массив результата парсинга строки
      */
-    protected function readRow()
+    protected function readRow( $current_line )
     {
-
         $row = $this->file->fgetcsv();
-
         if (is_array($row)) {
-            // попытаемся конвертировать прочитанные занчения согдасно конфигурации котнвертера значений
+            // если есть заголовок, то перед конвертацией его нужно назначить
+            if ($this->hasHeaderRow && $this->keys !== NULL) {
+
+                if (count($this->keys) !== count($row)) {
+//
+                    throw new \ErrorException("Ошибка парсинга файла в строке # {$current_line}. Не соответсвие числа ключевых колонок (заголовка) - числу колонок с данными", 0, 1, $this->file->getBasename(), $current_line);
+                }
+
+                $row = array_combine($this->keys, $row);
+            }
+            // попытаемся конвертировать прочитанные значения согласно конфигурации котнвертера значений
             $row = $this->convert($row);
-           // \common\components\CustomVarDamp::dump($row);
-            if ($this->first_column) {
+            // обрежем массив к первой значимой колонке
+            if ( $this->first_column ) {
                 $row = array_slice($row, $this->first_column);
@@ -39,14 +39,5 @@ public $configuration;
     }
-    public function init()
-    {
-        if( isset($this->configuration['glob']) && isset($this->configuration['glob']['ini'])){
-            foreach ($this->configuration['glob']['ini'] as $ini_setting => $ini_setting_value) {
-                ini_set( $ini_setting, $ini_setting_value );
-            }
-        }
-
-    }
 }
 \ No newline at end of file