add pjax to goods page

Mihail
1 parent 19746059
Showing 5 changed files with 26 additions and 73 deletions Show diff stats
backend/views/parser/index.php
frontend/views/goods/index.php
frontend/views/goods/one_item.php
frontend/web/js/goods.js
frontend/web/js/script.js
@@ -12,8 +12,8 @@ if ( $model-&gt;mode ) {
     $mode = 0;
     $button_label = 'Прочитать';
 }
-
 ?>
+
 <div class="row">
     <div class="col-lg-5">
         <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data',],'action'=>['parser/results', 'mode' => $mode]]);
 <?php
 use yii\data\Sort;
 use \yii\helpers\Html;
+use \yii\widgets\Pjax;
  
 $sort = new Sort([
     'attributes' => [
@@ -17,8 +18,9 @@ $sort = new Sort([
 $this->registerCssFile('/css/BC2_catalog_zapchasti.css');
 $this->registerJsFile('/js/jquery.tablesorter.min.js');
 $this->registerJsFile('/js/goods.js');
+
 $this->params['breadcrumbs'][] = $this->title;
-\yii\widgets\Pjax::begin();
+Pjax::begin();
 ?>
  
  
@@ -113,7 +115,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 <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
                 echo \yii\widgets\ListView::widget([
@@ -141,7 +142,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                 <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
                 echo \yii\widgets\ListView::widget([
@@ -160,7 +160,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 </div>
  
 </div>
-
+<?php
+Pjax::end();
+?>
 <script type="text/javascript">
     function changeText() {
         e = document.getElementById('button_grey_card');
@@ -179,12 +181,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
   })
 </script>
  
-<?php
-\yii\widgets\Pjax::end();
-?>
-
 <div class="modal fade" id="details_content_block" >
-    <div class="modal-dialog">
+    <div class="modal-dialog table_details">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 <?php
 use \yii\helpers\Html;
-$this->registerCssFile('/css/BC2_catalog_zapchasti.css');
 // если товар один и тот же то выводим только цену и кол-во
 // иначе всю информацию
 $new_good = false;
@@ -25,9 +24,9 @@ $cross_prefix = ( empty($model-&gt;crosses) )? &#39;&#39;: &#39;_cross&#39;;
             <a class="tecdoc_id_info" data-toggle="modal" data-target="#details_content_block" data-id="<?= $model->tecdoc_id ?>" href=""><img src="/images/gear.png"></a>
             <a href="" id="go_photo"><img src="/images/icon_cam.png"></a>
         </td>
-<?php $this->endBlock(); ?>
-
-    <?php $this->beginBlock('empty_details');
+<?php
+    $this->endBlock();
+    $this->beginBlock('empty_details');
     // иначе пустой блок
     ?>
         <tr style="border-bottom: 0;border-top: 0;">
 $( document ).ready(function() {
-    // кнопки с переключателями валюты с основной таблицы
-    var btn_eur = document.getElementById('euro');
-    var btn_uah = document.getElementById('grivna');
-    var btn_usd = document.getElementById('dollars');
-    // кнопки с переключателями валюты таблицы с кроссами
-    var cross_btn_eur = document.getElementById('cross_euro');
-    var cross_btn_uah = document.getElementById('cross_grivna');
-    var cross_btn_usd = document.getElementById('cross_dollars');
-
     // для таблицы кроссов, классы обозначаются через cross_
     var cross_prefix = '';
  
@@ -15,52 +6,23 @@ $( document ).ready(function() {
     var show_currency = ['usd'];
     var hidden_currency = ['uah','eur'];
  
-    // назначим события кнопкам переключателей валюты
-    if(btn_eur)
-        btn_eur.onclick = changeEUR;
-    if(btn_uah)
-        btn_uah.onclick = changeUAH;
-    if(btn_usd)
-        btn_usd.onclick = changeUSD;
-    if(cross_btn_eur)
-        cross_btn_eur.onclick = changeEUR;
-    if(cross_btn_uah)
-        cross_btn_uah.onclick = changeUAH;
-    if(cross_btn_usd)
-        cross_btn_usd.onclick = changeUSD;
-
-
-    function changeEUR(){
-        //if( $(this).hasClass('cross_currency') ){
-        //    cross_prefix = '_cross';
-        //}else{
-        //    cross_prefix = '';
-        //}
+    $( document ).on( "click", ".currency", changeCurrency );
  
-        show_currency = ['eur'];
-        hidden_currency = ['uah','usd'];
-        setVisiblePrice();
-    }
-    function changeUAH(){
-        //if( $(this).hasClass('cross_currency') ){
-        //    cross_prefix = '_cross';
-        //}else{
-        //    cross_prefix = '';
-        //}
+    function changeCurrency(){
  
-        show_currency = ['uah'];
-        hidden_currency = ['eur','usd'];
-        setVisiblePrice();
-    }
-    function changeUSD(){
-        //if( $(this).hasClass('cross_currency') ){
-        //    cross_prefix = '_cross';
-        //}else{
-        //    cross_prefix = '';
-        //}
+        if( $(this).attr('id') === 'grivna' ){
+            show_currency = ['uah'];
+            hidden_currency = ['eur','usd'];
+        }else if( $(this).attr('id') === 'euro' ) {
+            show_currency = ['eur'];
+            hidden_currency = ['uah','usd'];
+        }else if( $(this).attr('id') === 'dollars' ) {
+            show_currency = ['usd'];
+            hidden_currency = ['uah','eur'];
+        }
+        $('.currency').removeClass('active_button_purple1');
+        $(this).addClass('active_button_purple1');
  
-        show_currency = ['usd'];
-        hidden_currency = ['uah','eur'];
         setVisiblePrice();
     }
  
@@ -68,8 +30,8 @@ $( document ).ready(function() {
         // элементы с классами из show_currency отобразим
         for( var i = 0; i < show_currency.length; i++ ){
             var arr_elements = document.getElementsByClassName(show_currency[i] + cross_prefix);
-            for(var j = 0; j < arr_elements.length; j++ ){
  
+            for(var j = 0; j < arr_elements.length; j++ ){
                 if( arr_elements[j].classList.contains('hidden') )
                     arr_elements[j].classList.remove('hidden');
             }
@@ -578,12 +578,6 @@ $(&#39;.menu_block_center2 .by_articul .menu_search_down&#39;).hover(function(){
 	function(){
 	$(this).find('a:first-child').css({'color':'#6b84b5'});	
 	}
-);		
-$('.currency').click(function(){
-	$('.currency').removeClass('active_button_purple1');
-	$(this).addClass('active_button_purple1');
-
-}
 );
  
 $('.menu_block_center .menu_item').hover(function(){