Commit 321296b971a14f9f2329990a6330be1973372eae
1 parent
5b5bfa85
VItaliy 22.12.2015
select details
Showing
4 changed files
with
7 additions
and
4 deletions
Show diff stats
| @@ -12,7 +12,10 @@ AddDefaultCharset utf-8 | @@ -12,7 +12,10 @@ AddDefaultCharset utf-8 | ||
| 12 | 12 | ||
| 13 | RewriteBase / | 13 | RewriteBase / |
| 14 | # deal with admin first | 14 | # deal with admin first |
| 15 | - RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT] | 15 | + |
| 16 | + | ||
| 17 | + | ||
| 18 | + RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT] | ||
| 16 | 19 | ||
| 17 | RewriteCond %{REQUEST_URI} ^/(admin) | 20 | RewriteCond %{REQUEST_URI} ^/(admin) |
| 18 | 21 | ||
| @@ -61,7 +64,7 @@ AddDefaultCharset utf-8 | @@ -61,7 +64,7 @@ AddDefaultCharset utf-8 | ||
| 61 | 64 | ||
| 62 | RewriteCond %{REQUEST_FILENAME} !-d | 65 | RewriteCond %{REQUEST_FILENAME} !-d |
| 63 | 66 | ||
| 64 | - RewriteRule ^.*$ frontend/web/index.php | 67 | + RewriteRule ^.*$ frontend/web/index.php [L] |
| 65 | 68 | ||
| 66 | </IfModule> | 69 | </IfModule> |
| 67 | 70 |
console/migrations/m151219_103804_goods_view.php
| @@ -46,7 +46,7 @@ class m151219_103804_goods_view extends Migration | @@ -46,7 +46,7 @@ class m151219_103804_goods_view extends Migration | ||
| 46 | ) as `image`, | 46 | ) as `image`, |
| 47 | `w_details_description`.`tecdoc_id`, | 47 | `w_details_description`.`tecdoc_id`, |
| 48 | 48 | ||
| 49 | - `w_details`.`PRICE`as `price`, | 49 | + `w_details`.`PRICE` * rate as `price`, |
| 50 | `w_brands`.`ID` as `brand_id` | 50 | `w_brands`.`ID` as `brand_id` |
| 51 | from `w_details` | 51 | from `w_details` |
| 52 | inner join `w_brands` on `w_brands`.`BRAND` = `w_details`.`BRAND` | 52 | inner join `w_brands` on `w_brands`.`BRAND` = `w_details`.`BRAND` |
frontend/views/goods/index.php
| @@ -15,6 +15,7 @@ $this->params['breadcrumbs'][] = $this->title; | @@ -15,6 +15,7 @@ $this->params['breadcrumbs'][] = $this->title; | ||
| 15 | \yii\widgets\Pjax::begin(); | 15 | \yii\widgets\Pjax::begin(); |
| 16 | ?> | 16 | ?> |
| 17 | 17 | ||
| 18 | + | ||
| 18 | <div class='vin table '> | 19 | <div class='vin table '> |
| 19 | <a href="" class='navigation'>Италавто</a> | 20 | <a href="" class='navigation'>Италавто</a> |
| 20 | <img src="/images/arrow_dots.png"> | 21 | <img src="/images/arrow_dots.png"> |
frontend/views/goods/one_item.php
| 1 | <?php | 1 | <?php |
| 2 | use \yii\helpers\Html; | 2 | use \yii\helpers\Html; |
| 3 | 3 | ||
| 4 | - | ||
| 5 | $this->registerCssFile('/css/BC2_catalog_zapchasti.css'); | 4 | $this->registerCssFile('/css/BC2_catalog_zapchasti.css'); |
| 6 | // если товар один и тот же то выводим только цену и кол-во | 5 | // если товар один и тот же то выводим только цену и кол-во |
| 7 | // иначе всю информацию | 6 | // иначе всю информацию |