Commit 8cfcee735b6962515bb334dbcbe2034100e59e9b
1 parent
cf8373f3
big commti
Showing
2 changed files
with
7 additions
and
2 deletions
Show diff stats
common/models/Event.php
... | ... | @@ -145,7 +145,7 @@ class Event extends \yii\db\ActiveRecord |
145 | 145 | } |
146 | 146 | |
147 | 147 | public static function getSaleEvents(){ |
148 | - return ArrayHelper::toArray(self::find()->select('percent')->distinct('percent')->where('sale=true AND percent IS NOT NULL')->all()); | |
148 | + return ArrayHelper::toArray(self::find()->select('percent')->distinct('percent')->where('sale=true AND percent IS NOT NULL')->orderBy('percent')->all()); | |
149 | 149 | } |
150 | 150 | |
151 | 151 | ... | ... |
common/modules/product/CatalogUrlManager.php
... | ... | @@ -168,7 +168,12 @@ class CatalogUrlManager implements UrlRuleInterface { |
168 | 168 | // Filter |
169 | 169 | |
170 | 170 | if (strpos($paths[2], 'filters:') === 0) { |
171 | - $this->parseFilter($paths[2], $params); | |
171 | + if(!isset($paths[3])){ | |
172 | + $this->parseFilter($paths[2], $params); | |
173 | + } else { | |
174 | + throw new HttpException(404 ,'Page not found'); | |
175 | + } | |
176 | + | |
172 | 177 | |
173 | 178 | } |
174 | 179 | else { | ... | ... |