From a8d20d58d92f2bcf2cda1056b5b375750b8c5fc2 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Fri, 25 Sep 2026 09:41:41 +0300 Subject: [PATCH] Update monthly order app --- core/lib/internally/monthly_orders/service.go | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/core/lib/internally/monthly_orders/service.go b/core/lib/internally/monthly_orders/service.go index 885639f..54f4327 100644 --- a/core/lib/internally/monthly_orders/service.go +++ b/core/lib/internally/monthly_orders/service.go @@ -255,8 +255,33 @@ func (s *MonthlyOrderService) SubmitOrdersToTelegram(ctx context.Context, manage } var contentBuilder strings.Builder - contentBuilder.WriteString(fmt.Sprintf("🏢 Клиент: %s\n", *order.ClientName)) - // ... (здесь ваш код сборки текста contentBuilder.WriteString из прошлого ответа) ... + contentBuilder.WriteString(fmt.Sprintf("Клиент: %s\n", *order.ClientName)) + + if order.Decade != nil { + contentBuilder.WriteString(fmt.Sprintf("Декада: %s\n", *order.Decade)) + } + if order.Delivery != nil { + contentBuilder.WriteString(fmt.Sprintf("Доставка: %s\n", *order.Delivery)) + } + if order.Conditions != nil { + contentBuilder.WriteString(fmt.Sprintf("⚖️ Условия: %s\n", *order.Conditions)) + } + if order.PaymentForm != nil { + contentBuilder.WriteString(fmt.Sprintf("💳 Оплата: %s\n", *order.PaymentForm)) + } + + contentBuilder.WriteString("\n📦 Заказ:\n") + for _, item := range items { + contentBuilder.WriteString(fmt.Sprintf("- %s (%s): %d шт.\n", *item.NomenclatureName, *item.NomenclatureType, *item.Quantity)) + } + + if order.ManagerComment != nil { + contentBuilder.WriteString(fmt.Sprintf("\n💬 Комментарий: %s", *order.ManagerComment)) + } + if order.FreeFormComment != nil && *order.FreeFormComment != "" { + contentBuilder.WriteString(fmt.Sprintf("\n✍️ Доп. комментарий: %s", *order.FreeFormComment)) + } + contentStr := contentBuilder.String() status := "pending"