Перенос секретов

diff --git a/erp24/.env.example b/erp24/.env.example
index 50f922a378c365e60a29c99f7a95311a1bbdeccb..804571fba5bc1660b6119e37d9fe6642897dd264 100644 (file)
--- a/erp24/.env.example
+++ b/erp24/.env.example
@@ -199,6 +199,15 @@ EMAIL_FLOW_PASSWORD=
 IMAP_EMAIL=
 IMAP_PASSWORD=
 
+# === IMAP Flowwow (MarketplaceService) ===
+# Primary mailbox for Flowwow order emails
+IMAP_FLOWWOW_HOST={imap.yandex.ru:993/imap/ssl}
+IMAP_FLOWWOW_USERNAME=flow@bazacvetov24.ru
+IMAP_FLOWWOW_PASSWORD=your_flowwow_password_here
+# Alternate mailbox for Flowwow order emails
+IMAP_FLOWWOW_ALT_USERNAME=Zakaz-bazacvetov24@yandex.ru
+IMAP_FLOWWOW_ALT_PASSWORD=your_flowwow_alt_password_here
+
 # === HTTP BASIC AUTH (legacy integrations) ===
 # Credentials for legacy HTTP Basic Auth endpoints
 BASIC_AUTH_KASSEAR_USER=

diff --git a/erp24/config/params.php b/erp24/config/params.php
index 35024f8f1f5e91e6b17ff167019ea32740275b3c..8775208b2e196fba6aebe494ad365b140653836b 100644 (file)
--- a/erp24/config/params.php
+++ b/erp24/config/params.php
@@ -16,6 +16,19 @@ return [
     'YANDEX_MARKET_API_KEY' => getenv('YANDEX_MARKET_API_KEY') ?: '',
     'RABBIT_HOST' => getenv('RABBIT_HOST') ?: 'localhost',
 
+    // IMAP Flowwow (MarketplaceService)
+    'IMAP_FLOWWOW' => [
+        'host' => getenv('IMAP_FLOWWOW_HOST') ?: '{imap.yandex.ru:993/imap/ssl}',
+        'primary' => [
+            'username' => getenv('IMAP_FLOWWOW_USERNAME') ?: '',
+            'password' => getenv('IMAP_FLOWWOW_PASSWORD') ?: '',
+        ],
+        'alternate' => [
+            'username' => getenv('IMAP_FLOWWOW_ALT_USERNAME') ?: '',
+            'password' => getenv('IMAP_FLOWWOW_ALT_PASSWORD') ?: '',
+        ],
+    ],
+
     // Отчёт контроля статусов заказов маркетплейсов (ТЗ ERP-36J)
     // Расписание: 08:00 и 20:00 MSK
     // Типы проблем: "Завис в доставке", "Успех без чека", "Отмена без обработки"

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 81365810009d1937dd5d996588920a52953cd19a..edbd900ddf89b4083a214ca0ee8e28601c515b91 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -2085,15 +2085,14 @@ class MarketplaceService
             self::SUBJECT_DELIVERED,
         ];
 
-        $hostname = '{imap.yandex.ru:993/imap/ssl}';
+        $imapConfig = Yii::$app->params['IMAP_FLOWWOW'];
+        $hostname = $imapConfig['host'];
         if ($useAlternateMailbox) {
-            $username = 'Zakaz-bazacvetov24@yandex.ru';
-            $password = 'jyxnwwwvgpwhzbdu';
-            $searchCriteria .= '';
+            $username = $imapConfig['alternate']['username'];
+            $password = $imapConfig['alternate']['password'];
         } else {
-            $username = 'flow@bazacvetov24.ru';
-            $password = 'ctqamxqeshgxwsgn';
-            $searchCriteria .= '';
+            $username = $imapConfig['primary']['username'];
+            $password = $imapConfig['primary']['password'];
         }
 
         if ($progressCallback) {
@@ -2119,11 +2118,11 @@ class MarketplaceService
         $countAllMessages = 0;
         $countProcessedMessages = 0;
         $excludeFolders = [
-            '{imap.yandex.ru:993/imap/ssl}Drafts',
-            '{imap.yandex.ru:993/imap/ssl}Sent',
-            '{imap.yandex.ru:993/imap/ssl}Spam',
-            '{imap.yandex.ru:993/imap/ssl}Trash',
-            '{imap.yandex.ru:993/imap/ssl}Outbox',
+            $hostname . 'Drafts',
+            $hostname . 'Sent',
+            $hostname . 'Spam',
+            $hostname . 'Trash',
+            $hostname . 'Outbox',
         ];
         foreach ($folders as $folder) {
             if (in_array($folder, $excludeFolders)) {
@@ -2164,11 +2163,7 @@ class MarketplaceService
                     if (isset($overview[0]->to)) {
                         $to = mb_decode_mimeheader($overview[0]->to);
                     } else {
-                        if ($useAlternateMailbox) {
-                            $to = 'Zakaz-bazacvetov24@yandex.ru';
-                        } else {
-                            $to = 'flow@bazacvetov24.ru';
-                        }
+                        $to = $username;
                     }
 
                     $date = date('Y-m-d H:i:s', strtotime(mb_decode_mimeheader($overview[0]->date)));