update cartitem layout

cmd/cart/checkout_builder.go

@@ -64,20 +64,20 @@ func BuildCheckoutOrderPayload(grain *CartGrain, meta *CheckoutMeta) ([]byte, *C
 		lines = append(lines, &Line{
 			Type:           "physical",
 			Reference:      it.Sku,
-			Name:           it.Name,
+			Name:           it.Meta.Name,
 			Quantity:       it.Quantity,
-			UnitPrice:      int(it.Price),
+			UnitPrice:      int(it.Price.IncVat),
 			TaxRate:        2500, // TODO: derive if variable tax rates are introduced
 			QuantityUnit:   "st",
-			TotalAmount:    int(it.TotalPrice),
-			TotalTaxAmount: int(it.TotalTax),
-			ImageURL:       fmt.Sprintf("https://www.elgiganten.se%s", it.Image),
+			TotalAmount:    int(it.TotalPrice.IncVat),
+			TotalTaxAmount: int(it.TotalPrice.TotalVat()),
+			ImageURL:       fmt.Sprintf("https://www.elgiganten.se%s", it.Meta.Image),
 		})
 	}
 
 	// Delivery lines
 	for _, d := range grain.Deliveries {
-		if d == nil || d.Price <= 0 {
+		if d == nil || d.Price.IncVat <= 0 {
 			continue
 		}
 		lines = append(lines, &Line{
@@ -85,11 +85,11 @@ func BuildCheckoutOrderPayload(grain *CartGrain, meta *CheckoutMeta) ([]byte, *C
 			Reference:      d.Provider,
 			Name:           "Delivery",
 			Quantity:       1,
-			UnitPrice:      int(d.Price),
+			UnitPrice:      int(d.Price.IncVat),
 			TaxRate:        2500,
 			QuantityUnit:   "st",
-			TotalAmount:    int(d.Price),
-			TotalTaxAmount: int(GetTaxAmount(d.Price, 2500)),
+			TotalAmount:    int(d.Price.IncVat),
+			TotalTaxAmount: int(d.Price.TotalVat()),
 		})
 	}
 
@@ -97,8 +97,8 @@ func BuildCheckoutOrderPayload(grain *CartGrain, meta *CheckoutMeta) ([]byte, *C
 		PurchaseCountry:    country,
 		PurchaseCurrency:   currency,
 		Locale:             locale,
-		OrderAmount:        int(grain.TotalPrice),
-		OrderTaxAmount:     int(grain.TotalTax),
+		OrderAmount:        int(grain.TotalPrice.IncVat),
+		OrderTaxAmount:     int(grain.TotalPrice.TotalVat()),
 		OrderLines:         lines,
 		MerchantReference1: grain.Id.String(),
 		MerchantURLS: &CheckoutMerchantURLS{