fix price display & transmit barcode encoded price to backend

Author: ajungg

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

@@ -240,6 +240,10 @@ private PayloadCart getPayloadCart() {
                 item.units = quantity;
             }
 
+            if (item.price == null && item.units != null && scannedCode.hasPrice()) {
+                item.price = item.units * scannedCode.getPrice();
+            }
+
             payloadCart.items[i] = item;
         }
 

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

@@ -422,7 +422,11 @@ public int getTotalPrice() {
                 } else if (e.price != null) {
                     sum += e.price;
                 } else if (e.amount != null) {
-                    sum += product.getPrice() * e.amount;
+                    int productPrice = product.getDiscountedPrice();
+                    if (e.scannedCode.hasPrice()) {
+                        productPrice = e.scannedCode.getPrice();
+                    }
+                    sum += productPrice * e.amount;
                 } else {
                     sum += product.getPriceForQuantity(e.quantity, e.scannedCode, project.getRoundingMode());
                 }

core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesGenerator.java

@@ -101,9 +101,19 @@ private void addProducts(ShoppingCart shoppingCart, boolean ageRestricted) {
         Collections.sort(productInfos, new Comparator<ProductInfo>() {
             @Override
             public int compare(ProductInfo p1, ProductInfo p2) {
-                if (p1.product.getDiscountedPrice() < p2.product.getDiscountedPrice()) {
+                int price1 = p1.product.getDiscountedPrice();
+                if (p1.scannedCode.hasPrice()) {
+                    price1 = p1.scannedCode.getPrice();
+                }
+
+                int price2 = p2.product.getDiscountedPrice();
+                if (p2.scannedCode.hasPrice()) {
+                    price2 = p2.scannedCode.getPrice();
+                }
+
+                if (price1 < price2) {
                     return -1;
-                } else if (p1.product.getDiscountedPrice() > p2.product.getDiscountedPrice()) {
+                } else if (price1 > price2) {
                     return 1;
                 }
 

ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java

@@ -477,12 +477,17 @@ public void bindTo(final int position) {
 
                 String price = priceFormatter.format(product, true, scannedCode);
 
+                int productPrice = product.getDiscountedPrice();
+                if (scannedCode.hasPrice()) {
+                    productPrice = scannedCode.getPrice();
+                }
+
                 if (embeddedPrice != null) {
                     priceTextView.setText(" " + priceFormatter.format(embeddedPrice));
                 } else if (embeddedAmount != null) {
                     priceTextView.setText(String.format(" * %s = %s",
-                            priceFormatter.format(product.getPrice()),
-                            priceFormatter.format(product.getPrice() * embeddedAmount)));
+                            priceFormatter.format(productPrice),
+                            priceFormatter.format(productPrice * embeddedAmount)));
                 } else if (embeddedWeight != null) {
                     String priceSum = priceFormatter.format(product.getPriceForQuantity(embeddedWeight, scannedCode, roundingMode));
                     priceTextView.setText(String.format(" * %s = %s", price, priceSum));
@@ -545,7 +550,7 @@ public void bindTo(final int position) {
                 }
 
                 // special case if price is zero we assume its a picking product
-                if (product.getDiscountedPrice() == 0) {
+                if (productPrice == 0) {
                     controlsDefault.setVisibility(View.GONE);
                     controlsUserWeighed.setVisibility(View.GONE);
                 }

ui/src/main/java/io/snabble/sdk/ui/scanner/ProductConfirmationDialog.java

@@ -117,6 +117,11 @@ public void show(Product newProduct, ScannedCode scannedCode) {
             unit = scannedCode.getEmbeddedUnit();
         }
 
+        int productPrice = product.getDiscountedPrice();
+        if (scannedCode.hasPrice()) {
+            productPrice = scannedCode.getPrice();
+        }
+
         if (scannedCode.hasEmbeddedData()) {
             if (Unit.hasDimension(unit)) {
                 quantityAnnotation.setText(getNonNullEncodingUnit(product, scannedCode).getDisplayValue());
@@ -157,7 +162,7 @@ public void show(Product newProduct, ScannedCode scannedCode) {
 
             // special case if price is zero we assume its a picking product and hide the
             // controls to adjust the quantity
-            if (product.getDiscountedPrice() == 0) {
+            if (productPrice == 0) {
                 plus.setVisibility(View.GONE);
                 minus.setVisibility(View.GONE);
                 quantity.setText("1");
@@ -318,14 +323,19 @@ private void updatePrice() {
             encodingDisplayValue = encodingUnit.getDisplayValue();
         }
 
+        int productPrice = product.getDiscountedPrice();
+        if (scannedCode.hasPrice()) {
+            productPrice = scannedCode.getPrice();
+        }
+
         if (q > 0 && (Unit.hasDimension(encodingUnit) || product.getType() == Product.Type.UserWeighed)) {
             price.setText(String.format("%s %s * %s = %s", String.valueOf(q), encodingDisplayValue, singlePrice, priceText));
         } else if (q > 1) {
             if (encodingUnit == Unit.PIECE) {
                 price.setText(String.format("%s * %s = %s",
                         String.valueOf(q),
-                        priceFormatter.format(product.getPrice()),
-                        priceFormatter.format(product.getPrice() * q)));
+                        priceFormatter.format(productPrice),
+                        priceFormatter.format(productPrice * q)));
             } else {
                 price.setText(String.format("%s * %s = %s", String.valueOf(q), singlePrice, priceText));
             }