From 321296b971a14f9f2329990a6330be1973372eae Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 23 Dec 2015 10:56:44 +0200
Subject: [PATCH] VItaliy 22.12.2015 select details

---
 .htaccess                                        | 7 +++++--
 console/migrations/m151219_103804_goods_view.php | 2 +-
 frontend/views/goods/index.php                   | 1 +
 frontend/views/goods/one_item.php                | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 .htaccess

diff --git a/.htaccess b/.htaccess
old mode 100755
new mode 100644
index 9b12d6f..17d3b8c
--- a/.htaccess
+++ b/.htaccess
@@ -12,7 +12,10 @@ AddDefaultCharset utf-8
 
     RewriteBase /
     # deal with admin first
-   RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT]
+
+
+
+    RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT]
 
     RewriteCond %{REQUEST_URI} ^/(admin)
 
@@ -61,7 +64,7 @@ AddDefaultCharset utf-8
 
     RewriteCond %{REQUEST_FILENAME} !-d
 
-    RewriteRule ^.*$ frontend/web/index.php
+    RewriteRule ^.*$ frontend/web/index.php [L]
 
 </IfModule>
 
diff --git a/console/migrations/m151219_103804_goods_view.php b/console/migrations/m151219_103804_goods_view.php
index d798e3c..e626a6c 100644
--- a/console/migrations/m151219_103804_goods_view.php
+++ b/console/migrations/m151219_103804_goods_view.php
@@ -46,7 +46,7 @@ class m151219_103804_goods_view extends Migration
                      ) as `image`,
   `w_details_description`.`tecdoc_id`,
 
-						`w_details`.`PRICE`as `price`,
+						`w_details`.`PRICE` * rate as `price`,
                      `w_brands`.`ID` as `brand_id`
 from `w_details`
   inner join `w_brands` on `w_brands`.`BRAND` = `w_details`.`BRAND`
diff --git a/frontend/views/goods/index.php b/frontend/views/goods/index.php
index 807d519..8cb7de5 100644
--- a/frontend/views/goods/index.php
+++ b/frontend/views/goods/index.php
@@ -15,6 +15,7 @@ $this->params['breadcrumbs'][] = $this->title;
 \yii\widgets\Pjax::begin();
 ?>
 
+
 <div class='vin table '>
     <a href="" class='navigation'>Италавто</a>
     <img src="/images/arrow_dots.png">
diff --git a/frontend/views/goods/one_item.php b/frontend/views/goods/one_item.php
index 08dc67b..845c413 100644
--- a/frontend/views/goods/one_item.php
+++ b/frontend/views/goods/one_item.php
@@ -1,7 +1,6 @@
 <?php
 use \yii\helpers\Html;
 
-
 $this->registerCssFile('/css/BC2_catalog_zapchasti.css');
 // если товар один и тот же то выводим только цену и кол-во
 // иначе всю информацию
--
libgit2 0.21.4