From cdbf1eeb0b833412da79a535849b935b994020b0 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Mon, 13 Jul 2026 09:25:01 +0300 Subject: [PATCH 1/2] Updated approval revocation. Needed to approve now --- .../handlers/approval/handler.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/service/telegram_service/handlers/approval/handler.go b/service/telegram_service/handlers/approval/handler.go index 648914d..0892925 100644 --- a/service/telegram_service/handlers/approval/handler.go +++ b/service/telegram_service/handlers/approval/handler.go @@ -1,7 +1,6 @@ package approval import ( - "bitrix_balancer_api/core/lib/external/tgkit" "bitrix_balancer_api/core/typescore" "bitrix_balancer_api/telegram_service/approvalflow" "bitrix_balancer_api/telegram_service/keyboard" @@ -668,9 +667,9 @@ func (h *Handler) HandleViewFilesCallback(bot *tgbotapi.BotAPI, cq *tgbotapi.Cal return } - cardButton := tgkit.NewInlineKeyboard(). - Row(tgkit.Btn("📋 Показать заявку", fmt.Sprintf("appr_show_card:%d", approvalID))). - Build() + //cardButton := tgkit.NewInlineKeyboard(). + // Row(tgkit.Btn("📋 Показать заявку", fmt.Sprintf("appr_show_card:%d", approvalID))). + // Build() caption := fmt.Sprintf("📎 Файлы к заявке #%d (%d шт.):", approvalID, len(files)) @@ -689,16 +688,16 @@ func (h *Handler) HandleViewFilesCallback(bot *tgbotapi.BotAPI, cq *tgbotapi.Cal }) doc.ParseMode = "HTML" - isLast := i == len(files)-1 + //isLast := i == len(files)-1 // Подпись — на первом файле, чтобы сразу было видно к какой заявке относится if i == 0 { doc.Caption = caption } - // Кнопка возврата к карточке — на последнем файле - if isLast { - doc.ReplyMarkup = cardButton - } + //// Кнопка возврата к карточке — на последнем файле + //if isLast { + // doc.ReplyMarkup = cardButton + //} if _, err := bot.Send(doc); err != nil { logrus.Errorf("HandleViewFilesCallback: Send err=%v", err) -- 2.43.0 From 521d87113e164ea8cc38dbfad7d28b43c9497020 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Mon, 13 Jul 2026 09:29:51 +0300 Subject: [PATCH 2/2] Updated approval revocation. Needed to approve now --- core/db/db.go | 1 + 1 file changed, 1 insertion(+) diff --git a/core/db/db.go b/core/db/db.go index 440e032..f3546f6 100644 --- a/core/db/db.go +++ b/core/db/db.go @@ -91,6 +91,7 @@ func initDBModules(modules *ModuleDB, redisClient *redismodule.ModuleRedis) *Mod modules.Notification = dbcore.NewNotificationDB(modules.Pool) modules.DirectorNotifications = dbcore.NewDirectorNotificationDB(modules.Pool) modules.ApprovalTaskTransfer = dbcore.NewApprovalTaskTransferDB(modules.Pool) + modules.ApprovalRevocation = dbcore.NewApprovalRevocationDB(modules.Pool) return modules } -- 2.43.0