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

Administrator
2 parents c6152cd6 9f082181
Showing 31 changed files with 367 additions and 263 deletions Show diff stats
backend/assets/CartAsset.php
backend/controllers/CartController.php
backend/controllers/CrossingUploadController.php
backend/controllers/CurrencyController.php
backend/controllers/DetailsDescriptionController.php
backend/controllers/ParserController.php
backend/controllers/RgGrupController.php
backend/models/Currency.php
backend/models/DetailsCrosses.php
backend/views/cart/index.php
backend/views/cart/view.php
backend/views/currency/_form.php
backend/views/currency/create.php
backend/views/currency/index.php
backend/views/currency/update.php
backend/views/importers/_form.php
backend/views/layouts/column.php
backend/web/css/AdminLTE.css
backend/web/js/cart.js
common/components/CommaNumberValidator.php
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Cibermag
+ * Date: 28.09.2015
+ * Time: 11:40
+ */
+
+namespace backend\assets;
+
+use yii\web\AssetBundle;
+
+class CartAsset extends AssetBundle {
+    public $basePath = '@webroot';
+    public $baseUrl = '@web';
+    public $css = [
+        'css/site.css',
+    ];
+    public $js = [
+        'js/cart.js',
+    ];
+    public $depends = [
+        'yii\web\YiiAsset',
+        'yii\bootstrap\BootstrapAsset',
+    ];
+}
 \ No newline at end of file
@@ -2,13 +2,14 @@
 namespace backend\controllers;
+use common\models\Cart;
 use Yii;
 use common\models\CartBillsView;
 use common\models\CartBillsSearch;
 use backend\components\base\BaseController;
+use yii\data\ActiveDataProvider;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-use yii\filters\AccessControl;
 /**
  * CartController implements the CRUD actions for CartBills model.
@@ -16,34 +17,7 @@ use yii\filters\AccessControl;
 class CartController extends BaseController
 {
     public $layout = "/column";
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
-            ],
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'logout' => ['post'],
-                ],
-            ],
-        ];
-    }
+
     /**
      * Lists all CartBills models.
      * @return mixed
@@ -66,8 +40,15 @@ class CartController extends BaseController
      */
     public function actionView($id)
     {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
+        $provider = new ActiveDataProvider([
+            'query' => Cart::find()->where(['bill_id' => $id]),
+            'sort' => false,
+
+        ]);
+
+        return $this->renderAjax('view', [
+            'id' => $id,
+            'provider' => $provider,
         ]);
     }
@@ -81,7 +62,7 @@ class CartController extends BaseController
      */
     protected function findModel($id)
     {
-        if (($model = CartBillsView::findById($id)) !== null) {
+        if (($model = Cart::findOne(['bill_id' => $id])) !== null) {
             return $model;
         } else {
             throw new NotFoundHttpException('The requested page does not exist.');
@@ -8,10 +8,14 @@
 namespace backend\controllers;
+use backend\components\base\BaseActiveRecord;
 use backend\components\base\BaseController;
 use common\components\CustomArrayHelper;
 use common\components\CustomVarDamp;
+use yii\base\ErrorException;
+use yii\base\Model;
 use yii\data\ArrayDataProvider;
+use yii\db\ActiveRecord;
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 use backend\models\UploadFileCrossingForm;
@@ -82,7 +86,7 @@ class CrossingUploadController extends BaseController
                 //запускаем парсинг
                 $data = $model->readFile();
                 // сохраняем в кеш отпарсенные даные
-               $this->cacheHandler( true, $data, $model );
+               $this->cacheHandler( 1, $data, $model );
             } else if (Yii::$app->getCache()->get('parser_data')) {
                 $data = json_decode(Yii::$app->getCache()->get('parser_data'), true);
             }
@@ -122,13 +126,13 @@ class CrossingUploadController extends BaseController
         }
         // провалидируем выбранные колонки
-        if ($model->validate()) {
+        if ( $model->validate() ) {
             // валидация успешна у нас есть соответсвие колонок, преобразуем в массив данное соответсвие для дальнейшей работы
             $arr = $model->toArray();
             // получим данные из кеша
-            $this->cacheHandler( false, $data, $configuration );
+            $this->cacheHandler( 0, $data, $configuration );
             // соотнесем отпарсенные данные с соответствием полученным от пользователя
             // для этого преобразуем массив отпарсенных данных - назначим ключи согласно соответствию
@@ -138,19 +142,23 @@ class CrossingUploadController extends BaseController
             $data = $this->convertDataByConfiguration( $data, $configuration );
             $crosses_model = new DetailsCrosses();
-            $crosses_model->ManualInsertWithIgnore($data);
-            Yii::$app->session->setFlash('success', 'Файл кроссов успешно загружен');
-            // все прошло успешно - очищаем кеш
-            Yii::$app->getCache()->delete('parser_data');
-            Yii::$app->getCache()->delete('parser_configuration');
+            if ( $crosses_model->ManualInsertWithIgnore( $data ) ) {
+
+                Yii::$app->session->setFlash('success', 'Файл кроссов успешно загружен');
+
+                // очистим кеш
+                $this->cacheHandler( 2 );
+
+                if (file_exists($configuration['file_path']))
+                    unlink($configuration['file_path']);
+                return $this->render('index', ['model' => $configuration]);
+
+            }
-            if (file_exists($configuration['file_path']))
-                unlink($configuration['file_path']);
-            return $this->render('index', ['model' => $configuration]);
         } else {
-            // не прошла валидация форма загрузки файлов
+            // не прошла валидация формы загрузки файлов
             $errors_str = '';
             foreach ($model->getErrors() as $error) {
                 $errors_str .= implode(array_values($error));
@@ -182,45 +190,82 @@ class CrossingUploadController extends BaseController
             $fields[] = 'CROSS_ARTICLE';
         }
         if ($fields) {
-            $options ['configuration'] =  ["article" => $fields,
+            $options ['converter_conf']['configuration'] =  ["article" => $fields,
                 "string" => ['ARTICLE', 'CROSS_ARTICLE'],];
         } else {
-            $options ['configuration'] =  ["string" => ['ARTICLE', 'CROSS_ARTICLE'],];
+            $options ['converter_conf']['configuration'] =  ["string" => ['ARTICLE', 'CROSS_ARTICLE'],];
         }
-        foreach ($data as &$row) {
-            $row = Yii::$app->converter->convertByConfiguration($row, $options);
+        // получим базовую конфигурацию и объеденим её с той что образовалась после выбора пользователем настроек
+        $basic_options = Yii::$app->multiparser->getConfiguration( 'csv', 'crosses' );
+        $options = array_merge_recursive( $options, $basic_options );
+
+        // для доп массива обратных строк
+        $i = count( $data ) - 1;
+        $reverse_data = [];
+        foreach ( $data as &$row ) {
+            $row = Yii::$app->converter->convertByConfiguration( $row, $options['converter_conf'] );
+            // нужно добавить обратную строку по кроссам
+            $reverse_data[ $i ]['ARTICLE'] = $row['CROSS_ARTICLE'];
+            $reverse_data[ $i ]['CROSS_ARTICLE'] = $row['ARTICLE'];
+            $reverse_data[ $i ]['BRAND'] = $row['CROSS_BRAND'];
+            $reverse_data[ $i ]['CROSS_BRAND'] = $row['BRAND'];
+            $i++;
         }
+        $data = array_merge( $data, $reverse_data );
         return $data;
     }
     /**
-     * @param $mode - bool - true - put in cache, otherwise - fetch from cache
+     * @param $mode - int: 0 - fetch from cache, - 1 - put in cache,  <2 - delete from cache
      * @param $data - array
      * @param $configuration - array
      * @throws \ErrorException
      */
-    protected function cacheHandler( $mode, &$data, &$configuration ){
-
-        if ( $mode ) {
-
-            Yii::$app->getCache()->set('parser_data', json_encode($data), 1800);
-            // сохраняем в кеш модель - в ней настройки для дальнейшей обработки данных
-            Yii::$app->getCache()->set('parser_configuration', serialize($configuration), 1800);
-
-        } else {
-
-            if (Yii::$app->getCache()->get('parser_data') && Yii::$app->getCache()->get('parser_configuration')) {
-                $data = json_decode(Yii::$app->getCache()->get('parser_data'), true);
-                $configuration = unserialize(Yii::$app->getCache()->get('parser_configuration'));
-            } else {
-                throw new \ErrorException('Ошибка кеша');
-            }
-
+    protected function cacheHandler( $mode, &$data = [], &$configuration = [] ){
+        switch ( $mode ) {
+            case 0:
+                if (Yii::$app->getCache()->get('parser_data') && Yii::$app->getCache()->get('parser_configuration')) {
+                    $data = json_decode(Yii::$app->getCache()->get('parser_data'), true);
+                    $configuration = unserialize(Yii::$app->getCache()->get('parser_configuration'));
+                } else {
+                    throw new \ErrorException('Ошибка кеша');
+                }
+                break;
+
+            case 1:
+                Yii::$app->getCache()->set('parser_data', json_encode($data), 1800);
+                // сохраняем в кеш модель - в ней настройки для дальнейшей обработки данных
+                Yii::$app->getCache()->set('parser_configuration', serialize($configuration), 1800);
+                break;
+
+            default:
+                if( Yii::$app->getCache()->exists('parser_data') )
+                    Yii::$app->getCache()->delete('parser_data');
+
+                if( Yii::$app->getCache()->exists('parser_configuration') )
+                    Yii::$app->getCache()->delete('parser_configuration');
         }
-
     }
+
+//    protected function validateModel( BaseActiveRecord $model, array $data ){
+//
+//        foreach ( $data as $row ) {
+//            // подготовим данные к валидации
+//            $validate_attr[$model->formName()] = $row;
+//            if( !$model->load( $validate_attr ) ){
+//                // такой ситуации не должно быть, но на всякий случай
+//                throw new ErrorException('Незаполнены обязательные поля формы.');
+//            }
+//            if ( !$model->validate( ) ) {
+//                $model->throwStringErrorException( key( $data ) );
+//            };
+//        }
+//
+//        return true;
+//
+//    }
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ namespace backend\controllers;
 use Yii;
 use common\models\Currency;
 use common\models\CurrencySearch;
+use yii\data\ActiveDataProvider;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
@@ -50,11 +51,13 @@ class CurrencyController extends Controller
      */
     public function actionIndex()
     {
-        $searchModel = new CurrencySearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        $dataProvider = new ActiveDataProvider([
+            'query' => Currency::find(),
+            'sort' => false,
+
+        ]);
         return $this->render('index', [
-            'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
     }
@@ -11,7 +11,6 @@ use yii\data\ActiveDataProvider;
 use yii\web\HttpException;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-use yii\filters\AccessControl;
 /**
  * DetailsDescriptionController implements the CRUD actions for DetailsDescription model.
@@ -20,30 +19,13 @@ class DetailsDescriptionController extends BaseController
 {
     public $layout = "/column";
-    /**
-     * @inheritdoc
-     */
     public function behaviors()
     {
         return [
-            'access' => [
-                'class' => AccessControl::className(),
-                'rules' => [
-                    [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
-                        'allow' => true,
-                        'roles' => ['@'],
-                    ],
-                ],
-            ],
             'verbs' => [
                 'class' => VerbFilter::className(),
                 'actions' => [
-                    'logout' => ['post'],
+                    'delete' => ['post'],
                 ],
             ],
         ];
@@ -38,22 +38,17 @@ class ParserController extends BaseController
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
                         'allow' => true,
                         'roles' => ['@'],
                     ],
                 ],
             ],
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'logout' => ['post'],
-                ],
-            ],
+//            'verbs' => [
+//                'class' => VerbFilter::className(),
+//                'actions' => [
+//                    'logout' => ['post'],
+//                ],
+//            ],
         ];
     }
@@ -14,7 +14,6 @@ use common\components\CustomVarDamp;
 use common\components\parsers\MailAttachmentsSaver;
 use common\models\Margins;
 use common\models\MarginsGroups;
-use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
 use Yii;
 use yii\web\UploadedFile;
@@ -36,22 +35,17 @@ class RgGrupController extends BaseController
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
-                        'allow' => true,
-                    ],
-                    [
-                        'actions' => ['logout', 'index','create','update','view','delete',],
                         'allow' => true,
                         'roles' => ['@'],
                     ],
                 ],
             ],
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'logout' => ['post'],
-                ],
-            ],
+//            'verbs' => [
+//                'class' => VerbFilter::className(),
+//                'actions' => [
+//                    'logout' => ['post'],
+//                ],
+//            ],
         ];
     }
-<?php
-
-namespace backend\models;
-
-use Yii;
-
-/**
- * This is the model class for table "w_currency".
- *
- * @property integer $id
- * @property string $name
- * @property double $rate
- * @property integer $is_default
- * @property string $timestamp
- */
-class Currency extends \yii\db\ActiveRecord
-{
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'w_currency';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['name', 'rate'], 'required'],
-            [['rate'], 'number'],
-            [['is_default'], 'integer'],
-            [['timestamp'], 'safe'],
-            [['name'], 'string', 'max' => 50],
-            [['name'], 'unique'],
-            [['is_default'], 'unique']
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => 'ID',
-            'name' => 'Name',
-            'rate' => 'Rate',
-            'is_default' => 'Is Default',
-            'timestamp' => 'Timestamp',
-        ];
-    }
-}
@@ -78,8 +78,16 @@ class DetailsCrosses extends \backend\components\base\BaseActiveRecord
             $query = Yii::$app->db->createCommand()->batchInsert($table_name, $keys_arr, $current_batch_array)->sql;
             // добавим ключевое слово - ignore
             $query = preg_replace('/INSERT/','INSERT IGNORE', $query);
-            Yii::$app->db->createCommand($query)->execute();
+            $rows = Yii::$app->db->createCommand($query)->execute();
+
+//            // если нет результата вернемся с ошибкой
+//            if ( $rows == 0 ) {
+//                return false;
+//            }
         }
+
+        return true;
+
     }
 }
@@ -3,6 +3,8 @@
 use yii\helpers\Html;
 use yii\grid\GridView;
 use kartik\date\DatePicker;
+use \yii\widgets\Pjax;
+use \yii\bootstrap\Modal;
 /* @var $this yii\web\View */
 /* @var $searchModel common\models\CartBillsSearch */
@@ -11,7 +13,13 @@ use kartik\date\DatePicker;
 $this->title = Yii::t('app', 'Заказы');
 $this->params['breadcrumbs'][] = $this->title;
+$safe_bill_img0 = '/storage/checkbox0.gif';
+$safe_bill_img1 = '/storage/checkbox1.gif';
+
+\backend\assets\CartAsset::register($this);
+Pjax::begin(['id' => 'gridViewContent']);
 ?>
+
 <div class="cart-bills-index">
     <h1><?= Html::encode($this->title) ?></h1>
@@ -23,13 +31,32 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'filterModel' => $searchModel,
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
-
+            ['content' => function ($model) {
+                $url = \yii\helpers\Url::to(['view', 'id' => $model->id]);
+                return Html::a('<span class="glyphicon glyphicon-eye-open">  </span>', '#', [
+                    'class' => 'cartModalViewButton',
+                    'value' => $url,
+                ]);
+            },
+            ],
             'id',
             'account_id',
             ['label' =>'Информация',
-                'value' =>function ($data) {
-                    $info = $data->scode . ' /n';
-                    $info .= $data->name;
+               'format' => 'raw',
+                'value' =>function( $model ) use ($safe_bill_img0, $safe_bill_img1) {
+                    $info  = '<b> Код 1С:</b>' . ' ' . $model->scode . '<br>';
+                    $info .= '<b> Имя:</b>' . ' ' .$model->name . '<br>';
+                    $info .= '<b> Тел.:</b>' . ' ' .$model->phone . '<br>';
+                    $info .= '<b> Email:</b>' . ' ' .$model->email . '<br>';
+                    $info .= '<b> Доставка:</b>' . ' ' .$model->delivery . '<br>';
+                    $info .= '<b> Комментарий:</b>' . ' ' .$model->message . '<br>';
+                    $info .= '<b> Страховка:</b>';
+                    if ($model->safe_bill == '1') {
+                        $info .= " <img src=$safe_bill_img1>";
+                    }
+                    else {
+                        $info .= " <img src=$safe_bill_img0>";
+                    }
                     return $info;
                 },
             ],
@@ -60,4 +87,16 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         ],
     ]); ?>
+    <?php
+    // сюда будем всавлять контент модального окна
+    Modal::begin([
+        //     'header'=>'<h4>Прайс</h4>',
+        'id' => 'modal',
+        'size' => 'modal-lg',
+    ]);
+
+    echo "<div class='modalContent'></div>";
+    Modal::end();
+    Pjax::end();
+    ?>
 </div>
 <?php
 use yii\helpers\Html;
-use yii\widgets\DetailView;
+use yii\grid\GridView;
 /* @var $this yii\web\View */
 /* @var $model common\models\CartBills */
-$this->title = $model->id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Cart Bills'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
+$this->title = "Заказ № " . $id;
 ?>
 <div class="cart-bills-view">
     <h1><?= Html::encode($this->title) ?></h1>
-    <p>
-        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
-
-    <?= DetailView::widget([
-        'model' => $model,
-        'attributes' => [
-            'id',
-            'account_id',
-            'manager_id',
-            'office_id',
-            'status',
-            'f1',
-            'f2',
-            'f3',
-            'message:ntext',
-            'safe_bill',
-            'delivery',
-            'delivery_price',
-            'timestamp',
+    <?= GridView::widget([
+        'dataProvider' => $provider,
+        'layout' =>'{items}',
+        'columns'=>[
+            'article',
+            'brand',
+            'importer',
+            'descr',
+            'count',
+            'price',
+            'aggregate',
+            'status_name',
         ],
-    ]) ?>
+
+    ]); ?>
 </div>
@@ -17,7 +17,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'rate')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : '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\Currency */
-$this->title = 'Create Currency';
+$this->title = 'Добавить валюту';
 $this->params['breadcrumbs'][] = ['label' => 'Currencies', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -18,4 +18,5 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'model' => $model,
     ]) ?>
+    <?= Html::a('Вернуться', ['index'], ['class' => 'btn btn-primary']) ?>
 </div>
@@ -7,7 +7,7 @@ use yii\grid\GridView;
 /* @var $searchModel common\models\CurrencySearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Currencies';
+$this->title = 'Курс валют';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="currency-index">
@@ -16,20 +16,18 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Currency', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
-
             'name',
             'rate',
             'timestamp',
-
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'yii\grid\ActionColumn',
+                'template' => '{update}'],
         ],
     ]); ?>
@@ -5,7 +5,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Currency */
-$this->title = 'Update Currency: ' . ' ' . $model->name;
+$this->title = 'Обновить валюту: ' . ' ' . $model->name;
 $this->params['breadcrumbs'][] = ['label' => 'Currencies', 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
 $this->params['breadcrumbs'][] = 'Update';
@@ -18,4 +18,5 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = &#39;Update&#39;;
         'model' => $model,
     ]) ?>
+    <?= Html::a('Вернуться', ['index'], ['class' => 'btn btn-primary']) ?>
 </div>
@@ -3,7 +3,7 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use yii\helpers\ArrayHelper;
-use backend\models\Currency;
+use common\models\Currency;
 /* @var $this yii\web\View */
 /* @var $model backend\models\Importers */
@@ -325,7 +325,6 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                             ['label' => 'Vin коды', 'url' => ['currency/index']],
                             ['label' => 'Запросы по номеру', 'url' => ['currency/index']],
                             ['label' => 'Офисы', 'url' => ['offices/index']],
-                            ['label' => 'Валюты', 'url' => ['currency/index']],
                         ],
                         ],
                         ['label' => 'Анализ', 'url' => ['#'], 'items' => [
@@ -2558,6 +2558,7 @@ a:focus {
 }
 .table-bordered {
   border: 1px solid #f4f4f4;
+
 }
 .table-bordered > thead > tr > th,
 .table-bordered > tbody > tr > th,
+$(function(){
+
+    // cart\view.php
+    // для каждой строки обрабатываем клик по ссылке
+    $('.cartModalViewButton').click(function (){
+        // находим контейнер с модальным контентом и подгружаем в него по аджаксу результат
+        $('#modal').modal('show')
+            .find('.modalContent')
+            .load($(this).attr('value')); // в 'value' - у нас указан путь с гет параметрами к конроллеру
+             $.pjax.reload({container:'#gridViewContent'});
+    });
+
+});
+
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Tsurkanov
+ * Date: 25.11.2015
+ * Time: 13:51
+ */
+
+namespace common\components;
+
+use yii\validators\NumberValidator;
+
+
+/**
+ * Class CommaNumberValidator
+ * @package common\components
+ * validator identic to NumberValidator,
+ * with one change - comma replaced to dot,
+ * thus values such 21,4; 45,05 - will be valid
+ */
+class CommaNumberValidator extends NumberValidator {
+    // override parent pattern - add ',' to it
+    public $numberPattern = '/^\s*[-+]?[0-9]*[\.,]?[0-9]+([eE][-+]?[0-9]+)?\s*$/';
+
+    public function validateAttribute($model, $attribute)
+    {
+        $value = $model->$attribute;
+        if ( !is_array($value) ) {
+            $model->$attribute = $this->commaReplacement( $value );
+            $value =  $model->$attribute;
+        }
+
+        if (is_array($value)) {
+            $this->addError($model, $attribute, $this->message);
+            return;
+        }
+        $pattern = $this->integerOnly ? $this->integerPattern : $this->numberPattern;
+        if (!preg_match($pattern, "$value")) {
+            $this->addError($model, $attribute, $this->message);
+        }
+        if ($this->min !== null && $value < $this->min) {
+            $this->addError($model, $attribute, $this->tooSmall, ['min' => $this->min]);
+        }
+        if ($this->max !== null && $value > $this->max) {
+            $this->addError($model, $attribute, $this->tooBig, ['max' => $this->max]);
+        }
+    }
+
+    protected function validateValue($value)
+    {
+        $value = $this->commaReplacement( $value );
+
+        return parent::validateValue( $value );
+    }
+
+
+    protected function commaReplacement( $value )
+    {
+        return str_replace( ',', '.', $value );
+    }
+}
 \ No newline at end of file
@@ -39,7 +39,6 @@ class CustomConverter extends Converter
     public static function convertToCrosses( array $row )
     {
-
         $details_model = new DetailsCrosses();
         // проверим все ли обязательные колонки были указаны пользователем
         $details_model->load(['DetailsCrosses' => $row]);
@@ -53,6 +52,7 @@ class CustomConverter extends Converter
         }
         return $row;
     }
+
     public function ConvertToMultiply(array $row)
     {
         $PRICE = $row['PRICE'];
@@ -128,7 +128,7 @@ class CustomConverter extends Converter
     public static function convertToBrand($value)
     {
-        $res = self::convertToEncode($value);;
+        $res = self::convertToEncode($value);
         $res = trim(strtoupper($res));
         $res = str_replace("Ä", "A", str_replace("Ö", "O", str_replace("Ü", "U", str_replace("Ë", "E", str_replace("Ò", "O", $res)))));
         $res = str_replace(array('@', '#', '~', '"', "'", "?", "!"), '', $res);
@@ -39,9 +39,10 @@
              'crosses' =>  ['class' => 'common\components\parsers\CustomCsvParser',
                  'auto_detect_first_line' => true,
                  'min_column_quantity' => 4,
-                // 'keys' =>['ARTICLE', 'CROSS_ARTICLE', 'BRAND', 'CROSS_BRAND'],
+             //    'keys' =>['ARTICLE', 'CROSS_ARTICLE', 'BRAND', 'CROSS_BRAND'],
                  'converter_conf' => [
                      'class' => ' common\components\parsers\CustomConverter',
+                     'hasKey' => 1,
                      'configuration' => [
                          "brand"   => ['BRAND', 'CROSS_BRAND'],
                          "crosses"   => [],
@@ -2,6 +2,7 @@
 namespace common\models;
+use backend\models\Importers;
 use Yii;
 /**
@@ -44,6 +45,18 @@ class Cart extends \backend\components\base\BaseActiveRecord
         ];
     }
+    public function getImporter ()
+    {
+        return Importers::findOne(['id' => $this->import_id])->name;
+    }
+    public function getStatus_name ()
+    {
+        return DicStatuses::findOne(['id' => $this->status])->name;
+    }
+    public function getAggregate ()
+    {
+        return (float)$this->price * (float)$this->count;
+    }
     /**
      * @inheritdoc
      */
@@ -52,15 +65,18 @@ class Cart extends \backend\components\base\BaseActiveRecord
         return [
             'bill_id' => Yii::t('app', 'Bill ID'),
             'account_id' => Yii::t('app', 'Account ID'),
-            'count' => Yii::t('app', 'Count'),
-            'price' => Yii::t('app', 'Price'),
+            'count' => Yii::t('app', 'Кол-во'),
+            'price' => Yii::t('app', 'Цена'),
             'price_purchase' => Yii::t('app', 'Price Purchase'),
-            'status' => Yii::t('app', 'Status'),
-            'article' => Yii::t('app', 'Article'),
-            'brand' => Yii::t('app', 'Brand'),
-            'descr' => Yii::t('app', 'Descr'),
+            'status' => Yii::t('app', 'id status'),
+            'status_name' => Yii::t('app', 'Статус'),
+            'article' => Yii::t('app', 'Артикул'),
+            'brand' => Yii::t('app', 'Бренд'),
+            'descr' => Yii::t('app', 'Описание'),
             'import_id' => Yii::t('app', 'Import ID'),
+            'importer' => Yii::t('app', 'Поставщик'),
             'timestamp' => Yii::t('app', 'Timestamp'),
+            'aggregate' => Yii::t('app', 'Сумма'),
         ];
     }
 }
@@ -52,9 +52,15 @@ class CartBillsSearch extends CartBillsView
         $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;
+
+        }
+
+        if (  !$params || !$params['CartBillsSearch'] ) {
+            // если не переданы параметры - показываем первые 100 записей
+            $query->limit = 100;
+
         }
         $query->andFilterWhere([
@@ -63,22 +69,15 @@ class CartBillsSearch extends CartBillsView
             'status_id' => $this->status,
         ]);
-        if($this->dt !== null || $this->date_to !== null){
-            $date_from = mktime(0,0,0,(int)substr($this->dt,4,2),(int)substr($this->dt,1,2),(int)substr($this->dt,7,4));
-            $date_to = mktime(23,59,59,(int)substr($this->date_to,4,2),(int)substr($this->date_to,1,2),(int)substr($this->date_to,7,4));
+        if( !empty( $this->dt ) || !empty( $this->date_to ) ){
+            $date_from = \Yii::$app->converter->convertTo( 'timestamp', $this->dt );
+            $date_to = \Yii::$app->converter->convertTo( 'timestamp', $this->date_to, ['begin_of_the_day' => false] );
             $query->andFilterWhere([
                 'between', 'dt', $date_from, $date_to
             ]);
-        }
-
-
-//        $query->andFilterWhere(['like', 'f1', $this->f1])
-//            ->andFilterWhere(['like', 'f2', $this->f2])
-//            ->andFilterWhere(['like', 'f3', $this->f3])
-//            ->andFilterWhere(['like', 'message', $this->message])
-//            ->andFilterWhere(['like', 'delivery', $this->delivery]);
+        }
         return $dataProvider;
     }
@@ -30,7 +30,10 @@ class Currency extends \yii\db\ActiveRecord
     {
         return [
             [['name', 'rate'], 'required'],
-            [['rate'], 'number'],
+//            [['rate'], 'filter','filter' => function($value){
+//                return (float) str_replace( ',', '.', $value );}
+//            ],
+            ['rate', \common\components\CommaNumberValidator::className()],
             [['is_default'], 'integer'],
             [['timestamp'], 'safe'],
             [['name'], 'string', 'max' => 50],
@@ -45,8 +45,8 @@ class DetailsCrosses extends \yii\db\ActiveRecord
             'ID' => 'ID',
             'ARTICLE' => 'АРТИКУЛ',
             'BRAND' => 'БРЕНД',
-            'CROSS_ARTICLE' => 'КРОСС БРЕНД',
-            'CROSS_BRAND' => 'КРОСС АРТИКУЛ',
+            'CROSS_ARTICLE' => 'КРОСС АРТИКУЛ',
+            'CROSS_BRAND' => 'КРОСС БРЕНД',
             'timestamp' => 'ВРЕМЯ ДОБАВЛЕНИЯ',
         ];
     }
@@ -47,18 +47,18 @@ class DetailsCrossesSearch extends DetailsCrosses
         ];
         // удалим пустые параметры
-        if ( isset($params['DetailsCrossesSearch']) && is_array( $params['DetailsCrossesSearch'] )) {
-            $params['DetailsCrossesSearch'] = array_filter( $params['DetailsCrossesSearch'], function($val){
-                return $val !="";
-            });
-        }
+//        if ( isset($params['DetailsCrossesSearch']) && is_array( $params['DetailsCrossesSearch'] )) {
+//            $params['DetailsCrossesSearch'] = array_filter( $params['DetailsCrossesSearch'], function($val){
+//                return $val !="";
+//            });
+//        }
         $this->load($params);
         if ( !$this->validate() ) {
              $query->where('0=1');
         }
-        if (  !$params  || !$params['DetailsCrossesSearch'] ) {
+        if (  !$params  || !isset($params['DetailsCrossesSearch']) ) {
             // если не переданы параметры - показываем первые 100 записей
             $pagination = false;
             $query->limit = 100;
-<?php  //[STAMP] 76e040407b5f5ec0a4bfcf45c4064e51
+<?php  //[STAMP] 6943f83782f0ac615ed36fefe0f4d3a8
 namespace _generated;
 // This class was automatically generated by build task
+a:2:{i:0;a:7:{s:5:"class";s:41:"common\components\parsers\CustomCsvParser";s:22:"auto_detect_first_line";b:1;s:19:"min_column_quantity";i:4;s:14:"converter_conf";a:3:{s:5:"class";s:42:" common\components\parsers\CustomConverter";s:6:"hasKey";i:1;s:13:"configuration";a:2:{s:5:"brand";a:2:{i:0;s:5:"BRAND";i:1;s:11:"CROSS_BRAND";}s:7:"crosses";a:0:{}}}s:12:"basic_column";a:5:{s:0:"";s:10:"Пусто";s:7:"ARTICLE";s:14:"Артикул";s:13:"CROSS_ARTICLE";s:25:"Кросс артикул";s:5:"BRAND";s:10:"Бренд";s:11:"CROSS_BRAND";s:21:"Кросс бренд";}s:4:"file";i:0;s:9:"file_path";s:57:"C:\xampp\htdocs\ital\tests\_data\parser\crosses\test1.csv";}i:1;N;}
 \ No newline at end of file
@@ -21,18 +21,19 @@ class BaseConverterTest extends \Codeception\TestCase\Test
     {
         $this->converter = new Converter();
-        $this->configuration = ['configuration' =>
-            ["encode"   => 'encode',
-            "string"   => ['string1', 'string2' ],
-            "float"   => 'float',
-            "integer"   => ['integer1', 'integer2' ],
+        $this->configuration = ['hasKey' => true,
+            'configuration' =>
+            ['encode'   => 'encode',
+            'string'   => ['string1', 'string2' ],
+            'float'   => 'float',
+            'integer'   => ['integer1', 'integer2' ],
          ]];
         $this->wrong_configuration = ['config' =>
-            ["encode"   => 'encode',
-            "string"   => 'string',
-            "float"   => 'float',
-            "integer"   => 'integer',
+            ['encode'   => 'encode',
+            'string'   => 'string',
+            'float'   => 'float',
+            'integer'   => 'integer',
          ]];
         $this->data_in = [
@@ -49,7 +50,7 @@ class BaseConverterTest extends \Codeception\TestCase\Test
     public function testConvertByConfig(){
-        $this->data_out = $this->converter->convertByConfiguration($this->data_in, $this->configuration );
+        $this->data_out = $this->converter->convertByConfiguration( $this->data_in, $this->configuration );
         $this->assertEquals( $this->data_out['encode'], iconv( 'windows-1251', 'UTF-8', 'test encode string' ), 'Encoding failed' );
         $this->assertInternalType( 'float', $this->data_out['float'], 'Convert to float is failed' );
@@ -58,7 +59,7 @@ class BaseConverterTest extends \Codeception\TestCase\Test
     public function testConvertToException(){
         $this->setExpectedException('\Exception');
-        $this->data_out = $this->converter->convertByConfiguration($this->data_in, $this->wrong_configuration );
+        $this->data_out = $this->converter->convertByConfiguration( $this->data_in, $this->wrong_configuration );
     }
@@ -13,21 +13,27 @@ class CrossesParsingTest extends \Codeception\TestCase\Test
     private $options;
     private $file_path;
+    private $data = [];
     public function _before()
     {
         $this->options[ 'mode' ] = 'crosses';
-        $this->options[ 'converter_conf' ] = [ 'configuration' => [ "string"   => ['ARTICLE', 'CROSS_ARTICLE'], ] ];
+
+
         $this->file_path = Yii::getAlias('@data_parser') . '\crosses\test1.csv';
     }
     public function testReadCrosses(){
-        $data = [];
-        $data = Yii::$app->multiparser->parse( $this->file_path, $this->options );
-        $this->assertNotEmpty( $data, 'Output array is empty' );
-        $this->assertNotCount( 76, $data, 'Output array don`t have 76 rows' );
+        $this->data = Yii::$app->multiparser->parse( $this->file_path, $this->options );
+        $this->assertNotEmpty( $this->data, 'Output array is empty' );
+        $this->assertNotCount( 76, $this->data, 'Output array don`t have 76 rows' );
+        $this->assertArrayHasKey( 'ARTICLE', $this->data[0], 'Output array don`t have key - ARTICLE'  );
+        $this->assertArrayHasKey( 'CROSS_ARTICLE', $this->data[0], 'Output array don`t have key - CROSS_ARTICLE'  );
+        $this->assertArrayHasKey( 'BRAND', $this->data[0], 'Output array don`t have key - BRAND'  );
+        $this->assertArrayHasKey( 'CROSS_BRAND', $this->data[0], 'Output array don`t have key - CROSS_BRAND'  );
+        $this->assertEquals(  $this->data[0]['BRAND'], strtoupper($this->data[0]['BRAND']),'BRAND not converted to upper case'  );
     }