reencode user input for zero amount products in backend items

Author: ajungg

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - Race condition when updating product database and shopping cart prices at the same time
 - Fixed a bug with BarcodeView not properly fading in when outside bounds
+- Reencode user input for zero amount products in backend items 
 
 ## [0.13.5]
 

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

@@ -276,6 +276,10 @@ public void testBackendCart() {
         item.setQuantity(4);
         cart.add(item);
 
+        item = zeroAmountProduct.cartItem();
+        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);
@@ -298,6 +302,7 @@ public void testBackendCart() {
 
         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, "2523237000042");
         Assert.assertEquals(backendCart.items[cart.size() - 6].weightUnit, Unit.PIECE.getId());
     }
 

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

@@ -12,6 +12,7 @@
 import java.util.concurrent.TimeUnit;
 
 import io.snabble.sdk.codes.ScannedCode;
+import io.snabble.sdk.codes.templates.CodeTemplate;
 import io.snabble.sdk.utils.GsonHolder;
 
 import static io.snabble.sdk.Unit.PIECE;
@@ -608,6 +609,21 @@ public BackendCart toBackendCart() {
                 item.price = scannedCode.getPrice();
             }
 
+            // reencode user input from scanned code with 0 amount
+            if (cartItem.getUnit() == Unit.PIECE && scannedCode.getEmbeddedData() == 0) {
+                CodeTemplate codeTemplate = project.getCodeTemplate(scannedCode.getTemplateName());
+
+                if (codeTemplate != null) {
+                    ScannedCode newCode = codeTemplate.code(scannedCode.getLookupCode())
+                            .embed(cartItem.getEffectiveQuantity())
+                            .buildCode();
+
+                    if (newCode != null) {
+                        item.scannedCode = newCode.getCode();
+                    }
+                }
+            }
+
             items.add(item);
         }