Commit 662e6bfbfc541fc09c4c0c45fc06997ea6171ce2
Merge remote-tracking branch 'origin/master'
Showing
3 changed files
with
23 additions
and
11 deletions
Show diff stats
frontend/models/ProductFrontendSearch.php
| @@ -115,10 +115,13 @@ | @@ -115,10 +115,13 @@ | ||
| 115 | ); | 115 | ); |
| 116 | 116 | ||
| 117 | // $query->groupBy(['product.product_id', 'product_variant.price', 'product_variant.stock']); | 117 | // $query->groupBy(['product.product_id', 'product_variant.price', 'product_variant.stock']); |
| 118 | - $query->orderBy([ | ||
| 119 | - 'brand.sort' => SORT_ASC, | ||
| 120 | - 'product_variant.stock' => SORT_DESC, | ||
| 121 | - ]); | 118 | + $query->orderBy( |
| 119 | + [ | ||
| 120 | + 'brand.sort' => SORT_ASC, | ||
| 121 | + 'product_variant.price' => SORT_ASC, | ||
| 122 | + 'product_variant.stock' => SORT_DESC, | ||
| 123 | + ] | ||
| 124 | + ); | ||
| 122 | ProductHelper::_setQueryParams($query, $params); | 125 | ProductHelper::_setQueryParams($query, $params); |
| 123 | if ($in_stock) { | 126 | if ($in_stock) { |
| 124 | $query->andWhere( | 127 | $query->andWhere( |
| @@ -143,7 +146,8 @@ | @@ -143,7 +146,8 @@ | ||
| 143 | ->innerJoin( | 146 | ->innerJoin( |
| 144 | 'event', | 147 | 'event', |
| 145 | 'event.event_id=events_to_products.event_id' | 148 | 'event.event_id=events_to_products.event_id' |
| 146 | - )->where(['event.sale' => true]), | 149 | + ) |
| 150 | + ->where([ 'event.sale' => true ]), | ||
| 147 | ], | 151 | ], |
| 148 | ] | 152 | ] |
| 149 | ); | 153 | ); |
frontend/views/layouts/main-menu.php
| @@ -41,7 +41,15 @@ $models = Category::find()->orderBy(['sort' => SORT_ASC])->all(); | @@ -41,7 +41,15 @@ $models = Category::find()->orderBy(['sort' => SORT_ASC])->all(); | ||
| 41 | <table cellpadding="0" cellspacing="0" border="0"> | 41 | <table cellpadding="0" cellspacing="0" border="0"> |
| 42 | <tr> | 42 | <tr> |
| 43 | <td> | 43 | <td> |
| 44 | - <?= Html::img(ArtboxImageHelper::getImageSrc(Yii::getAlias(!empty($group['image']) ? '@imagesUrl/tax_option/'. $group['image'] : '/storage/no_photo.png'), 'option_menu'))?> | 44 | + <?= Html::img( |
| 45 | + ArtboxImageHelper::getImageSrc( | ||
| 46 | + Yii::getAlias( | ||
| 47 | + !empty($group[ 'image' ]) ? '@imagesUrl/tax_option/' . $group[ 'image' ] : '/storage/no_photo.png' | ||
| 48 | + ), | ||
| 49 | + 'option_menu' | ||
| 50 | + ), | ||
| 51 | + [ 'alt' => $group[ 'value' ] ] | ||
| 52 | + ) ?> | ||
| 45 | </td> | 53 | </td> |
| 46 | </tr> | 54 | </tr> |
| 47 | </table> | 55 | </table> |
frontend/views/layouts/main.php
| @@ -324,13 +324,13 @@ | @@ -324,13 +324,13 @@ | ||
| 324 | $seo_text = Seo::widget([ 'row'=>'seo_text']); | 324 | $seo_text = Seo::widget([ 'row'=>'seo_text']); |
| 325 | if($seo_text){ | 325 | if($seo_text){ |
| 326 | ?> | 326 | ?> |
| 327 | - <div class="seo-text style"> | 327 | + <div class="seo-text style show"> |
| 328 | <?= $seo_text?> | 328 | <?= $seo_text?> |
| 329 | </div> | 329 | </div> |
| 330 | - <div class="posts-line-wr style"> | ||
| 331 | - <a class="all_seo_text" href="#">Развернуть текст</a> | ||
| 332 | - <div><span></span></div> | ||
| 333 | - </div> | 330 | +<!-- <div class="posts-line-wr style">--> |
| 331 | +<!-- <a class="all_seo_text" href="#">Развернуть текст</a>--> | ||
| 332 | +<!-- <div><span></span></div>--> | ||
| 333 | +<!-- </div>--> | ||
| 334 | 334 | ||
| 335 | <?php } ?> | 335 | <?php } ?> |
| 336 | 336 |