commit from prod

Alex Savenko
1 parent a8aa0f7d
Showing 5 changed files with 24 additions and 8 deletions Show diff stats
.gitignore
.htaccess
frontend/controllers/CheckoutController.php
frontend/views/layouts/main.php
frontend/web/googlea5d742f239dd7867.html
@@ -36,3 +36,6 @@ phpunit.phar
 /artweb/
 /storage
 /common/config/settings.php
+
+/frontend/web/robots.txt
+/frontend/web/sitemap.xml
@@ -4,6 +4,14 @@ AddDefaultCharset utf-8
 <IfModule mod_rewrite.c>
     RewriteEngine On
  
+
+    RewriteCond %{HTTPS} off
+    RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
+    RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
+    RewriteRule ^(.*)$ https://%1/$1 [R=301,L]
+
+
     # the main rewrite rule for the frontend application
     RewriteCond %{REQUEST_URI} !^/(backend/web|admin|storage)
     RewriteRule !^frontend/web /frontend/web%{REQUEST_URI} [L]
@@ -15,8 +23,8 @@ AddDefaultCharset utf-8
     RewriteCond %{REQUEST_URI} ^/admin
     RewriteRule ^admin(.*) /backend/web/$1 [L]
  
-    RewriteCond %{REQUEST_FILENAME} robots.txt
-    RewriteRule . /frontend/web/index.php [L]
+    # RewriteCond %{REQUEST_FILENAME} robots.txt
+    # RewriteRule . /frontend/web/index.php [L]
  
     # if a directory or a file of the uploads folder exists, use the request directly
     RewriteCond %{REQUEST_URI} ^/storage
@@ -88,4 +96,4 @@ AddDefaultCharset utf-8
     RewriteCond %{HTTP:Accept-encoding} gzip
     RewriteCond %{REQUEST_FILENAME}.gz -f
     RewriteRule ^(.*)$ $1.gz [QSA,L]
-</IfModule>
 \ No newline at end of file
+</IfModule>
@@ -204,17 +204,21 @@
                         'order' => $model,
                     ]
                 )
-                                  ->setFrom('order@acdc.com.ua')
+                                  ->setFrom(['no-reply@acdc.com.ua' => 'Интернет магазин ACDC'])
                                   ->setTo(
                                       [
-                                          'acdcim@gmail.com',
                                           $model->email,
                                       ]
                                   )
+                                  ->setBcc(
+                                      [
+                                          'acdcim@gmail.com',
+                                        ]
+                                      )
                                   ->setSubject(
                                       \Yii::t(
                                           'app',
-                                          'Order {orderId}',
+                                          'Заказ №{orderId}',
                                           [
                                               'orderId' => $model->id,
                                           ]
@@ -110,7 +110,7 @@ JS;
     <head>
       <meta charset="<?= \Yii::$app->charset ?>">
       <meta name="viewport" content="width=device-width, initial-scale=1">
-      <meta name="robots" content="noindex,nofollow">
+      <meta name="robots" content="all">
       <link rel="icon" href="/img/favicon.ico" type="image/x-icon">
         <?= Html::csrfMetaTags() ?>
       <title><?= Html::encode($seo->title) ?></title>
@@ -489,7 +489,7 @@ _________________________________________________________ --&gt;
                       </li>
                     </ul>
                       <div class="style phones-mob-menu" style="text-align: center; color: #fff;margin-top: 10px">
-                          <span class="top-phone"><i class="fa fa-phone"></i>&ensp;+38 (044) 599-06-50</span>
+                          <span class="top-phone"><i class="fa fa-phone"></i>&ensp;+38 (044) 490-70-07</span>
                       </div>
                   </div>
                 </div>
+google-site-verification: googlea5d742f239dd7867.html
 \ No newline at end of file