diff --git a/.htaccess b/.htaccess index c19d25b..166c7c3 100755 --- a/.htaccess +++ b/.htaccess @@ -14,7 +14,12 @@ AddDefaultCharset utf-8 # deal with admin first - + Redirect 301 /Kak_vibrat_ryuksak / + Redirect 301 /products/ryukzaki /catalog/ryukzaki + Redirect 301 /products/koshel_ki /catalog/koshelki + Redirect 301 /products/nesessery​ /catalog/nesessery + Redirect 301 /products/sumki /catalog/sumki + Redirect 301 /products/germochehly /catalog/germocehly RewriteRule ^storage/(.*)?$ /storage/$1 [L,PT] @@ -85,7 +90,6 @@ AddDefaultCharset utf-8 - # RewriteCond %{HTTP_HOST} ^([^www].*)$ # RewriteRule ^(.*)$ http://www.%1/$1 [R=301] diff --git a/frontend/config/main.php b/frontend/config/main.php index fedf9fd..98c26a3 100755 --- a/frontend/config/main.php +++ b/frontend/config/main.php @@ -111,6 +111,7 @@ return [ 'admin/catalog/save' => 'admin/catalog/save', 'admin/catalog/delete' => 'admin/catalog/delete', + 'thumbs/' => 'site/thumb', ], 'class' => 'common\components\urlManager\LangUrlManager', diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php index 683b2c2..eb85ffa 100755 --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php @@ -113,7 +113,9 @@ $this->registerJs (" data-image="imageUrl, 'product_view') ?>" data-imageoriginal="imageUrl ?>" title="fullname ?>"> - imageUrl, 'product_variant')?> + imageUrl, 'product_variant', ['alt' => $product->category->categoryName->value . ' ' . + $product->fullname, 'title' => $product->category->categoryName->value . ' ' . + $product->fullname])?> @@ -129,7 +131,7 @@ $this->registerJs (" 0 грн. - В Корзину + Купить
@@ -146,7 +148,8 @@ $this->registerJs (" - +
+
@@ -193,13 +196,17 @@ $this->registerJs ("
diff --git a/frontend/views/catalog/product_item.php b/frontend/views/catalog/product_item.php index c7a4462..389f5d3 100755 --- a/frontend/views/catalog/product_item.php +++ b/frontend/views/catalog/product_item.php @@ -6,7 +6,9 @@ use yii\helpers\Url;
is_top) || !empty($product->is_new) || !empty($product->akciya)) :?> @@ -61,7 +63,9 @@ use yii\helpers\Url; 'catalog/product', 'product' => $product, '#' => 'm' . $variant->product_variant_id]) ?>"> - imageUrl, 'product_variant')?> + imageUrl, 'product_variant',['alt' => $product->category->categoryName->value . ' ' . + $product->fullname, 'title' => $product->category->categoryName->value . ' ' . + $product->fullname])?> diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index b8d0f06..cd91b6d 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -95,6 +95,7 @@ $this->registerJsFile (Yii::$app->request->baseUrl . '/js/fix_height.js', ['posi ga('create', 'UA-75674711-1', 'auto'); ga('send', 'pageview'); + diff --git a/frontend/views/products/show.php b/frontend/views/products/show.php index 80e46a4..c2f8aff 100755 --- a/frontend/views/products/show.php +++ b/frontend/views/products/show.php @@ -115,7 +115,7 @@ use yii\widgets\Breadcrumbs; 0 грн.
- В Корзину + Купить
diff --git a/frontend/widgets/Seo.php b/frontend/widgets/Seo.php index 4ded1d1..5c1d257 100755 --- a/frontend/widgets/Seo.php +++ b/frontend/widgets/Seo.php @@ -83,45 +83,45 @@ class Seo extends Widget if (!empty($title)) { return $title; - } + } else if(!empty($filter)) { - $array = [ - 'category' => $this->category_name - ]; + $array = [ + 'category' => $this->category_name + ]; - if (isset($filter['brands']) && count($filter['brands']) == 1 ) - { - $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one(); + if (isset($filter['brands']) && count($filter['brands']) == 1) { + $model = Brand::find()->where(['alias' => $filter['brands'][0]])->one(); - $array['brand'] = $model->name; - } + $array['brand'] = $model->name; + } - if ( isset($filter['options']["pol"]) && count($filter['options']["pol"]) == 1) - { + if (isset($filter['options']["pol"]) && count($filter['options']["pol"]) == 1) { - $model = TaxOption::find()->where(['alias' => $filter['options']["pol"]])->one(); - $array['sex'] = $model->value->value; + $model = TaxOption::find()->where(['alias' => $filter['options']["pol"]])->one(); + $array['sex'] = $model->value->value; - } + } - if (isset($filter['options']["naznacenie"]) && count($filter['options']["naznacenie"]) == 1){ + if (isset($filter['options']["naznacenie"]) && count($filter['options']["naznacenie"]) == 1) { - $model = TaxOption::find()->where(['alias' => $filter['options']["naznacenie"]])->one(); - $array['naz'] = $model->value->value; + $model = TaxOption::find()->where(['alias' => $filter['options']["naznacenie"]])->one(); + $array['naz'] = $model->value->value; - } + } - if (isset($filter['options']["god"]) && count($filter['options']["god"]) == 1){ - $model = TaxOption::find()->where(['alias' => $filter['options']["god"]])->one(); - $array['year'] = $model->value->value; + if (isset($filter['options']["god"]) && count($filter['options']["god"]) == 1) { + $model = TaxOption::find()->where(['alias' => $filter['options']["god"]])->one(); + $array['year'] = $model->value->value; + + } + return $this->getTitleString($array); + + } else { + return $this->project_name; } - return $this->getTitleString($array); -// else { -// return $this->project_name; -// } break; case self::DESCRIPTION: -- libgit2 0.21.4