Commit 423109eb780ccbd2fc0e627e7f0c89b89b9b7d50
Merge remote-tracking branch 'origin/master'
Showing
2 changed files
with
9 additions
and
0 deletions
Show diff stats
CatalogUrlManager.php
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | use artweb\artbox\ecommerce\models\Category; | 5 | use artweb\artbox\ecommerce\models\Category; |
| 6 | use artweb\artbox\ecommerce\models\Product; | 6 | use artweb\artbox\ecommerce\models\Product; |
| 7 | use artweb\artbox\ecommerce\models\ProductVariant; | 7 | use artweb\artbox\ecommerce\models\ProductVariant; |
| 8 | + use yii\helpers\VarDumper; | ||
| 8 | use yii\web\HttpException; | 9 | use yii\web\HttpException; |
| 9 | use yii\web\UrlRuleInterface; | 10 | use yii\web\UrlRuleInterface; |
| 10 | 11 | ||
| @@ -23,6 +24,13 @@ | @@ -23,6 +24,13 @@ | ||
| 23 | */ | 24 | */ |
| 24 | public function parseRequest($manager, $request) | 25 | public function parseRequest($manager, $request) |
| 25 | { | 26 | { |
| 27 | + /** | ||
| 28 | + * Fast url fix. | ||
| 29 | + * Did not helped with catalog products | ||
| 30 | + */ | ||
| 31 | +// if (!preg_match('@^\/(ru|ua).*@i', $request->url) && $request->url !== '/') { | ||
| 32 | +// throw new HttpException(404, 'Page not found'); | ||
| 33 | +// } | ||
| 26 | 34 | ||
| 27 | $pathInfo = $request->getPathInfo(); | 35 | $pathInfo = $request->getPathInfo(); |
| 28 | $paths = explode('/', $pathInfo); | 36 | $paths = explode('/', $pathInfo); |
models/ProductVariant.php
| @@ -36,6 +36,7 @@ | @@ -36,6 +36,7 @@ | ||
| 36 | * @property TaxGroup[] $properties | 36 | * @property TaxGroup[] $properties |
| 37 | * @property TaxGroup[] $taxGroupsByLevel | 37 | * @property TaxGroup[] $taxGroupsByLevel |
| 38 | * @property string $size | 38 | * @property string $size |
| 39 | + * @property string $imageUrl | ||
| 39 | * * From language behavior * | 40 | * * From language behavior * |
| 40 | * @property ProductVariantLang $lang | 41 | * @property ProductVariantLang $lang |
| 41 | * @property ProductVariantLang[] $langs | 42 | * @property ProductVariantLang[] $langs |