diff --git a/.gitignore b/.gitignore
index 91851e9..9ff81f2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,6 @@ phpunit.phar
/artweb/
/storage
/common/config/settings.php
+
+/frontend/web/robots.txt
+/frontend/web/sitemap.xml
diff --git a/.htaccess b/.htaccess
index f5b1feb..e1e1598 100755
--- a/.htaccess
+++ b/.htaccess
@@ -4,6 +4,14 @@ AddDefaultCharset utf-8
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]
-
\ No newline at end of file
+
diff --git a/frontend/controllers/CheckoutController.php b/frontend/controllers/CheckoutController.php
old mode 100755
new mode 100644
index 70b58d1..a5751d3
--- a/frontend/controllers/CheckoutController.php
+++ b/frontend/controllers/CheckoutController.php
@@ -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,
]
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
old mode 100755
new mode 100644
index 26b49f5..8435b5f
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -110,7 +110,7 @@ JS;
-
+
<?= Html::encode($seo->title) ?>
@@ -489,7 +489,7 @@ _________________________________________________________ -->
- +38 (044) 599-06-50
+ +38 (044) 490-70-07
diff --git a/frontend/web/googlea5d742f239dd7867.html b/frontend/web/googlea5d742f239dd7867.html
new file mode 100644
index 0000000..2d8364c
--- /dev/null
+++ b/frontend/web/googlea5d742f239dd7867.html
@@ -0,0 +1 @@
+google-site-verification: googlea5d742f239dd7867.html
\ No newline at end of file
--
libgit2 0.21.4