Mihail · Mihail · Mihail · Mihail · Mihail
Showing 11 changed files Show diff stats
backend/views/parser/index.php
common/models/GoodsView.php
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/views/goods/one_item1.php
frontend/web/css/BC2_catalog_zapchasti.css
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]]);
@@ -21,7 +21,7 @@ use Yii;
  * @property string $ID
  * @property string $image
  * @property string $tecdoc_id
- * @property double $price
+ * @property double $price - цена в гривнях
  * @property string $brand_id
  */
@@ -29,8 +29,9 @@ class GoodsView extends \backend\components\base\BaseActiveRecord
 {
     /**
      * @inheritdoc
+     * служебный аттрибут для определения отдельного вывода кроссов и оригинальных деталей
      */
-
+    public $crosses;
     public static function tableName()
     {
@@ -55,7 +56,7 @@ class GoodsView extends \backend\components\base\BaseActiveRecord
     }
     /**
-     * @return string
+     * @return float - price in custom margin_id and currency
      */
     public function getOutputPrice()
     {
@@ -73,7 +74,61 @@ class GoodsView extends \backend\components\base\BaseActiveRecord
         if(!$rate)
             $rate = 1; // если 0, то 1
-        return round($this->price * ($this->rate/$rate) * $koef, 2);
+        return round(( $this->price / $rate) * $koef, 2);
+    }
+    /**
+     * @return float - price in custom margin_id and in USD
+     */
+    public function getOutputPriceUSD()
+    {
+        $price_margin_id = Yii::$app->session->getFlash('price_margin_id',1);
+
+        $koef =  Margins::getDb()->cache( function ($db) use ($price_margin_id) {
+            return (float) Margins::findOne($price_margin_id)->koef;
+        });
+
+        $rate = Currency::getDb()->cache( function ($db) {
+            return (float) Currency::findOne(2)->rate;
+        });
+
+        if(!$rate)
+            $rate = 1; // если 0, то 1
+
+        return round( ($this->price / $rate) * $koef, 2);
+    }
+
+    /**
+     * @return float - price in custom margin_id in EUR
+     */
+    public function getOutputPriceEUR()
+    {
+        $price_margin_id = Yii::$app->session->getFlash('price_margin_id',1);
+
+        $koef =  Margins::getDb()->cache( function ($db) use ($price_margin_id) {
+            return (float) Margins::findOne($price_margin_id)->koef;
+        });
+
+        $rate = Currency::getDb()->cache( function ($db) {
+            return (float) Currency::findOne(3)->rate;
+        });
+
+        if(!$rate)
+            $rate = 1; // если 0, то 1
+
+        return round( ($this->price/$rate) * $koef, 2);
+    }
+    /**
+     * @return float - price in custom margin_id and in UAH
+     */
+    public function getOutputPriceUAH()
+    {
+        $price_margin_id = Yii::$app->session->getFlash('price_margin_id',1);
+
+        $koef =  Margins::getDb()->cache( function ($db) use ($price_margin_id) {
+            return (float) Margins::findOne($price_margin_id)->koef;
+        });
+
+        return round($this->price * $koef, 2);
     }
     public static function primaryKey()
@@ -38,15 +38,10 @@ class GoodsViewSearch extends GoodsView
      *
      * @return ActiveDataProvider
      */
-    public function search($params)
+    public function search( $params, $sort )
     {
         $query = GoodsView::find();
-//        $pagination = [
-//            'pageSize' => 20,
-//        ];
-
-
         $this->load($params);
         if ( !$this->validate() ) {
@@ -58,51 +53,19 @@ class GoodsViewSearch extends GoodsView
             'brand' => $this->brand,
         ]);
-        $query->andWhere(['or', 'box > 0', 'add_box > 0']);
+
+        $query->andWhere(['or', 'box > 0', 'add_box > 0'])->orderBy( $sort );
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
             'key' => 'name',
-            'sort' => [
-                'attributes' => [
-                    'box',
-                    'delivery',
-                    'price'
-                ],
-            ],
-
         ]);
         return $dataProvider;
     }
-    public function searchCrosses($params)
+    public function searchCrosses( $params, $sort )
     {
-        $query = GoodsView::find()->innerJoin('w_details_crosses', '`w_details_crosses`.`CROSS_ARTICLE` = `name` and `w_details_crosses`.`CROSS_BRAND` = w_goods_view.`brand`');
-
-
-//            ->select([
-//            'name' => 'Name',
-//            'brand' => 'w_details_crosses.CROSS_BRAND',
-//            'box' => 'Box',
-//            'add_box' => 'add_box',
-//            'importer_id' => 'importer_id',
-//            'importer_name' => 'importer_name',
-//            'rate' => 'Rate',
-//            'currency_id' => 'currency_id',
-//            'delivery' => 'Delivery',
-//            'description' => 'Description',
-//            'article' => 'w_details_crosses.CROSS_ARTICLE',
-//            'ID' => 'w_goods_view.ID',
-//            'image' => 'Image',
-//            'tecdoc_id' => 'tecdoc_id',
-//            'price' => 'Price',
-//            'brand_id' => 'brand_id',
-//        ]);
-
-//        $pagination = [
-//            'pageSize' => 20,
-//        ];
-
+        $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' );
         $this->load($params);
@@ -111,23 +74,15 @@ class GoodsViewSearch extends GoodsView
         }
         $query->andFilterWhere([
-            'w_details_crosses.ARTICLE' => $this->name,
-            'w_details_crosses.BRAND' => $this->brand,
+            'w_details_crosses.CROSS_ARTICLE' => $this->name,
+            'w_details_crosses.CROSS_BRAND' => $this->brand,
         ]);
-        $query->andWhere(['or', 'box > 0', 'add_box > 0']);
+        $query->andWhere(['or', 'box > 0', 'add_box > 0'])->orderBy( $sort );
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
             'key' => 'name',
-            'sort' => [
-                'attributes' => [
-                    'box',
-                    'delivery',
-                    'price'
-                ],
-            ],
-
         ]);
         return $dataProvider;
@@ -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,20 +16,26 @@ 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 )){
@@ -41,24 +47,70 @@ class GoodsController extends Controller {
 //        $arr = ['GoodsViewSearch' => ['name' => '0092S40090',
 //            'brand' => 'BOSCH']];
+        if (empty(Yii::$app->user->identity)) {
+            $margin_id = 1;
+        } else {
+            $margin_id = Yii::$app->user->identity->margin_id;
+        }
         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
 <?php
 use yii\data\Sort;
 use \yii\helpers\Html;
+use \yii\widgets\Pjax;
 $sort = new Sort([
     'attributes' => [
-        'box' => ['label' => 'Наличие'],
-        'delivery' => ['label' => 'Срок'],
-        'price' => ['label' => 'Цена'],
+        'box_or' => ['label' => 'Наличие'],
+        'delivery_or' => ['label' => 'Срок'],
+        'price_or' => [
+            'label' => 'Цена'],
+        'box_cross' => ['label' => 'Наличие'],
+        'delivery_cross' => ['label' => 'Срок'],
+        'price_cross' => [
+            'label' => 'Цена'],
     ],
 ]);
 $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();
 ?>
@@ -25,9 +33,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <img src="/images/arrow_dots.png">
     <a href="" class='navigation'>Акамуляторы(АКБ)</a>
     <img src="/images/arrow_dots.png">
-    <span>Аккумулятор<span class='detail_name'> 0 092 S30 120: BOSCH</span></span>
+    <span>Аккумулятор<span class='detail_name'> <?= "{$detailsModel->name}: {$detailsModel->brand}"?></span></span>
-        <p class="vin_article">Аккумулятор 0 092 S30 120: BOSCH</p>
+        <p class="vin_article"><?= "{$detailsModel->name}: {$detailsModel->brand}"?></p>
     <div class="tovar_card">
         <div class="search_span zapchasti">
@@ -62,20 +70,25 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         <table class='detail'>
             <tr>
                 <td>
-                    <img src="/images/acamulator_big.png">
-                    <img src="/images/small_plus.png">
+                    <?php
+//                    <img src="/images/acamulator_big.png">
+//                    <img src="/images/small_plus.png">
+                        ?>
                 </td>
                 <td>
-                    <p class='bold_line'>0 092 S30 120: BOSCH</p>
-                    <p class="thin_line">12V 88Ah 740A</p>
-                    <p class='bold_line space'>Емкость, А/Ч:<span class='thin_line'> 88</span></p>
-                    <p class="bold_line">Полярность: Правая (-/+)</p>
+
+                    <p class='bold_line'><?= "{$detailsModel->name}: {$detailsModel->brand}"?></p>
+                    <p class="thin_line"><?= "{$detailsModel->description}"?></p>
+
                 </td>
             </tr>
             <tr class="galery">
-                <td><img src="/images/acamulator_small_gallery.png"><img src="/images/acamulator_small_gallery.png"></td>
+                <?php
+                // <td><img src="/images/acamulator_small_gallery.png"><img src="/images/acamulator_small_gallery.png"></td>
+                ?>
+
             </tr>
         </table>
         <img src="/images/arrow_rounded.png" class='arrow_rounded'>
@@ -89,19 +102,19 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 <div class="vin tables">
     <div class="first_section">
-        <p class="bold_line">12V 88Ah 740A Bosch 0092s30120</p>
-        <p class="currency  opposite" id="dollars">грн</p>
-        <p class="currency active_button_purple1" id="grivna">$</p>
+        <p class="bold_line"><?= "{$detailsModel->description} {$detailsModel->brand} {$detailsModel->name}"?></p>
+        <p class="currency  opposite" id="grivna">UAH</p>
+        <p class="currency active_button_purple1" id="dollars">USD</p>
+        <p class="currency opposite" id="euro">EUR</p>
         <table class="tovar_table" cellspacing="0" cellpadding="0" border="0">
             <tbody><tr class="name">
                 <td class="small_width row_name">Фирма</td>
                 <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
                 echo \yii\widgets\ListView::widget([
@@ -118,8 +131,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     </div>
     <div class="second_section">
         <p class="bold_line">Замены искомого производителя</p>
-        <p class="currency1  opposite1" id="dollars">грн</p>
-        <p class="currency1 active_button_purple11" id="grivna">$</p>
+        <p </p>
         <table class="tovar_table" cellspacing="0" cellpadding="0" border="0">
             <tbody>
             <tr class="name">
@@ -127,10 +139,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
                 echo \yii\widgets\ListView::widget([
@@ -149,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');
@@ -168,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;
@@ -10,9 +8,10 @@ $article_arr = $widget-&gt;dataProvider-&gt;getKeys();
 if ( empty($article_arr[$index - 1]) || $article_arr[$index - 1] != $key )
     // если предыдущий артикул равен текущему, то это тот же товар
     $new_good = true;
-?>
+// определим это вызов основной таблицы или кросс таблицы
+$cross_prefix = ( empty($model->crosses) )? '': '_cross';
-<?php $this->beginBlock('item_details');
+ $this->beginBlock('item_details');
 // выделим отдельно детали товара в блок, для опционального его вывода
 ?>
     <tr style="border-bottom: 0">
@@ -25,9 +24,9 @@ if ( empty($article_arr[$index - 1]) || $article_arr[$index - 1] != $key )
             <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;">
@@ -76,8 +75,16 @@ if ( empty($article_arr[$index - 1]) || $article_arr[$index - 1] != $key )
                 <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="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'><?= $model->outputPrice?></td></tr>
+        <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 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 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>
     </tr>
+<?php
+use \yii\helpers\Html;
+
+$this->registerCssFile('/css/BC2_catalog_zapchasti.css');
+// если товар один и тот же то выводим только цену и кол-во
+// иначе всю информацию
+$new_good = false;
+//в провайдере в качестве ключей установлен - артикул
+$article_arr = $widget->dataProvider->getKeys();
+if ( empty($article_arr[$index - 1]) || $article_arr[$index - 1] != $key )
+    // если предыдущий артикул равен текущему, то это тот же товар
+    $new_good = true;
+?>
+
+<?php $this->beginBlock('item_details');
+// выделим отдельно детали товара в блок, для опционального его вывода
+?>
+    <tr style="border-bottom: 0">
+        <td style="border-bottom: 0" class="small_width"><?= $model->brand?></td>
+        <td style="border-bottom: 0" class="medium_width"><?= $model->article?>
+            <img src="/images/favourite_notactive.png" class="favourite">
+            <img src="/images/favourite.png" class="pose">
+        </td>
+        <td style="border-bottom: 0" class="large_width"><?= $model->description?>
+            <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');
+    // иначе пустой блок
+    ?>
+        <tr style="border-bottom: 0;border-top: 0;">
+            <td  style="border-bottom: 0;border-top: 0;"></td>
+            <td  style="border-bottom: 0;border-top: 0;"></td>
+            <td  style="border-bottom: 0;border-top: 0;"></td>
+
+    <?php $this->endBlock(); ?>
+
+        <?php
+        if($new_good){
+            echo $this->blocks['item_details'];
+        }else{
+            echo $this->blocks['empty_details'];
+        }
+
+        ?>
+        <td class="right">
+            <table class="tovar_table right" cellspacing="0" cellpadding="0" border="0" style="border: 0;">
+                <tbody>
+                <tr class="one" style="border-bottom: 0;
+    border-top: 0;">
+                    <td class="row_select" style="border-bottom: 0;
+    border-top: 0;">
+                        <div class="lend-tovar-cart-left">
+                            <input type="text" class="lend-tovar-cart-number" value="1">
+                            <div class="arrow-cart-lend-wr">
+                                <img class="arrow-cart-lend-1" src="/images/arrow-cart-up.png" width="9" height="6" alt="">
+                                <img class="arrow-cart-lend-2" src="/images/arrow-cart-down1.png" width="9" height="6" alt="">
+                            </div>
+                        </div>
+                        <button class="purple">В корзину</button>
+                    </td>
+
+                </tr>
+                </tbody></table>
+
+        </td>
+        <td class="right_large">
+            <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'><?= $model->box ?></td></tr>
+
+            </table>
+        </td>
+        <td class="right_small"><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'><?= $model->delivery?> дн.</td></tr>
+
+            </table></td>
+        <td class="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'><?= $model->outputPrice?></td></tr>
+
+            </table></td>
+    </tr>
+
+
+    <div id="modal_form_photo">
+        <span id="modal_close"><img src="/images/close_form.png"></span>
+        <img src="<?= $model->image ?>">
+    </div>
 \ No newline at end of file
@@ -531,4 +531,8 @@ td .purple {
     border: 1px solid #dfdfdf;
     width: 180px;
     margin-left: 20px;
-}
 \ No newline at end of file
+}
+/*for prices column*/
+.hidden{
+    display: none;
+}
+$( document ).ready(function() {
+    // для таблицы кроссов, классы обозначаются через cross_
+    var cross_prefix = '';
+
+    // по умолчанию - цены в долларах, остальные скрываем
+    var show_currency = ['usd'];
+    var hidden_currency = ['uah','eur'];
+
+    $( document ).on( "click", ".currency", changeCurrency );
+
+    function changeCurrency(){
+
+        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');
+
+        setVisiblePrice();
+    }
+
+    function setVisiblePrice(){
+        // элементы с классами из 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++ ){
+                if( arr_elements[j].classList.contains('hidden') )
+                    arr_elements[j].classList.remove('hidden');
+            }
+        }
+
+        // элементы с классами из hidden_currency спрячем
+        for( var i = 0; i < hidden_currency.length; i++ ){
+            var arr_elements = document.getElementsByClassName(hidden_currency[i] + cross_prefix);
+            for(var j = 0; j < arr_elements.length; j++ ){
+                if( !arr_elements[j].classList.contains('hidden') )
+                    arr_elements[j].classList.add('hidden');
+            }
+        }
+    }
+
+})
@@ -578,13 +578,8 @@ $(&#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(){
 	$(this).find('p').addClass('pcolor')},
 	function(){