fix vPOS updates resulting in incorrect quantities

Author: ajungg

CHANGELOG.md

@@ -6,6 +6,9 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Add support for JPG and WEBP assets
 
+### Fixed
+- Fix vPOS updates with weight information resulting in incorrect quantities
+
 ## [0.33.11]
 
 ### Fixed

core/src/androidTest/java/io/snabble/sdk/ShoppingCartTest.java

@@ -306,6 +306,65 @@ public void testBackendCart() {
         Assert.assertEquals(backendCart.items[cart.size() - 6].weightUnit, Unit.PIECE.getId());
     }
 
+    @Test
+    public void testBackendCartAfterLineItemIsSet() {
+        ShoppingCart.Item item = simpleProduct1.cartItem();
+        item.setQuantity(2);
+        cart.add(item);
+
+        item = preWeighedProduct.cartItem();
+        item.setLineItem(new CheckoutApi.LineItem());
+        cart.add(item);
+
+        item = userWeighedProduct.cartItem();
+        item.setQuantity(500);
+        item.setLineItem(new CheckoutApi.LineItem());
+        cart.add(item);
+
+        item = pieceProduct.cartItem();
+        item.setLineItem(new CheckoutApi.LineItem());
+        cart.add(item);
+
+        item = priceProduct.cartItem();
+        item.setLineItem(new CheckoutApi.LineItem());
+        cart.add(item);
+
+        item = zeroAmountProduct.cartItem();
+        item.setLineItem(new CheckoutApi.LineItem());
+        item.setQuantity(4);
+        cart.add(item);
+
+        item = zeroAmountProduct.cartItem();
+        item.setLineItem(new CheckoutApi.LineItem());
+        item.setQuantity(4);
+        cart.add(item);
+
+        ShoppingCart.BackendCart backendCart = cart.toBackendCart();
+        Assert.assertEquals(backendCart.items.length, cart.size());
+        Assert.assertEquals(backendCart.items[cart.size() - 1].amount, 2);
+
+        Assert.assertEquals(backendCart.items[cart.size() - 2].amount, 1);
+        Assert.assertEquals(backendCart.items[cart.size() - 2].weight.intValue(), 154);
+        Assert.assertEquals(backendCart.items[cart.size() - 2].weightUnit, Unit.GRAM.getId());
+
+        Assert.assertEquals(backendCart.items[cart.size() - 3].amount, 1);
+        Assert.assertEquals(backendCart.items[cart.size() - 3].weight.intValue(), 500);
+        Assert.assertEquals(backendCart.items[cart.size() - 3].weightUnit, Unit.GRAM.getId());
+
+        Assert.assertEquals(backendCart.items[cart.size() - 4].amount, 1);
+        Assert.assertEquals(backendCart.items[cart.size() - 4].units.intValue(), 6);
+        Assert.assertEquals(backendCart.items[cart.size() - 4].weightUnit, Unit.PIECE.getId());
+
+        Assert.assertEquals(backendCart.items[cart.size() - 5].amount, 1);
+        Assert.assertEquals(backendCart.items[cart.size() - 5].price.intValue(), 249);
+        Assert.assertEquals(backendCart.items[cart.size() - 5].weightUnit, Unit.PRICE.getId());
+
+        Assert.assertEquals(backendCart.items[cart.size() - 6].amount, 1);
+        Assert.assertEquals(backendCart.items[cart.size() - 6].units.intValue(), 4);
+        Assert.assertEquals(backendCart.items[cart.size() - 6].scannedCode, "2523237000040");
+        Assert.assertEquals(backendCart.items[cart.size() - 6].weightUnit, Unit.PIECE.getId());
+    }
+
     public void assertStrEquals(String a, String b) {
         Assert.assertEquals(replaceNoBreakSpace(a), replaceNoBreakSpace(b));
     }

core/src/main/java/io/snabble/sdk/CheckoutApi.java

@@ -100,6 +100,8 @@ public static class LineItem {
         int amount;
         int price;
         Integer units;
+        Integer weight;
+        String weightUnit;
         int totalPrice;
         LineItemType type;
     }

core/src/main/java/io/snabble/sdk/ShoppingCart.java

@@ -530,14 +530,28 @@ public ScannedCode getScannedCode() {
         }
 
         public int getEffectiveQuantity() {
+            return getEffectiveQuantity(false);
+        }
+
+        private int getEffectiveQuantity(boolean ignoreLineItem) {
             return scannedCode != null
                     && scannedCode.hasEmbeddedData()
-                    && scannedCode.getEmbeddedData() != 0 ? scannedCode.getEmbeddedData() : getQuantity();
+                    && scannedCode.getEmbeddedData() != 0 ? scannedCode.getEmbeddedData() : getQuantity(ignoreLineItem);
         }
 
         public int getQuantity() {
-            if (lineItem != null) {
-                return lineItem.amount;
+            return getQuantity(false);
+        }
+
+        public int getQuantity(boolean ignoreLineItem) {
+            if (lineItem != null && !ignoreLineItem) {
+                if (lineItem.weight != null) {
+                    return lineItem.weight;
+                } else if (lineItem.units != null){
+                    return lineItem.units;
+                } else {
+                    return lineItem.amount;
+                }
             }
 
             return quantity;
@@ -591,6 +605,10 @@ && getUnit() != PIECE
         public Unit getUnit() {
             if (product == null && lineItem != null) return null;
 
+            if (lineItem != null && lineItem.weightUnit != null) {
+                return Unit.fromString(lineItem.weightUnit);
+            }
+
             return scannedCode.getEmbeddedUnit() != null ? scannedCode.getEmbeddedUnit()
                     : product.getEncodingUnit(scannedCode.getTemplateName(), scannedCode.getLookupCode());
         }
@@ -683,15 +701,8 @@ public String getPriceText() {
                             && (getUnit() != PIECE || scannedCode.getEmbeddedData() == 0)
                             && getEffectiveQuantity() > 1)) {
 
-                        int price;
-                        if (lineItem.units != null) {
-                            price = lineItem.units * lineItem.price;
-                        } else {
-                            price = lineItem.price;
-                        }
-
                         return String.format("\u00D7 %s = %s",
-                                cart.priceFormatter.format(product, price),
+                                cart.priceFormatter.format(product, lineItem.price),
                                 cart.priceFormatter.format(getTotalPrice()));
                     } else {
                         if (lineItem.units != null) {
@@ -848,11 +859,11 @@ BackendCart toBackendCart() {
             item.amount = 1;
 
             if (cartItem.getUnit() == Unit.PIECE) {
-                item.units = cartItem.getEffectiveQuantity();
+                item.units = cartItem.getEffectiveQuantity(true);
             } else if (cartItem.getUnit() == Unit.PRICE) {
                 item.price = cartItem.getLocalTotalPrice();
             } else if (cartItem.getUnit() != null) {
-                item.weight = cartItem.getEffectiveQuantity();
+                item.weight = cartItem.getEffectiveQuantity(true);
             } else if (product.getType() == Product.Type.UserWeighed) {
                 item.weight = quantity;
             } else {