gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-06-09 15:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/hpp-per-farm' into 'development'

Browse Source 
adjust list marketing

See merge request mbugroup/lti-api!604
This commit is contained in:
Giovanni Gabriel Septriadi
2026-06-06 01:40:01 +00:00
parent e455889dae c3eab60f49
commit a98d026ccb
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/marketing/dto/deliveryorder.dto.go
+5 -2
View File
@@ -200,9 +200,12 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M
salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType) salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType)
} }
} }
var grandTotalSO float64 var grandTotalSO, grandTotalDO float64
for _, p := range marketing.Products { for _, p := range marketing.Products {
grandTotalSO += p.TotalPrice grandTotalSO += p.TotalPrice
if p.DeliveryProduct != nil && p.DeliveryProduct.DeliveryDate != nil {
grandTotalDO += p.DeliveryProduct.TotalPrice
}
} }
return MarketingListDTO{ return MarketingListDTO{
@@ -211,7 +214,7 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M
SalesPerson: salesPerson, SalesPerson: salesPerson,
SoDocs: marketing.SoDocs, SoDocs: marketing.SoDocs,
GrandTotalSO: grandTotalSO, GrandTotalSO: grandTotalSO,
GrandTotalDO: marketing.GrandTotal, GrandTotalDO: grandTotalDO,
SalesOrder: salesOrderProducts, SalesOrder: salesOrderProducts,
DeliveryOrder: extractDeliveryGroupsFromProducts(marketing), DeliveryOrder: extractDeliveryGroupsFromProducts(marketing),
CreatedUser: createdUser, CreatedUser: createdUser,