From c3eab60f490d7772303bdc8215822b09c5a251c1 Mon Sep 17 00:00:00 2001 From: giovanni Date: Sat, 6 Jun 2026 08:38:38 +0700 Subject: [PATCH] adjust list marketing --- internal/modules/marketing/dto/deliveryorder.dto.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/modules/marketing/dto/deliveryorder.dto.go b/internal/modules/marketing/dto/deliveryorder.dto.go index e5488a7e..01b69864 100644 --- a/internal/modules/marketing/dto/deliveryorder.dto.go +++ b/internal/modules/marketing/dto/deliveryorder.dto.go @@ -200,9 +200,12 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType) } } - var grandTotalSO float64 + var grandTotalSO, grandTotalDO float64 for _, p := range marketing.Products { grandTotalSO += p.TotalPrice + if p.DeliveryProduct != nil && p.DeliveryProduct.DeliveryDate != nil { + grandTotalDO += p.DeliveryProduct.TotalPrice + } } return MarketingListDTO{ @@ -211,7 +214,7 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M SalesPerson: salesPerson, SoDocs: marketing.SoDocs, GrandTotalSO: grandTotalSO, - GrandTotalDO: marketing.GrandTotal, + GrandTotalDO: grandTotalDO, SalesOrder: salesOrderProducts, DeliveryOrder: extractDeliveryGroupsFromProducts(marketing), CreatedUser: createdUser,