add multisort functional in goods controller

Mihail
1 parent b13c67c3
Showing 8 changed files with 95 additions and 74 deletions Show diff stats
common/models/GoodsViewSearch.php
console/migrations/m151219_103804_goods_view.php
frontend/controllers/GoodsController.php
frontend/views/goods/index.php
frontend/views/goods/one_item.php
frontend/web/css/BC2_catalog_zapchasti.css
frontend/web/js/goods.js
frontend/web/js/script.js
@@ -38,7 +38,7 @@ class GoodsViewSearch extends GoodsView
      *
      * @return ActiveDataProvider
      */
-    public function search($params)
+    public function search( $params, $sort )
     {
         $query = GoodsView::find();
@@ -53,7 +53,8 @@ class GoodsViewSearch extends GoodsView
             'brand' => $this->brand,
         ]);
-        $query->andWhere(['or', 'box > 0', 'add_box > 0'])->orderBy(['price' => SORT_DESC]);
+
+        $query->andWhere(['or', 'box > 0', 'add_box > 0'])->orderBy( $sort );
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
@@ -62,7 +63,7 @@ class GoodsViewSearch extends GoodsView
         return $dataProvider;
     }
-    public function searchCrosses($params)
+    public function searchCrosses( $params, $sort )
     {
         $query = GoodsView::find()->innerJoin('w_details_crosses', '`w_details_crosses`.`ARTICLE` = `name` and `w_details_crosses`.`BRAND` = w_goods_view.`brand`')->select('w_goods_view.*, w_details_crosses.CROSS_BRAND as crosses' );
@@ -77,7 +78,7 @@ class GoodsViewSearch extends GoodsView
             'w_details_crosses.CROSS_BRAND' => $this->brand,
         ]);
-        $query->andWhere(['or', 'box > 0', 'add_box > 0'])->orderBy(['price' => SORT_DESC]);
+        $query->andWhere(['or', 'box > 0', 'add_box > 0'])->orderBy( $sort );
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
@@ -40,9 +40,9 @@ class m151219_103804_goods_view extends Migration
                      if (`w_details_description`.`image` = '',
                          if (`w_details_description`.`tecdoc_image` = '',
                              '',
-                             concat('ital_origin/images/tecdoc/big/',`w_details_description`.`tecdoc_image`)
+                             concat('/storage/images/tecdoc/big/',`w_details_description`.`tecdoc_image`)
                          ),
-                         concat('ital_origin/images/goods/big/',`w_details_description`.`image`)
+                         concat('/storage/images/goods/big/',`w_details_description`.`image`)
                      ) as `image`,
   `w_details_description`.`tecdoc_id`,
@@ -16,49 +16,91 @@ use Yii;
 use yii\web\Controller;
 use common\models\Details;
-class GoodsController extends Controller {
+class GoodsController extends Controller
+{
     public $layout = '/internal';
-    public function actionIndex( $name , $id )
+    public function actionIndex($name, $id)
     {
-
-        $arr_name = explode('_',$name);
+        $arr_name = explode('_', $name);
         $brand = $arr_name[0];
         $article = $arr_name[1];
+        $params = Yii::$app->request->getQueryParams();
+
+        // получим параметры сортировки из гет запроса
+        $sort_params_or = $this->getSortParams($params, 'or');
+        $sort_params_cross = $this->getSortParams($params, 'cross');
         $arr_values = ['name' => $article,
-                'brand' => $brand];
+            'brand' => $brand];
         $arr = ['GoodsViewSearch' => $arr_values];
-        if(empty( Yii::$app->user->identity )){
+        if (empty(Yii::$app->user->identity)) {
             $margin_id = 1;
-        }else{
+        } else {
             $margin_id = Yii::$app->user->identity->margin_id;
         }
-//        $arr = ['GoodsViewSearch' => ['name' => '0092S40090',
-//            'brand' => 'BOSCH']];
-
-
         Yii::$app->session->setFlash('price_currency_id', 1);
         Yii::$app->session->setFlash('price_margin_id', $margin_id);
         $searchModel = new GoodsViewSearch();
-        $goods_provider = $searchModel->search($arr);
+        $goods_provider = $searchModel->search($arr, $sort_params_or);
-        $crosses_provider = $searchModel->searchCrosses($arr);
+        $crosses_provider = $searchModel->searchCrosses($arr, $sort_params_cross);
         // для заголовка таблицы (карточка товара)
         $detailsModel = GoodsView::findOne($arr_values);
-        return $this->render('index',[
+        return $this->render('index', [
             'goods_data_provider' => $goods_provider,
             'crosses_data_provider' => $crosses_provider,
             'detailsModel' => $detailsModel,
         ]);
     }
+    /**
+     * @param $params - массив параметров для сортировки
+     * @param $prefix - строка, перфикс таблицы сортировки (_or / _cross )
+     * @return массив - итоговый массив с параемтрами для сортировки который подставляется в запрос
+     */
+    protected function getSortParams($params, $prefix)
+    {
+        $default_sort_params = ['price' => SORT_DESC];
+        $sort_params = [];
+
+        if ( empty( $params['sort'] ) ) {
+            // нет параметров - сортируем по цене по убыванию
+            $sort_params = $default_sort_params;
+
+        } else {
+            // разбираем парметры
+            $sort_arr = explode('_', $params['sort']);
+            if ($sort_arr[1] === $prefix) {
+                if ($sort_arr[0][0] === '-') {
+                    // если первый символ "-", то по убыванию
+                    $sort_arr[0] = str_replace('-', '', $sort_arr[0]);
+                    $sort_params[$sort_arr[0]] = SORT_ASC;
+                } else {
+                    $sort_params[$sort_arr[0]] = SORT_DESC;
+                }
+            }
+            if ( empty( $sort_params ) ) {
+                // если так и ненашли подходящих параметров, значит сортируем другую таблицу
+                // а для этой вытащим из кеша или дефолтная сортировка
+                if ( Yii::$app->cache->exists( "sort_{$prefix}" ) ) {
+                    $sort_params = Yii::$app->cache->get( "sort_{$prefix}" );
+                } else {
+                    $sort_params = $default_sort_params;
+                }
+            } else {
+                Yii::$app->cache->set( "sort_{$prefix}", $sort_params, 300 );
+            }
+        }
+
+        return $sort_params;
+    }
 }
 \ No newline at end of file
@@ -4,12 +4,13 @@ use \yii\helpers\Html;
 $sort = new Sort([
     'attributes' => [
-        'box' => ['label' => 'Наличие'],
-        'delivery' => ['label' => 'Срок'],
-        'price' => [
-            'asc' => ['price' => SORT_ASC ],
-            'desc' => ['price' => SORT_DESC],
-            'default' => SORT_DESC,
+        'box_or' => ['label' => 'Наличие'],
+        'delivery_or' => ['label' => 'Срок'],
+        'price_or' => [
+            'label' => 'Цена'],
+        'box_cross' => ['label' => 'Наличие'],
+        'delivery_cross' => ['label' => 'Срок'],
+        'price_cross' => [
             'label' => 'Цена'],
     ],
 ]);
@@ -108,9 +109,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 <td class="medium_width row_name">Номер детали</td>
                 <td class="large_width row_name">Описание</td>
                 <td class="row_select1 row_name"></td>
-                <td class="right_large row_name link_sort arrow_up"><?= $sort->link('box') ?></td>
-                <td class="right_small row_name link_sort arrow_up"><?= $sort->link('delivery') ?></td>
-                <td class="right_medium row_name link_sort arrow_up"><?= $sort->link('price') ?></td>
+                <td class="right_large row_name link_sort arrow_up"><?= $sort->link('box_or') ?></td>
+                <td class="right_small row_name link_sort arrow_up"><?= $sort->link('delivery_or') ?></td>
+                <td class="right_medium row_name link_sort arrow_up"><?= $sort->link('price_or') ?></td>
             </tr>
             <?php
@@ -128,9 +129,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     </div>
     <div class="second_section">
         <p class="bold_line">Замены искомого производителя</p>
-        <p class="cross_currency opposite" id="cross_grivna">UAH</p>
-        <p class="cross_currency active_button_purple1" id="cross_dollars">USD</p>
-        <p class="cross_currency opposite" id="cross_euro">EUR</p>
+        <p </p>
         <table class="tovar_table" cellspacing="0" cellpadding="0" border="0">
             <tbody>
             <tr class="name">
@@ -138,9 +137,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 <td class="medium_width row_name">Номер детали</td>
                 <td class="large_width row_name">Описание</td>
                 <td class="row_select1 row_name"></td>
-                <td class="right_large row_name link_sort arrow_up">Наличие</td>
-                <td class="right_small row_name link_sort arrow_up">Срок</td>
-                <td class="right_medium row_name link_sort arrow_up">Цена</td>
+                <td class="right_large row_name link_sort arrow_up"><?= $sort->link('box_cross') ?></td>
+                <td class="right_small row_name link_sort arrow_up"><?= $sort->link('delivery_cross') ?></td>
+                <td class="right_medium row_name link_sort arrow_up"><?= $sort->link('price_cross') ?></td>
             </tr>
             <?php
@@ -76,15 +76,15 @@ $cross_prefix = ( empty($model-&gt;crosses) )? &#39;&#39;: &#39;_cross&#39;;
                 <tr  border='0' style='border-top:0; border-left:0'><td  border='0' style='border-top:0; border-left:0'><?= $model->delivery?> дн.</td></tr>
             </table></td>
-        <td class="usd<?=$cross_prefix?> right_medium"><table class="inner" border='0' style='border-top:0; border-left:0'>
+        <td class="usd right_medium"><table class="inner" border='0' style='border-top:0; border-left:0'>
                 <tr  border='0' style='border-top:0; border-left:0'><td  border='0' style='border-top:0; border-left:0'><?= \Yii::$app->formatter->asDecimal( $model->outputPriceUSD )?></td></tr>
             </table></td>
-    <td class="hidden uah<?=$cross_prefix?> right_medium"><table class="inner" border='0' style='border-top:0; border-left:0'>
+    <td class="hidden uah right_medium"><table class="inner" border='0' style='border-top:0; border-left:0'>
                 <tr  border='0' style='border-top:0; border-left:0'><td  border='0' style='border-top:0; border-left:0'><?= \Yii::$app->formatter->asDecimal( $model->outputPriceUAH )?></td></tr>
             </table></td>
-    <td class="hidden eur<?=$cross_prefix?> right_medium"><table class="inner" border='0' style='border-top:0; border-left:0'>
+    <td class="hidden eur right_medium"><table class="inner" border='0' style='border-top:0; border-left:0'>
                 <tr  border='0' style='border-top:0; border-left:0'><td  border='0' style='border-top:0; border-left:0'><?= \Yii::$app->formatter->asDecimal( $model->outputPriceEUR )?></td></tr>
             </table></td>
@@ -124,22 +124,6 @@
     position: relative;
     text-align: center;
 }
-.cross_currency{
-	display:inline-block;
-
-    font-weight: normal;
-    color: #6c83b5;
-    height: 21px;
-    width: 36px;
-    border-radius: 4px 0 0 4px;
-    border: 1px solid #efeff0;
-    background-color: #efeff0;
-    cursor: pointer;
-    float:right;
-    display: inline-block;
-    position: relative;
-    text-align: center;
-}
 .currency1{
 	display:inline-block;
@@ -31,33 +31,33 @@ $( document ).ready(function() {
     function changeEUR(){
-        if( $(this).hasClass('cross_currency') ){
-            cross_prefix = '_cross';
-        }else{
-            cross_prefix = '';
-        }
+        //if( $(this).hasClass('cross_currency') ){
+        //    cross_prefix = '_cross';
+        //}else{
+        //    cross_prefix = '';
+        //}
         show_currency = ['eur'];
         hidden_currency = ['uah','usd'];
         setVisiblePrice();
     }
     function changeUAH(){
-        if( $(this).hasClass('cross_currency') ){
-            cross_prefix = '_cross';
-        }else{
-            cross_prefix = '';
-        }
+        //if( $(this).hasClass('cross_currency') ){
+        //    cross_prefix = '_cross';
+        //}else{
+        //    cross_prefix = '';
+        //}
         show_currency = ['uah'];
         hidden_currency = ['eur','usd'];
         setVisiblePrice();
     }
     function changeUSD(){
-        if( $(this).hasClass('cross_currency') ){
-            cross_prefix = '_cross';
-        }else{
-            cross_prefix = '';
-        }
+        //if( $(this).hasClass('cross_currency') ){
+        //    cross_prefix = '_cross';
+        //}else{
+        //    cross_prefix = '';
+        //}
         show_currency = ['usd'];
         hidden_currency = ['uah','eur'];
@@ -557,12 +557,7 @@ $(&#39;.currency&#39;).click(function(){
 }
 );
-    $('.cross_currency').click(function(){
-	$('.cross_currency').removeClass('active_button_purple1');
-	$(this).addClass('active_button_purple1');
-}
-);
 $('.menu_block_center .menu_item').hover(function(){
 	$(this).find('p').addClass('pcolor')},
 	function(){