Assume fractional unit is 0 when no conversion is possible of encoded unit & use scanned code when selecting bundle product

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.14.6]
+
+### Fixed
+- Assume fractional unit is 0 when no conversion is possible of encoded unit
+- Use scanned code when selecting bundle product
+
 ## [0.14.5]
 
 ### Changes 

build.gradle

@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.14.5'
+        sdkVersion='0.14.6'
         versionCode=1
 
         compileSdkVersion=28

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

@@ -185,17 +185,23 @@ private void handleProductAvailable(Product product, boolean wasOnlineProduct, S
                 } else {
                     int scale = decimal.scale();
                     Unit fractionalUnit = unit.getFractionalUnit(scale);
-                    if (fractionalUnit != null) {
-                        BigDecimal converted = Unit.convert(decimal, unit, fractionalUnit);
-                        scannedCode.setEmbeddedData(converted.intValue());
-                        scannedCode.setEmbeddedUnit(fractionalUnit);
+                    if (fractionalUnit == null) {
+                        fractionalUnit = unit;
+
+                        if (scale > 0) {
+                            decimal = decimal.multiply(new BigDecimal(Math.pow(10, scale)));
+                        }
                     }
+
+                    BigDecimal converted = Unit.convert(decimal, unit, fractionalUnit);
+                    scannedCode.setEmbeddedData(converted.intValue());
+                    scannedCode.setEmbeddedUnit(fractionalUnit);
                 }
             }
         }
 
         if(product.getBundleProducts().length > 0){
-            showBundleDialog(product);
+            showBundleDialog(product, scannedCode);
         } else {
             if (product.getSaleStop()) {
                 if (onSaleStopListener != null) {
@@ -230,18 +236,15 @@ private void handleProductAvailable(Product product, boolean wasOnlineProduct, S
         }
     }
 
-    private void showBundleDialog(Product product) {
+    private void showBundleDialog(Product product, final ScannedCode scannedCode) {
         SelectBundleDialog.show(context, product, new SelectBundleDialog.Callback() {
             @Override
             public void onProductSelected(Product product) {
                 Telemetry.event(Telemetry.Event.SelectedBundleProduct, product);
 
                 Product.Code[] codes = product.getScannableCodes();
-                if(codes.length > 0) {
-                    List<ScannedCode> scannedCodes = ScannedCode.parse(SnabbleUI.getProject(), codes[0].lookupCode);
-                    if (scannedCodes != null && scannedCodes.size() > 0) {
-                        showProduct(product, scannedCodes.get(0));
-                    }
+                if (codes.length > 0) {
+                    showProduct(product, scannedCode);
                 }
             }