From ba3eb6c08585b5997f719fbf7bb1f3896b26624e Mon Sep 17 00:00:00 2001
From: Nikita Kiselev <nikitakiselev@Nikitas-MacBook-Pro.local>
Date: Sun, 3 Aug 2025 11:32:10 +0300
Subject: [PATCH] wip

---
 .../controller/extension/module/tgshop.php    | 27 ++++++++++++++++++-
 .../upload/oc_telegram_shop/.env.production   |  1 +
 .../TelegramValidateInitDataMiddleware.php    | 11 +++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100755 module/oc_telegram_shop/upload/oc_telegram_shop/.env.production

diff --git a/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php b/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
index 191d53e..8cfdb10 100755
--- a/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
+++ b/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
@@ -242,7 +242,32 @@ class ControllerExtensionModuleTgshop extends Controller
                 100,
                 100
             ),
-            'module_tgshop_owner_notification_template' => 'Новый заказ!',
+            'module_tgshop_owner_notification_template' => <<<TEXT
+*Новый заказ \#{order_id}* в магазине *{store_name}*
+
+*Покупатель:* {customer}  
+*Email:* {email}  
+*Телефон:* {phone}  
+*IP:* {ip}
+
+*Адрес доставки:*  
+{address}
+
+*Комментарий:*  
+{comment}
+
+*Сумма заказа:* {total}  
+*Дата оформления:* {created_at}
+TEXT,
+            'module_tgshop_customer_notification_template' => <<<TEXT
+Спасибо за Ваш заказ в магазине *{store_name}*
+
+*Сумма заказа:* {total}  
+*Дата оформления:* {created_at}
+
+Мы свяжемся с вами при необходимости\.  
+Хорошего дня\!
+TEXT,
             'module_tgshop_theme_light' => 'light',
             'module_tgshop_theme_dark' => 'dark',
             'module_tgshop_mainpage_products' => 'most_viewed',
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/.env.production b/module/oc_telegram_shop/upload/oc_telegram_shop/.env.production
new file mode 100755
index 0000000..97c57ae
--- /dev/null
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/.env.production
@@ -0,0 +1 @@
+APP_DEBUG=false
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramValidateInitDataMiddleware.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramValidateInitDataMiddleware.php
index 95420fc..541d8c2 100644
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramValidateInitDataMiddleware.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/Telegram/TelegramValidateInitDataMiddleware.php
@@ -8,6 +8,11 @@ class TelegramValidateInitDataMiddleware
 {
     private SignatureValidator $signatureValidator;
 
+    private array $excluded = [
+        'testTgMessage',
+        'manifest',
+    ];
+
     public function __construct(SignatureValidator $signatureValidator)
     {
         $this->signatureValidator = $signatureValidator;
@@ -15,7 +20,11 @@ class TelegramValidateInitDataMiddleware
 
     public function handle($request, Closure $next)
     {
-        $this->signatureValidator->validate($request);
+        $apiAction = $request->get('api_action');
+
+        if (! in_array($apiAction, $this->excluded, true)) {
+            $this->signatureValidator->validate($request);
+        }
 
         return $next($request);
     }