merge with server

Mihail
2 parents 98533894 4f24d74c
Showing 22 changed files with 381 additions and 310 deletions Show diff stats
backend/models/Importers.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
common/config/.gitignore
common/config/main-local.php
common/config/params-local.php
common/models/WAccounts.php
common/models/WAccountsSearch.php
common/models/WDicCities.php
console/migrations/m130524_201442_init.php
console/migrations/m150818_125718_create_user_180815.php
console/migrations/m150831_130250_addImporters.php
console/migrations/m150901_135806_addImportersFiles.php
console/migrations/m150901_141850_addImportersPrefix.php
console/migrations/m150915_125129_addDetails.php
console/migrations/m150922_094313_change_key_ImportFiles.php
console/migrations/m150922_144040_change_Importer_dataPrice.php
framework/lang/da.yml
@@ -6,7 +6,7 @@ use Yii;
 use backend\components\base\BaseActiveRecord;
 /**
- * This is the model class for table "{{%importer}}".
+ *
  *
  * @property integer $id
  * @property string $code
@@ -33,6 +33,9 @@ use backend\components\base\BaseActiveRecord;
  */
 class Importers extends BaseActiveRecord
 {
+    /**
+     * @inheritdoc
+     */
     public function rules()
     {
@@ -56,27 +59,27 @@ class Importers extends BaseActiveRecord
     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'),
+            'id' =>'ID',
+            'code' => 'Код',
+            'name' => 'Название',
+            'name_price' => 'Прайс лист',
+            'currency_id' => 'Валюта',
+            'delivery' => 'Ожидаемый срок, дн.',
+            'email' => 'E-mail',
+            'info' => 'Комментарий к поставщику',
+            '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' => '№ колонки с группой RG',
+            'PARSER_FIELD_SIGN' => 'Операция с ценой',
+            'PARSER_FIELD_MULTIPLIER' => 'Значение операции',
             'price_date_update' => Yii::t('app', 'Price Date Update'),
         ];
     }
+<?php
+return [
+    'components' => [
+        'db' => [
+            //'class' => 'yii\db\Connection',
+            'class' => 'backend\components\base\CustomDbConnection',
+            'dsn' => 'mysql:host=195.248.225.150;dbname=italautocomua',
+            'username' => 'italautocomua',
+            'password' => 'MBi7jrTl2',
+            'charset' => 'utf8',
+            'tablePrefix' => 'w_',
+        ],
+        'mailer' => [
+            'class' => 'yii\swiftmailer\Mailer',
+            'viewPath' => '@common/mail',
+            // send all mails to a file by default. You have to set
+            // 'useFileTransport' to false and configure a transport
+            // for the mailer to send real emails.
+            'useFileTransport' => true,
+        ],
+    ],
+];
+<?php
+return [
+];
-<?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'),
-        ];
-    }
-}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m130524_201442_init 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);
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%user}}');
+    }
+}
+<?php
+
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+
+class m150818_125718_create_user_180815 extends Migration
+{
+    public function up()
+    {
+
+
+        $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}}');
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150831_130250_addImporters extends Migration
+{
+    public function up()
+    {
+        $tableOptions = null;
+        if ($this->db->driverName === 'mysql') {
+            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+        }
+
+        $this->createTable('{{%importer}}', [
+            'id' => $this->primaryKey(6)->notNull() .  ' AUTO_INCREMENT',
+               'code' =>'varchar(254) NOT NULL',
+               'name' => 'varchar(254) NOT NULL',
+               'name_price' => 'varchar(254) NOT NULL',
+               'currency_id' => 'int(3) unsigned NOT NULL',
+               'delivery' => 'varchar(254) NOT NULL',
+               'email' => 'varchar(254) NOT NULL',
+               'info' => 'text NOT NULL',
+               'active' => 'tinyint(1) unsigned NOT NULL DEFAULT 1',
+               'PARSER_IS_ACTIVE' => 'tinyint(1) unsigned NOT NULL DEFAULT 0',
+               'PARSER_COLUMN_COUNT' => 'int(6) unsigned DEFAULT NULL',
+               'PARSER_FIELD_BRAND' => 'int(3) unsigned DEFAULT NULL',
+               'PARSER_FIELD_ARTICLE' => 'int(3) unsigned DEFAULT NULL',
+               'PARSER_FIELD_ARTICLE_PREFIX' => 'tinyint(1) unsigned NOT NULL DEFAULT 0',
+               'PARSER_FIELD_PRICE' => 'int(3) unsigned DEFAULT NULL',
+               'PARSER_FIELD_DESCR'  =>'int(3) unsigned DEFAULT NULL',
+               'PARSER_FIELD_BOX' => 'int(3) unsigned DEFAULT NULL',
+               'PARSER_FIELD_ADD_BOX' => 'int(3) unsigned DEFAULT NULL',
+               'PARSER_FIELD_GROUP_RG' => 'int(3) unsigned DEFAULT NULL',
+               'PARSER_FIELD_SIGN' => 'varchar(1) NOT NULL',
+               'PARSER_FIELD_MULTIPLIER' => 'float(8,2) unsigned DEFAULT NULL',
+               'price_date_update' => 'varchar(15) NOT NULL'
+
+        ], $tableOptions);
+
+        $this->createIndex('code', '{{%importer}}', 'code', true);
+        $this->createIndex('name', '{{%importer}}', 'name', true);
+        $this->createIndex('active', '{{%importer}}', 'active', false);
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%importer}}');
+
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150901_135806_addImportersFiles extends Migration
+{
+    public function up()
+    {
+        $tableOptions = null;
+        if ($this->db->driverName === 'mysql') {
+            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+        }
+
+        $this->createTable('{{%importer_files}}', [
+            'id' => $this->primaryKey(10)->notNull() . ' AUTO_INCREMENT',
+            'importer_id' => 'int(6) unsigned NOT NULL',
+            'upload_time' => 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP',
+            'time_start' => 'timestamp NULL DEFAULT NULL',
+            'time_end' => 'timestamp NULL DEFAULT NULL',
+        ], $tableOptions);
+
+
+        $this->createIndex('importer_id', '{{%importer_files}}', 'importer_id, time_start', false);
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%importer_files}}');
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150901_141850_addImportersPrefix extends Migration
+{
+    public function up()
+    {
+        $tableOptions = null;
+        if ($this->db->driverName === 'mysql') {
+            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+        }
+
+        $this->createTable('{{%importer_prefix}}', [
+            'id' => $this->primaryKey(10)->notNull() . ' AUTO_INCREMENT',
+            'importer_id' => 'int(6) unsigned NOT NULL',
+            'brand' => 'varchar(100) NOT NULL',
+            'prefix' => 'varchar(50) NOT NULL',
+            'timestamp' => 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP',
+        ], $tableOptions);
+
+        $this->createIndex('importer_id', '{{%importer_prefix}}', 'importer_id, brand, prefix', true);
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%importer_prefix}}');
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150915_125129_addDetails extends Migration
+{
+    public function up()
+    {
+        $this->execute('CREATE TABLE `details` (
+        `ID` int(10) unsigned NOT NULL AUTO_INCREMENT,
+       `IMPORT_ID` int(6) unsigned NOT NULL,
+       `BRAND` varchar(100) NOT NULL,
+       `ARTICLE` varchar(100) NOT NULL,
+       `FULL_ARTICLE` varchar(150) NOT NULL,
+       `PRICE` float(15,2) unsigned NOT NULL,
+       `DESCR` varchar(200) NOT NULL,
+       `BOX` int(6) unsigned NOT NULL,
+       `ADD_BOX` int(6) unsigned NOT NULL DEFAULT 0,
+       `GROUP` varchar(200) NOT NULL DEFAULT \'\',
+       `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+       PRIMARY KEY (`ARTICLE`,`BRAND`,`IMPORT_ID`),
+       UNIQUE KEY `ID_delete` (`ID`),
+       KEY `timestamp` (`timestamp`),
+       KEY `ARTICLE` (`ARTICLE`,`BRAND`,`BOX`),
+       KEY `BRAND` (`BRAND`,`ARTICLE`),
+       KEY `ARTICLE_2` (`ARTICLE`,`BRAND`,`ADD_BOX`),
+       KEY `IMPORT_ID` (`IMPORT_ID`,`ARTICLE`),
+       KEY `IMPORT_ID_2` (`IMPORT_ID`,`timestamp`)
+     ) ENGINE=InnoDB DEFAULT CHARSET=utf8');
+
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%details}}');
+
+    }
+
+}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150922_094313_change_key_ImportFiles extends Migration
+{
+    //@todo вероятно что эта миграция ненужна - посмотреть ближе к концу проекта на ключи которые используются - остальные удалить.
+    public function up()
+    {
+        $this->dropIndex('importer_id', '{{%importer_files}}');
+        $this->createIndex('importer_id', '{{%importer_files}}', 'importer_id, upload_time', false);
+    }
+
+    public function down()
+    {
+        $this->dropIndex('importer_id', '{{%importer_files}}');
+        $this->createIndex('importer_id', '{{%importer_files}}', 'importer_id, time_start', false);
+    }
+
+
+}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150922_144040_change_Importer_dataPrice extends Migration
+{
+    public function up()
+    {
+        $this->alterColumn('{{%importer}}','price_date_update','TIMESTAMP' );
+        $this->createIndex('price_date', '{{%importer}}', 'price_date_update', false);
+    }
+
+    public function down()
+    {
+        $this->alterColumn('{{%importer}}','price_date','varchar(15)' );
+        $this->dropIndex('price_date', '{{%importer}}');
+    }
+
+
+}
@@ -23,7 +23,7 @@ da:
     PLEASESAVE: 'Gem siden: Denne side kunne ikke blive opdateret, fordi den endnu ikke er gemt.'
   ModelAdmin:
     DELETE: Slet
-    IMPORT: 'Importers fra CSV'
+    IMPORT: 'Importer fra CSV'
     NOCSVFILE: 'Tryk p&aring; Gennemse for at v&aelig;lge en CSVfil til importering'
     NOIMPORT: 'Intet at importere'
   SecurityAdmin:
@@ -234,7 +234,7 @@ fr:
     has_many_Permissions: Autorisations
     many_many_Members: Membres
   GroupImportForm:
-    Help1: '<p>Importers un ou plusieurs groupe(s) au format <em>CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Montrer l''usage avancé</a></small></p>'
+    Help1: '<p>Importer un ou plusieurs groupe(s) au format <em>CSV</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Montrer l''usage avancé</a></small></p>'
     Help2: "<div class=\"advanced\">\n<h4>Utilisation avancée</h4>\n<ul>\n<li>Colonnes autorisées&nbsp;: <em>%s</em></li>\n<li>Les utilisateurs existants sont retrouvés avec leur <em>Code</em> unique et les registres sont mis à jour avec les nouvelles valeurs du fichier importé.</li>\n<li>Des hiérarchies de groupes peuvent être créées à l’aide de la colonne <em>ParentCode</em>.</li>\n<li>Les autorisations sont assignées par la colonne <em>PermissionCode</em>. Les autorisations actuelles ne sont pas modifiées.</li>\n</ul>\n</div>"
     ResultCreated: '{count} groupes créés'
     ResultDeleted: '%d groupes supprimés'
@@ -388,7 +388,7 @@ fr:
     TWODIGITYEAR: 'L’année sur deux chiffres'
     Toggle: 'Afficher l’aide de mise en forme'
   MemberImportForm:
-    Help1: '<p>Importers les membres au format<em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Afficher l''usage avancé.</a></small></p>'
+    Help1: '<p>Importer les membres au format<em>CSV format</em> (comma-separated values). <small><a href="#" class="toggle-advanced">Afficher l''usage avancé.</a></small></p>'
     Help2: "<div class=\"advanced\">\n<h4>Utilisation avancée</h4>\n<ul>\n<li>Colonnes autorisées&nbsp;: <em>%s</em></li>\n<li>Les utilisateurs existants sont retrouvés avec leur <em>Code</em> unique et les registres sont mis à jour avec les nouvelles valeurs du fichier importé.</li>\n<li>Des groupes peuvent être assignés à l’aide de la colonne <em>Groups</em>. Les groupes sont identifiés par leur <em>Code</em>, plusieurs groupes peuvent être indiqués en les séparant par des virgules. L’appartenance actuelle aux groupes n’est pas modifiée.</li>\n</ul>\n</div>"
     ResultCreated: '{count} membres créés'
     ResultDeleted: '%d membres supprimés'
@@ -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é
@@ -481,8 +491,8 @@ fr:
     EDITPERMISSIONS: 'Gérer les autorisations des groupes'
     EDITPERMISSIONS_HELP: 'Possibilité d''éditer les autorisations et les adresses IP pour un groupe. Nécessite l’autorisation « Accès à la section “Securité” ».'
     GROUPNAME: 'Nom du group'
-    IMPORTGROUPS: 'Importers des groupes'
-    IMPORTUSERS: 'Importers des utilisateurs'
+    IMPORTGROUPS: 'Importer des groupes'
+    IMPORTUSERS: 'Importer des utilisateurs'
     MEMBERS: Membres
     MENUTITLE: Sécurité
     MemberListCaution: 'Attention&nbsp;: en supprimant des membres de cette liste vous les enlèverez de tous les groupes ainsi que de la base de données'
@@ -493,7 +503,7 @@ fr:
     TABROLES: Rôles
     Users: Utilisateurs
   SecurityAdmin_MemberImportForm:
-    BtnImport: 'Importers'
+    BtnImport: 'Importer'
     FileFieldLabel: 'Fichier CSV <small>(extension autorisée&nbsp;: *.csv)</small>'
   SilverStripeNavigator:
     Auto: Auto
@@ -236,7 +236,7 @@ nb:
     has_many_Permissions: Tillatelser
     many_many_Members: Medlemmer
   GroupImportForm:
-    Help1: '<p>Importers en eller flere grupper i <em>CSV</em>-format (kommaseparerte verdier). <small><a href="#" class="toggle-advanced">Vis avanserte alternativer</a></small></p>'
+    Help1: '<p>Importer en eller flere grupper i <em>CSV</em>-format (kommaseparerte verdier). <small><a href="#" class="toggle-advanced">Vis avanserte alternativer</a></small></p>'
     Help2: "<div class=\"advanced\">\n<h4>Avanserte alternativer</h4>\n<ul>\n<li>Tillatte kolonner: <em>%s</em></li>\n<li>Eksisterende grupper matches mot deres <em>Code</em>-verdi og oppdateres med nye verdier fra den importerte filen.</li>\n<li>Gruppehierarkier kan bli opprettet ved å benytte en <em>ParentCode</em>-kolonne.</li>\n<li>Tillatelseskoder kan bli angitt med <em>PermissionCode</em>-kolonnen. Eksisterende tillatelselskoder blir ikke fjernet.</li>\n</ul>\n</div>"
     ResultCreated: 'Opprettet {count} grupper'
     ResultDeleted: 'Slettet %d grupper'
@@ -390,7 +390,7 @@ nb:
     TWODIGITYEAR: 'Tosifret årstall'
     Toggle: 'Vis formateringshjelp'
   MemberImportForm:
-    Help1: '<p>Importers brukere i <em>CSV-format</em> (verdier adskilt med komma). <small><a href="#" class="toggle-advanced">Vis avanserte alternativer</a></small></p>'
+    Help1: '<p>Importer brukere i <em>CSV-format</em> (verdier adskilt med komma). <small><a href="#" class="toggle-advanced">Vis avanserte alternativer</a></small></p>'
     Help2: "<div class=\"advanced\">\n<h4>Avanserte alternativer</h4>\n<ul>\n<li>Tillatte kolonner: <em>%s</em></li>\n<li>Eksisterende brukere blir matchet mot deres unike <em>Code</em> og oppdatert med nye verdier fra den importerte filen.</li>\n<li>Grupper kan angis med  <em>Groups</em>-kolonnen. Grupper er identifisert ved deres <em>Code</em>. Grupper kan adskilles med komma. Eksisterende gruppemedlemskap blir ikke fjernet.</li>\n</ul>\n</div>"
     ResultCreated: 'Opprettet {count} medlemmer'
     ResultDeleted: 'Slettet %d medlemmer'
@@ -405,7 +405,7 @@ nb:
     DELETE: Slett
     DELETEDRECORDS: 'Slettet {count} oppføringer.'
     EMPTYBEFOREIMPORT: 'Erstatt data'
-    IMPORT: 'Importers fra CSV'
+    IMPORT: 'Importer fra CSV'
     IMPORTEDRECORDS: 'Importerte {count} oppføringer.'
     NOCSVFILE: 'Vennligst finn en CSV-fil å importere'
     NOIMPORT: 'Ingenting å importere'
@@ -419,9 +419,9 @@ nb:
     IMPORTSPECTITLE: 'Spesifikasjon for %s'
   ModelAdmin_Tools_ss:
     FILTER: Filtrer
-    IMPORT: Importers
+    IMPORT: Importer
   ModelSidebar_ss:
-    IMPORT_TAB_HEADER: Importers
+    IMPORT_TAB_HEADER: Importer
     SEARCHLISTINGS: Søk
   MoneyField:
     FIELDLABELAMOUNT: Mengde
@@ -485,8 +485,8 @@ nb:
     EDITPERMISSIONS: 'Administrer tillatelser for grupper'
     EDITPERMISSIONS_HELP: 'Mulighet for å endre tillatelser og IP-adresser for en gruppe. Brukere må ha adgang til sikkerhetsseksjon.'
     GROUPNAME: 'Gruppenavn'
-    IMPORTGROUPS: 'Importers grupper'
-    IMPORTUSERS: 'Importers brukere'
+    IMPORTGROUPS: 'Importer grupper'
+    IMPORTUSERS: 'Importer brukere'
     MEMBERS: Medlemmer
     MENUTITLE: Sikkerhet
     MemberListCaution: 'Advarsel: Hvis du fjerner medlemmer fra denne listen vil det samtidig fjerne dem fra alle grupper og databasen'
@@ -497,7 +497,7 @@ nb:
     TABROLES: Roller
     Users: Brukere
   SecurityAdmin_MemberImportForm:
-    BtnImport: 'Importers fra CSV'
+    BtnImport: 'Importer fra CSV'
     FileFieldLabel: 'CSV-fil <small>(Tillatt filtype: *.csv)</small>'
   SilverStripeNavigator:
     Auto: Automatisk