update cartitem layout

cmd/cart/mutation_add_item.go

@@ -38,39 +38,50 @@ func AddItem(g *CartGrain, m *messages.AddItem) error {
 	defer g.mu.Unlock()
 
 	g.lastItemId++
-	taxRate := 2500
+	taxRate := float32(25.0)
 	if m.Tax > 0 {
-		taxRate = int(m.Tax)
+		taxRate = float32(int(m.Tax) / 100)
 	}
-	taxAmountPerUnit := GetTaxAmount(m.Price, taxRate)
+
+	pricePerItem := NewPriceFromIncVat(m.Price, taxRate)
 
 	g.Items = append(g.Items, &CartItem{
-		Id:          g.lastItemId,
-		ItemId:      int(m.ItemId),
-		Quantity:    int(m.Quantity),
-		Sku:         m.Sku,
-		Name:        m.Name,
-		Price:       m.Price,
-		TotalPrice:  m.Price * int64(m.Quantity),
-		TotalTax:    int64(taxAmountPerUnit * int64(m.Quantity)),
-		Image:       m.Image,
-		Stock:       StockStatus(m.Stock),
-		Disclaimer:  m.Disclaimer,
-		Brand:       m.Brand,
-		Category:    m.Category,
-		Category2:   m.Category2,
-		Category3:   m.Category3,
-		Category4:   m.Category4,
-		Category5:   m.Category5,
-		OrgPrice:    m.OrgPrice,
+		Id:       g.lastItemId,
+		ItemId:   int(m.ItemId),
+		Quantity: int(m.Quantity),
+		Sku:      m.Sku,
+		Meta: ItemMeta{
+			Name:       m.Name,
+			Image:      m.Image,
+			Brand:      m.Brand,
+			Category:   m.Category,
+			Category2:  m.Category2,
+			Category3:  m.Category3,
+			Category4:  m.Category4,
+			Category5:  m.Category5,
+			Outlet:     m.Outlet,
+			SellerId:   m.SellerId,
+			SellerName: m.SellerName,
+		},
+
+		Price:      *pricePerItem,
+		TotalPrice: *MultiplyPrice(*pricePerItem, int64(m.Quantity)),
+
+		Stock:      StockStatus(m.Stock),
+		Disclaimer: m.Disclaimer,
+
+		OrgPrice:    getOrgPrice(m.OrgPrice, taxRate),
 		ArticleType: m.ArticleType,
-		Outlet:      m.Outlet,
-		SellerId:    m.SellerId,
-		SellerName:  m.SellerName,
-		Tax:         int(taxAmountPerUnit),
-		TaxRate:     taxRate,
-		StoreId:     m.StoreId,
+
+		StoreId: m.StoreId,
 	})
 	g.UpdateTotals()
 	return nil
 }
+
+func getOrgPrice(orgPrice int64, taxRate float32) *Price {
+	if orgPrice <= 0 {
+		return nil
+	}
+	return NewPriceFromIncVat(orgPrice, taxRate)
+}