Тестим почту

diff --git a/erp24/config/console.php b/erp24/config/console.php
index d78433bddd010a0fb4e872c817fef171e386d188..46e879e0f761fa3f993181916701b66baa314d8c 100755 (executable)
--- a/erp24/config/console.php
+++ b/erp24/config/console.php
@@ -66,15 +66,11 @@ $config = [
                 'dsn' => sprintf(
                     '%s://%s:%s@%s:%d',
                     'smtps',
-                    //getenv('MAIL_SCHEME') ?: 'smtps',
-                    //urlencode(getenv('MAIL_USERNAME') ?: 'flow@bazacvetov24.ru'),
-                    //urlencode(getenv('MAIL_PASSWORD') ?: 'ctqamxqeshgxwsgn'),
-                    'vladimir.fomichev@erp-flowers.ru',
-                    'xfuxecgvjbneqmnn',
-                    'smtp.yandex.ru',
-                    //getenv('MAIL_HOST') ?: 'smtp.yandex.ru',
-                    //(int)(getenv('MAIL_PORT') ?: 465)
-                    465
+                    getenv('MAIL_SCHEME') ?: 'smtps',
+                    urlencode(getenv('MAIL_USERNAME') ?: 'flow@bazacvetov24.ru'),
+                    urlencode(getenv('MAIL_PASSWORD') ?: 'ctqamxqeshgxwsgn'),
+                    getenv('MAIL_HOST') ?: 'smtp.yandex.ru',
+                    (int)(getenv('MAIL_PORT') ?: 465)
                 ),
             ],
         ],

diff --git a/erp24/config/web.php b/erp24/config/web.php
index 79ca9a03baee73bc742c278d2edbe66ce18ff4ec..9466b179c5e5defe47bf8eb30dbc7829b9637751 100644 (file)
--- a/erp24/config/web.php
+++ b/erp24/config/web.php
@@ -79,15 +79,11 @@ $config = [
                 'dsn' => sprintf(
                     '%s://%s:%s@%s:%d',
                     'smtps',
-                    //getenv('MAIL_SCHEME') ?: 'smtps',
-                    //urlencode(getenv('MAIL_USERNAME') ?: 'flow@bazacvetov24.ru'),
-                    //urlencode(getenv('MAIL_PASSWORD') ?: 'ctqamxqeshgxwsgn'),
-                    'vladimir.fomichev@erp-flowers.ru',
-                    'xfuxecgvjbneqmnn',
-                    'smtp.yandex.ru',
-                    //getenv('MAIL_HOST') ?: 'smtp.yandex.ru',
-                    //(int)(getenv('MAIL_PORT') ?: 465)
-                    465
+                    getenv('MAIL_SCHEME') ?: 'smtps',
+                    urlencode(getenv('MAIL_USERNAME') ?: 'flow@bazacvetov24.ru'),
+                    urlencode(getenv('MAIL_PASSWORD') ?: 'ctqamxqeshgxwsgn'),
+                    getenv('MAIL_HOST') ?: 'smtp.yandex.ru',
+                    (int)(getenv('MAIL_PORT') ?: 465)
                 ),
             ],
         ],

diff --git a/erp24/services/OrderControlReportService.php b/erp24/services/OrderControlReportService.php
index bf8b664e0fb38bf3eda4abac3e3030ba94897928..4d3a968893ce867cbe1d6502cb7e3226b2ee73ae 100644 (file)
--- a/erp24/services/OrderControlReportService.php
+++ b/erp24/services/OrderControlReportService.php
@@ -1232,7 +1232,7 @@ class OrderControlReportService
                     ->setHtmlBody($html);
 
                 // Устанавливаем отправителя, если настроен
-                $fromEmail = getenv('MAIL_USERNAME') ?: 'noreply@bazacvetov24.ru';
+                $fromEmail = getenv('MAIL_USERNAME') ?: 'flow@bazacvetov24.ru';
                 $message->setFrom([$fromEmail => 'ERP24 Контроль МП']);
 
                 $sent = $message->send();