Commit 401fd1e3648518b5bfeccc6f96c9c6c9cdf89948
1 parent
a8aa0f7d
commit from prod
Showing
5 changed files
with
24 additions
and
8 deletions
Show diff stats
.gitignore
.htaccess
| @@ -4,6 +4,14 @@ AddDefaultCharset utf-8 | @@ -4,6 +4,14 @@ AddDefaultCharset utf-8 | ||
| 4 | <IfModule mod_rewrite.c> | 4 | <IfModule mod_rewrite.c> |
| 5 | RewriteEngine On | 5 | RewriteEngine On |
| 6 | 6 | ||
| 7 | + | ||
| 8 | + RewriteCond %{HTTPS} off | ||
| 9 | + RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] | ||
| 10 | + | ||
| 11 | + RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] | ||
| 12 | + RewriteRule ^(.*)$ https://%1/$1 [R=301,L] | ||
| 13 | + | ||
| 14 | + | ||
| 7 | # the main rewrite rule for the frontend application | 15 | # the main rewrite rule for the frontend application |
| 8 | RewriteCond %{REQUEST_URI} !^/(backend/web|admin|storage) | 16 | RewriteCond %{REQUEST_URI} !^/(backend/web|admin|storage) |
| 9 | RewriteRule !^frontend/web /frontend/web%{REQUEST_URI} [L] | 17 | RewriteRule !^frontend/web /frontend/web%{REQUEST_URI} [L] |
| @@ -15,8 +23,8 @@ AddDefaultCharset utf-8 | @@ -15,8 +23,8 @@ AddDefaultCharset utf-8 | ||
| 15 | RewriteCond %{REQUEST_URI} ^/admin | 23 | RewriteCond %{REQUEST_URI} ^/admin |
| 16 | RewriteRule ^admin(.*) /backend/web/$1 [L] | 24 | RewriteRule ^admin(.*) /backend/web/$1 [L] |
| 17 | 25 | ||
| 18 | - RewriteCond %{REQUEST_FILENAME} robots.txt | ||
| 19 | - RewriteRule . /frontend/web/index.php [L] | 26 | + # RewriteCond %{REQUEST_FILENAME} robots.txt |
| 27 | + # RewriteRule . /frontend/web/index.php [L] | ||
| 20 | 28 | ||
| 21 | # if a directory or a file of the uploads folder exists, use the request directly | 29 | # if a directory or a file of the uploads folder exists, use the request directly |
| 22 | RewriteCond %{REQUEST_URI} ^/storage | 30 | RewriteCond %{REQUEST_URI} ^/storage |
| @@ -88,4 +96,4 @@ AddDefaultCharset utf-8 | @@ -88,4 +96,4 @@ AddDefaultCharset utf-8 | ||
| 88 | RewriteCond %{HTTP:Accept-encoding} gzip | 96 | RewriteCond %{HTTP:Accept-encoding} gzip |
| 89 | RewriteCond %{REQUEST_FILENAME}.gz -f | 97 | RewriteCond %{REQUEST_FILENAME}.gz -f |
| 90 | RewriteRule ^(.*)$ $1.gz [QSA,L] | 98 | RewriteRule ^(.*)$ $1.gz [QSA,L] |
| 91 | -</IfModule> | ||
| 92 | \ No newline at end of file | 99 | \ No newline at end of file |
| 100 | +</IfModule> |
| @@ -204,17 +204,21 @@ | @@ -204,17 +204,21 @@ | ||
| 204 | 'order' => $model, | 204 | 'order' => $model, |
| 205 | ] | 205 | ] |
| 206 | ) | 206 | ) |
| 207 | - ->setFrom('order@acdc.com.ua') | 207 | + ->setFrom(['no-reply@acdc.com.ua' => 'Интернет магазин ACDC']) |
| 208 | ->setTo( | 208 | ->setTo( |
| 209 | [ | 209 | [ |
| 210 | - 'acdcim@gmail.com', | ||
| 211 | $model->email, | 210 | $model->email, |
| 212 | ] | 211 | ] |
| 213 | ) | 212 | ) |
| 213 | + ->setBcc( | ||
| 214 | + [ | ||
| 215 | + 'acdcim@gmail.com', | ||
| 216 | + ] | ||
| 217 | + ) | ||
| 214 | ->setSubject( | 218 | ->setSubject( |
| 215 | \Yii::t( | 219 | \Yii::t( |
| 216 | 'app', | 220 | 'app', |
| 217 | - 'Order {orderId}', | 221 | + 'Заказ №{orderId}', |
| 218 | [ | 222 | [ |
| 219 | 'orderId' => $model->id, | 223 | 'orderId' => $model->id, |
| 220 | ] | 224 | ] |
| @@ -110,7 +110,7 @@ JS; | @@ -110,7 +110,7 @@ JS; | ||
| 110 | <head> | 110 | <head> |
| 111 | <meta charset="<?= \Yii::$app->charset ?>"> | 111 | <meta charset="<?= \Yii::$app->charset ?>"> |
| 112 | <meta name="viewport" content="width=device-width, initial-scale=1"> | 112 | <meta name="viewport" content="width=device-width, initial-scale=1"> |
| 113 | - <meta name="robots" content="noindex,nofollow"> | 113 | + <meta name="robots" content="all"> |
| 114 | <link rel="icon" href="/img/favicon.ico" type="image/x-icon"> | 114 | <link rel="icon" href="/img/favicon.ico" type="image/x-icon"> |
| 115 | <?= Html::csrfMetaTags() ?> | 115 | <?= Html::csrfMetaTags() ?> |
| 116 | <title><?= Html::encode($seo->title) ?></title> | 116 | <title><?= Html::encode($seo->title) ?></title> |
| @@ -489,7 +489,7 @@ _________________________________________________________ --> | @@ -489,7 +489,7 @@ _________________________________________________________ --> | ||
| 489 | </li> | 489 | </li> |
| 490 | </ul> | 490 | </ul> |
| 491 | <div class="style phones-mob-menu" style="text-align: center; color: #fff;margin-top: 10px"> | 491 | <div class="style phones-mob-menu" style="text-align: center; color: #fff;margin-top: 10px"> |
| 492 | - <span class="top-phone"><i class="fa fa-phone"></i> +38 (044) 599-06-50</span> | 492 | + <span class="top-phone"><i class="fa fa-phone"></i> +38 (044) 490-70-07</span> |
| 493 | </div> | 493 | </div> |
| 494 | </div> | 494 | </div> |
| 495 | </div> | 495 | </div> |