Administrator / baucenter

Commit b14c1e82af48f50aa2b1f8727db987d0f94344bf

Authored by Administrator
2 parents 39f31806 c91d116e

Merge remote-tracking branch 'origin/master'

Showing 4 changed files with 149 additions and 7 deletions   Show diff stats
Inline Side-by-side
backend/controllers/CategoryController.php
  Show/Hide comments   View file @b14c1e8
@@ -30,7 +30,7 @@ class CategoryController extends Controller @@ -30,7 +30,7 @@ class CategoryController extends Controller
30 'allow' => true, 30 'allow' => true,
31 ], 31 ],
32 [ 32 [
33 - 'actions' => ['logout', 'index','update'], 33 + 'actions' => ['logout', 'index', 'create', 'update', 'view', 'delete'],
34 'allow' => true, 34 'allow' => true,
35 'roles' => ['@'], 35 'roles' => ['@'],
36 ], 36 ],
frontend/controllers/CatalogController.php
  Show/Hide comments   View file @b14c1e8
@@ -133,7 +133,7 @@ class CatalogController extends \yii\web\Controller @@ -133,7 +133,7 @@ class CatalogController extends \yii\web\Controller
133 if (!$group) { 133 if (!$group) {
134 continue; 134 continue;
135 } 135 }
136 - $query->andWhere(Product::tableName() .'.product_id IN (SELECT product_id FROM product_option INNER JOIN tax_option ON tax_option.tax_option_id = product_option.option_id WHERE tax_option.alias IN ('. implode(',', $options_alias) .'))'); 136 + $query->andWhere(Product::tableName() .'.product_id IN (SELECT product_id AS products FROM product_option INNER JOIN tax_option ON tax_option.tax_option_id = product_option.option_id WHERE tax_option.alias IN ('. implode(',', $options_alias) .'))');
137 } 137 }
138 } 138 }
139 139
frontend/views/catalog/product.php
  Show/Hide comments   View file @b14c1e8
@@ -109,24 +109,82 @@ $this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku; @@ -109,24 +109,82 @@ $this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku;
109 </div>--> 109 </div>-->
110 110
111 </div><!-- закрытие блока с характеристиками --> 111 </div><!-- закрытие блока с характеристиками -->
  112 + <hr>
112 113
  114 + <h1 class="with_this">С этим товаром покупают</h1>
  115 +
  116 + <div class="flex_container"><!-- блок - с этим также покупают -->
  117 +
  118 + <div class="my_custom_card">
  119 + <div class="new">АКЦИЯ</div>
  120 + <div class="top">Toп</div>
  121 + <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
  122 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  123 + <div class="brand">Бренд: <span>Knauf</span></div>
  124 + <div class="type">Штукатурки</div>
  125 + <div class="price">102.05 <span>грн.</span></div>
  126 + <button class="basket_add_but">в корзину</button>
  127 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  128 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  129 + </div>
  130 +
  131 + <div class="my_custom_card">
  132 + <div class="new">АКЦИЯ</div>
  133 + <div class="top">Toп</div>
  134 + <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
  135 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  136 + <div class="brand">Бренд: <span>Knauf</span></div>
  137 + <div class="type">Штукатурки</div>
  138 + <div class="price">102.05 <span>грн.</span></div>
  139 + <button class="basket_add_but">в корзину</button>
  140 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  141 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  142 + </div>
  143 +
  144 + <div class="my_custom_card">
  145 + <div class="new">АКЦИЯ</div>
  146 + <div class="top">Toп</div>
  147 + <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
  148 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  149 + <div class="brand">Бренд: <span>Knauf</span></div>
  150 + <div class="type">Штукатурки</div>
  151 + <div class="price">102.05 <span>грн.</span></div>
  152 + <button class="basket_add_but">в корзину</button>
  153 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  154 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  155 + </div>
  156 +
  157 + <div class="my_custom_card">
  158 + <div class="new">АКЦИЯ</div>
  159 + <div class="top">Toп</div>
  160 + <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
  161 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  162 + <div class="brand">Бренд: <span>Knauf</span></div>
  163 + <div class="type">Штукатурки</div>
  164 + <div class="price">102.05 <span>грн.</span></div>
  165 + <button class="basket_add_but">в корзину</button>
  166 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  167 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  168 + </div>
  169 +
  170 + </div> <!-- конец блока - с этим также покупают -->
113 <div class="tabs_block"> <!-- Табы с описанием видео и отзывами --> 171 <div class="tabs_block"> <!-- Табы с описанием видео и отзывами -->
114 <div class="ionTabs" id="tabs_1" data-name="Tabs_Group_name"> 172 <div class="ionTabs" id="tabs_1" data-name="Tabs_Group_name">
115 <ul class="ionTabs__head"> 173 <ul class="ionTabs__head">
116 <?php if (!empty($properties)) :?> 174 <?php if (!empty($properties)) :?>
117 <li class="ionTabs__tab" data-target="Tab_1_name">Характеристики</li> 175 <li class="ionTabs__tab" data-target="Tab_1_name">Характеристики</li>
118 <?php endif?> 176 <?php endif?>
119 - <?php if (!empty($product->description)) :?> 177 + <?php if (TRUE || !empty($product->description)) :?>
120 <li class="ionTabs__tab" data-target="Tab_2_name">Описание</li> 178 <li class="ionTabs__tab" data-target="Tab_2_name">Описание</li>
121 <?php endif?> 179 <?php endif?>
122 - <?php if (!empty($product->description)) :?> 180 + <?php if (TRUE || !empty($product->video)) :?>
123 <li class="ionTabs__tab" data-target="Tab_3_name">Видео</li> 181 <li class="ionTabs__tab" data-target="Tab_3_name">Видео</li>
124 <?php endif?> 182 <?php endif?>
125 <!-- <li class="ionTabs__tab" data-target="Tab_4_name">Отзывы(12)</li>--> 183 <!-- <li class="ionTabs__tab" data-target="Tab_4_name">Отзывы(12)</li>-->
126 </ul> 184 </ul>
127 <div class="ionTabs__body"> 185 <div class="ionTabs__body">
128 <?php if (!empty($properties)) :?> 186 <?php if (!empty($properties)) :?>
129 - <div class="ionTabs__item" data-name="Tab_1_name"> 187 + <div class="ionTabs__item character_block" data-name="Tab_1_name">
130 <ul> 188 <ul>
131 <?php foreach($properties as $group) :?> 189 <?php foreach($properties as $group) :?>
132 <li> 190 <li>
@@ -140,16 +198,25 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku; @@ -140,16 +198,25 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
140 <?php endforeach?> 198 <?php endforeach?>
141 </ul> 199 </ul>
142 </div> 200 </div>
  201 + <?php else :?>
143 <?php endif?> 202 <?php endif?>
144 <?php if (!empty($product->description)) :?> 203 <?php if (!empty($product->description)) :?>
145 <div class="ionTabs__item" data-name="Tab_2_name"> 204 <div class="ionTabs__item" data-name="Tab_2_name">
146 <?= $product->description?> 205 <?= $product->description?>
147 </div> 206 </div>
  207 + <?php else :?>
  208 + <div class="ionTabs__item" data-name="Tab_2_name">
  209 + Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna.
  210 + </div>
148 <?php endif?> 211 <?php endif?>
149 <?php if (!empty($product->video)) :?> 212 <?php if (!empty($product->video)) :?>
150 <div class="ionTabs__item" data-name="Tab_3_name"> 213 <div class="ionTabs__item" data-name="Tab_3_name">
151 <?= $product->video?> 214 <?= $product->video?>
152 </div> 215 </div>
  216 + <?php else :?>
  217 + <div class="ionTabs__item" data-name="Tab_3_name" style="width: 100%; text-align: center">
  218 + <div style="clear: both;width: 100%;"><iframe width="420" height="315" src="https://www.youtube.com/embed/Q5LiO_35s1E" frameborder="0" allowfullscreen></iframe></div>
  219 + </div>
153 <?php endif?> 220 <?php endif?>
154 <!--<div class="ionTabs__item" data-name="Tab_4_name"> 221 <!--<div class="ionTabs__item" data-name="Tab_4_name">
155 <span class="tabs_item_name">Отзывы</span> 222 <span class="tabs_item_name">Отзывы</span>
@@ -160,5 +227,79 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku; @@ -160,5 +227,79 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $product-&gt;name .&#39; #&#39;. $product-&gt;variant-&gt;sku;
160 </div> 227 </div>
161 228
162 </div> <!-- конец табов с описанием видео и отзывами --> 229 </div> <!-- конец табов с описанием видео и отзывами -->
  230 + <div style="clear: both;"></div>
  231 +
  232 +
  233 + <hr>
  234 +
  235 + <div class="watched_block">
  236 + <h1>Вы недавно просматривали</h1>
  237 + <div class="flex-container">
  238 +
  239 + <div class="my_custom_card">
  240 + <div class="new">АКЦИЯ</div>
  241 + <div class="top">Toп</div>
  242 + <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
  243 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  244 + <div class="brand">Бренд: <span>Knauf</span></div>
  245 + <div class="type">Штукатурки</div>
  246 + <div class="price">102.05 <span>грн.</span></div>
  247 + <a href="#" class="test_a">
  248 + <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
  249 + </a>
  250 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  251 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  252 + </div>
  253 +
  254 + <div class="my_custom_card">
  255 + <div class="new">АКЦИЯ</div>
  256 + <div class="top">Toп</div>
  257 + <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
  258 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  259 + <div class="brand">Бренд: <span>Knauf</span></div>
  260 + <div class="type">Штукатурки</div>
  261 + <div class="price">102.05 <span>грн.</span></div>
  262 + <a href="#" class="test_a">
  263 + <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
  264 + </a>
  265 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  266 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  267 + </div>
  268 +
  269 + <div class="my_custom_card">
  270 + <div class="new">АКЦИЯ</div>
  271 + <div class="top">Toп</div>
  272 + <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
  273 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  274 + <div class="brand">Бренд: <span>Knauf</span></div>
  275 + <div class="type">Штукатурки</div>
  276 + <div class="price">102.05 <span>грн.</span></div>
  277 + <a href="#" class="test_a">
  278 + <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
  279 + </a>
  280 + <a href="#" class="compare_add_but"><span>добавить к сравнению</span></a>
  281 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  282 + </div>
  283 +
  284 + <div class="my_custom_card">
  285 + <div class="new">АКЦИЯ</div>
  286 + <div class="top">Toп</div>
  287 + <a href="#" class="item_link"><div class="pic"><img src="/images/no_photo.png"></div>
  288 + <div class="title_item">Штукатурка гипсовая Кнауф Ротбанд 30 кг белая</div></a>
  289 + <div class="brand">Бренд: <span>Knauf</span></div>
  290 + <div class="type">Штукатурки</div>
  291 + <div class="price">102.05 <span>грн.</span></div>
  292 + <a href="#" class="test_a">
  293 + <button class="foo">в корзину<img src="/images/ico_basket_white.png" alt=""></button>
  294 + </a>
  295 + <a href="#" class="compare_add_but_d">
  296 + <img src="/images/ico_scales.png" alt=""><span>добавить к сравнению</span>
  297 + </a>
  298 + <img class="item_bottom_img" src="/images/nc_item_bottom.png" alt="">
  299 + </div>
  300 +
  301 + </div>
  302 +
  303 + </div>
163 304
164 </div> <!-- end flex container --> 305 </div> <!-- end flex container -->
frontend/web/css/concat_all.css
  Show/Hide comments   View file @b14c1e8
@@ -523,7 +523,7 @@ h1 { @@ -523,7 +523,7 @@ h1 {
523 position: absolute; 523 position: absolute;
524 color: #ffffff; 524 color: #ffffff;
525 left: 0px; 525 left: 0px;
526 - top: 14px; 526 + top: 7px;
527 text-transform: uppercase; 527 text-transform: uppercase;
528 font-size: 10px; 528 font-size: 10px;
529 text-align: left; 529 text-align: left;
@@ -551,7 +551,7 @@ h1 { @@ -551,7 +551,7 @@ h1 {
551 padding: 1px 20px 0px 5px; 551 padding: 1px 20px 0px 5px;
552 color: #ffffff; 552 color: #ffffff;
553 left: 0px; 553 left: 0px;
554 - top: 35px; 554 + top: 30px;
555 text-transform: uppercase; 555 text-transform: uppercase;
556 font-size: 10px; 556 font-size: 10px;
557 color: #333333; 557 color: #333333;
@@ -1122,6 +1122,7 @@ hr { @@ -1122,6 +1122,7 @@ hr {
1122 1122
1123 .tabs_block { 1123 .tabs_block {
1124 color: #333333; 1124 color: #333333;
  1125 + width: 100%;
1125 } 1126 }
1126 1127
1127 .watched_block { 1128 .watched_block {