From 8f6af04e732f853eb79504676dc5ae83ba151c93 Mon Sep 17 00:00:00 2001
From: Nikita Kiselev <kiselev2008@gmail.com>
Date: Thu, 4 Dec 2025 11:23:00 +0300
Subject: [PATCH] fix(admin): fix error when chat_id is string

---
 .../src/components/Settings/ItemTgChatID.vue  | 25 ++++++++++++++++---
 .../Services/SettingsSerializerService.php    |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/frontend/admin/src/components/Settings/ItemTgChatID.vue b/frontend/admin/src/components/Settings/ItemTgChatID.vue
index 4e7cc06..397119e 100644
--- a/frontend/admin/src/components/Settings/ItemTgChatID.vue
+++ b/frontend/admin/src/components/Settings/ItemTgChatID.vue
@@ -81,6 +81,13 @@ const settings = useSettingsStore();
 const statusMessage = ref(null);
 const isLoading = ref(false);
 const collapseId = useId();
+const parseChatId = (value) => {
+  if (value === '' || value === null || value === undefined) return null;
+  const normalized = String(value).trim();
+  if (!/^-?\d+$/.test(normalized)) return null;
+  const parsed = Number.parseInt(normalized, 10);
+  return Number.isFinite(parsed) ? parsed : null;
+};
 
 const props = defineProps({
   label: {
@@ -93,6 +100,10 @@ const props = defineProps({
   },
 });
 
+if (typeof model.value === 'string') {
+  model.value = parseChatId(model.value);
+}
+
 const statusMessageClass = computed(() => {
   if (!statusMessage.value) return '';
 
@@ -108,7 +119,7 @@ const statusMessageClass = computed(() => {
 });
 
 function handleInput(event) {
-  model.value = event.target.value;
+  model.value = parseChatId(event.target.value);
   // Сбрасываем статус сообщения при изменении значения
   if (statusMessage.value) {
     statusMessage.value = null;
@@ -148,9 +159,15 @@ async function getChatId() {
       return;
     }
 
-    // Успешное получение Chat ID
-    const chatId = response.data.chat_id;
-    model.value = chatId;
+    const parsedChatId = parseChatId(response.data.chat_id);
+
+    if (parsedChatId === null) {
+      statusMessage.value = '❌ Ошибка: Chat ID вернулся в некорректном формате.';
+      console.error('Некорректный Chat ID в ответе:', response);
+      return;
+    }
+
+    model.value = parsedChatId;
     statusMessage.value = '✅ ChatID успешно получен и подставлен в поле. Не забудьте сохранить настройки!';
   } catch (error) {
     console.error('Ошибка при получении Chat ID:', error);
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/SettingsSerializerService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/SettingsSerializerService.php
index 9e1a046..026fec1 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/SettingsSerializerService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Services/SettingsSerializerService.php
@@ -227,7 +227,7 @@ class SettingsSerializerService
             throw new InvalidArgumentException('telegram.bot_token must be a string or null');
         }
 
-        if (isset($data['chat_id']) && ! is_int($data['chat_id'])) {
+        if (isset($data['chat_id']) && ! is_numeric($data['chat_id'])) {
             throw new InvalidArgumentException('telegram.chat_id must be an integer or null');
         }