Merge branch 'main' of git-ssh.tornberg.me:mats/go-cart-actor

Co-authored-by: matst80 <mats.tornberg@gmail.com>
Reviewed-on: https://git.tornberg.me/mats/go-cart-actor/pulls/5
Co-authored-by: Mats Törnberg <mats@tornberg.me>
Co-committed-by: Mats Törnberg <mats@tornberg.me>

cmd/cart/cart-grain.go

@@ -260,6 +260,10 @@ func (c *CartGrain) UpdateTotals() {
 	for _, voucher := range c.Vouchers {
 		if _, ok := voucher.AppliesTo(c); ok {
 			value := NewPriceFromIncVat(voucher.Value, 25)
+			if c.TotalPrice.IncVat <= value.IncVat {
+				// don't apply discounts to more than the total price
+				continue
+			}
 
 			c.TotalDiscount.Add(*value)
 			c.TotalPrice.Subtract(*value)

cmd/cart/mutation_add_item.go

@@ -30,8 +30,12 @@ func AddItem(g *CartGrain, m *messages.AddItem) error {
 
 	// Fast path: merge with existing item having same SKU
 	if existing, found := g.FindItemWithSku(m.Sku); found {
-		existing.Quantity += int(m.Quantity)
-		return nil
+		if existing.StoreId == m.StoreId {
+			existing.Quantity += int(m.Quantity)
+			existing.Stock = StockStatus(m.Stock)
+			existing.StoreId = m.StoreId
+			return nil
+		}
 	}
 
 	g.mu.Lock()

pkg/voucher/service.go

@@ -21,7 +21,6 @@ type Voucher struct {
 
 type Service struct {
 	// Add fields here
-
 }
 
 var ErrInvalidCode = errors.New("invalid vouchercode")