From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 20 Jan 2026 09:04:10 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_fomichev_ERP-36J_telegram_report_unche... 
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=669553a753b02de6e75e20572dfd4d8e2e81c273;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/develop' into feature_fomichev_ERP-36J_telegram_report_unchecked_mp_orders

# Conflicts:
#	erp24/.env.example
---

669553a753b02de6e75e20572dfd4d8e2e81c273
diff --cc erp24/config/params.php
index b1b88e09,0d6723a5..83f3828f
--- a/erp24/config/params.php
+++ b/erp24/config/params.php
@@@ -1,38 -1,18 +1,36 @@@
  <?php
  
  return [
-     'WHATSAPP_API_KEY' => '10c81eda-1dfb-42ed-a458-944f8dae4a67',
+     'WHATSAPP_API_KEY' => getenv('WHATSAPP_API_KEY') ?: '',
      'API2_URL' => YII_DEBUG ? 'http://host.docker.internal:5555' : 'https://api2.bazacvetov24.ru',
-     //'TELEGRAM_API_URL' => "https://api.telegram.org/bot6189425433:AAFQ91OYiMiyj2jgIgmx3O2yTBl4enywySM/",
-     'TELEGRAM_API_URL' => "https://api.telegram.org/bot8063257458:AAGnMf4cxwJWlYLF1wS_arn4PrOaLs9ERQQ/",
-     //'TELEGRAM_WEBHOOK_URL' => "https://api2.bazacvetov24.ru/telegram/webhook",
-     'TELEGRAM_WEBHOOK_URL' => YII_DEBUG ? "https://api2.dev.erp-flowers.ru/telegram/webhook" : "https://api2.erp.erp-flowers.ru/telegram/webhook",
+     'TELEGRAM_API_URL' => 'https://api.telegram.org/bot' . getenv('TELEGRAM_BOT_TOKEN') . '/',
+     'TELEGRAM_WEBHOOK_URL' => YII_DEBUG ? 'https://api2.dev.erp-flowers.ru/telegram/webhook' : 'https://api2.erp.erp-flowers.ru/telegram/webhook',
      'CAMERAS' => [
-         ['Login' => 'mochage-8r-136', 'Password' => 'fjtq8z3u'],
-         ['Login' => 'kuznzx-am-136',  'Password' => '8e4ma237'],
-         ['Login' => 'lazava-d8-136',  'Password' => '5gp3znn0'],
-         ['Login' => 'tmp-4125315',    'Password' => '35ghRtYWqq'],
-         ['Login' => 'ipbelo-n2-ci',   'Password' => '8h09h42q38'],
+         ['Login' => getenv('CAMERA_1_LOGIN') ?: '', 'Password' => getenv('CAMERA_1_PASSWORD') ?: ''],
+         ['Login' => getenv('CAMERA_2_LOGIN') ?: '', 'Password' => getenv('CAMERA_2_PASSWORD') ?: ''],
+         ['Login' => getenv('CAMERA_3_LOGIN') ?: '', 'Password' => getenv('CAMERA_3_PASSWORD') ?: ''],
+         ['Login' => getenv('CAMERA_4_LOGIN') ?: '', 'Password' => getenv('CAMERA_4_PASSWORD') ?: ''],
+         ['Login' => getenv('CAMERA_5_LOGIN') ?: '', 'Password' => getenv('CAMERA_5_PASSWORD') ?: ''],
      ],
-     'SWITCH_USER_COOKIE_PASSWORD' => '123pass@WORD',
-     'YANDEX_MARKET_API_KEY' => 'ACMA:r3sa2VyjkgcO0aOxGoyAWuGH15g5mWAqXRMuylVA:a0bccb7e',
+     'SWITCH_USER_COOKIE_PASSWORD' => getenv('SWITCH_USER_COOKIE_PASSWORD') ?: '',
+     'YANDEX_MARKET_API_KEY' => getenv('YANDEX_MARKET_API_KEY') ?: '',
      'RABBIT_HOST' => getenv('RABBIT_HOST') ?: 'localhost',
 +
 +    // Отчёт контроля статусов заказов маркетплейсов (ТЗ ERP-36J)
 +    // Расписание: 08:00 и 20:00 MSK
 +    // Типы проблем: "Завис в доставке", "Успех без чека", "Отмена без обработки"
 +    'MARKETPLACE_ORDER_CONTROL_REPORT' => [
 +        'period_hours' => 12,
 +        'timezone' => 'Europe/Moscow',
 +        'max_retries' => 3,
 +        'retry_delay_seconds' => 5,
 +        'telegram_max_message_length' => 4000,
 +        // Telegram: chat_id канала (получить через @userinfobot или API после вступления бота в канал)
 +        // Канал по ТЗ: https://t.me/+wHh_lW83AvVlYWNi
 +        'telegram_chat_id_dev' => getenv('TELEGRAM_ORDER_CONTROL_CHAT_ID_DEV') ?: '-1001861631125',
 +        'telegram_chat_id_prod' => getenv('TELEGRAM_ORDER_CONTROL_CHAT_ID_PROD') ?: '4886272326',
 +        // Email получатели по ТЗ
 +        'email_recipients' => array_filter(explode(',', getenv('ORDER_CONTROL_EMAIL_RECIPIENTS') ?: 'vladimir.fomichev@erp-flowers.ru,ekaterina.geldak@bazacvetov24.ru,irina.rogacheva@bazacvetov24.ru,alena.chelyshkina@bazacvetov24.ru')),
 +        'email_subject' => '[Контроль MP] Отчёт о расхождениях статусов заказов',
 +    ],
  ];