From 68bddd5c785ba4e93597c82aecbfba87a061d23d Mon Sep 17 00:00:00 2001 From: giovanni Date: Sun, 31 May 2026 16:38:22 +0700 Subject: [PATCH] adjust response list marketing add grand total so dan do --- internal/modules/marketing/dto/deliveryorder.dto.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/internal/modules/marketing/dto/deliveryorder.dto.go b/internal/modules/marketing/dto/deliveryorder.dto.go index 915a183b..e5488a7e 100644 --- a/internal/modules/marketing/dto/deliveryorder.dto.go +++ b/internal/modules/marketing/dto/deliveryorder.dto.go @@ -28,6 +28,8 @@ type MarketingListDTO struct { Customer customerDTO.CustomerRelationDTO `json:"customer"` SalesPerson userDTO.UserRelationDTO `json:"sales_person"` SoDocs string `json:"so_docs"` + GrandTotalSO float64 `json:"grand_total_so"` + GrandTotalDO float64 `json:"grand_total_do"` SalesOrder []DeliveryMarketingProductDTO `json:"sales_order"` DeliveryOrder []DeliveryGroupDTO `json:"delivery_order"` CreatedUser userDTO.UserRelationDTO `json:"created_user"` @@ -198,11 +200,18 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType) } } + var grandTotalSO float64 + for _, p := range marketing.Products { + grandTotalSO += p.TotalPrice + } + return MarketingListDTO{ MarketingRelationDTO: ToMarketingRelationDTO(marketing), Customer: customer, SalesPerson: salesPerson, SoDocs: marketing.SoDocs, + GrandTotalSO: grandTotalSO, + GrandTotalDO: marketing.GrandTotal, SalesOrder: salesOrderProducts, DeliveryOrder: extractDeliveryGroupsFromProducts(marketing), CreatedUser: createdUser,