addewd configurable rounding mode

Author: ajungg

build.gradle

@@ -24,7 +24,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.6.3'
+        sdkVersion='0.6.4'
         versionCode=1
 
         compileSdkVersion=27

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

@@ -156,10 +156,6 @@ public Type getType() {
         return type;
     }
 
-    public int getPriceForQuantity(int quantity) {
-        return getPriceForQuantity(quantity, RoundingMode.UP);
-    }
-
     public int getPriceForQuantity(int quantity, RoundingMode roundingMode){
         if (type == Product.Type.UserWeighed || type == Product.Type.PreWeighed) {
             BigDecimal pricePerUnit = new BigDecimal(price)

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

@@ -52,12 +52,15 @@ public void setScannedCode(ScannableCode scannedCode){
     private transient List<ShoppingCartListener> listeners = new CopyOnWriteArrayList<>();
     private transient ProductDatabase productDatabase;
     private transient Handler handler = new Handler(Looper.getMainLooper());
+    private transient SnabbleSdk sdkInstance;
 
     protected ShoppingCart() {
         //empty constructor for gson
     }
 
     void initWithSdkInstance(SnabbleSdk sdkInstance) {
+        this.sdkInstance = sdkInstance;
+
         productDatabase = sdkInstance.getProductDatabase();
         productDatabase.addOnDatabaseUpdateListener(new ProductDatabase.OnDatabaseUpdateListener() {
             @Override
@@ -353,13 +356,13 @@ public int getTotalPrice() {
                 Product product = e.product;
 
                 if(e.weight != null){
-                    sum += product.getPriceForQuantity(e.weight);
+                    sum += product.getPriceForQuantity(e.weight, sdkInstance.getRoundingMode());
                 } else if(e.price != null){
                     sum += e.price;
                 } else if(e.amount != null){
                     sum += product.getPrice() * e.amount;
                 } else {
-                    sum += product.getPriceForQuantity(e.quantity);
+                    sum += product.getPriceForQuantity(e.quantity, sdkInstance.getRoundingMode());
                 }
             }
 

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

@@ -5,6 +5,7 @@
 import android.os.Bundle;
 
 import java.io.File;
+import java.math.RoundingMode;
 import java.util.Arrays;
 import java.util.Currency;
 import java.util.List;
@@ -22,7 +23,6 @@
 
 public class SnabbleSdk {
 
-
     public static class Config {
         /**
          * The endpoint url of the snabble backend. For example "snabble.io" for the Production environment.
@@ -135,6 +135,8 @@ public static class Config {
         public String[] weighPrefixes = new String[0];
 
         public String[] amountPrefixes = new String[0];
+
+        public RoundingMode roundingMode = RoundingMode.UP;
     }
 
     private String endpointBaseUrl;
@@ -166,6 +168,8 @@ public static class Config {
     private String[] weighPrefixes = new String[0];
     private String[] amountPrefixes = new String[0];
 
+    private RoundingMode roundingMode;
+
     private SnabbleSdk() {
 
     }
@@ -264,6 +268,8 @@ private void init(final Application app,
         pricePrefixes = Arrays.copyOf(config.pricePrefixes, config.pricePrefixes.length);
         amountPrefixes = Arrays.copyOf(config.amountPrefixes, config.amountPrefixes.length);
 
+        roundingMode = config.roundingMode != null ? config.roundingMode : RoundingMode.UP;
+
         updateShops();
 
         if (config.bundledMetadataAssetPath != null) {
@@ -535,6 +541,10 @@ public Locale getCurrencyLocale() {
         return currencyLocale;
     }
 
+    public RoundingMode getRoundingMode() {
+        return roundingMode;
+    }
+
     public Checkout getCheckout() {
         return checkout;
     }

ui/src/main/java/io/snabble/sdk/ui/PriceFormatter.java

@@ -1,6 +1,7 @@
 package io.snabble.sdk.ui;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.util.Currency;
 
@@ -25,7 +26,7 @@ public String format(int price) {
 
         BigDecimal bigDecimal = new BigDecimal(price);
         BigDecimal divider = new BigDecimal(10).pow(fractionDigits);
-        BigDecimal dividedPrice = bigDecimal.divide(divider, fractionDigits, BigDecimal.ROUND_HALF_UP);
+        BigDecimal dividedPrice = bigDecimal.divide(divider, fractionDigits, sdkInstance.getRoundingMode());
 
         return numberFormat.format(dividedPrice.doubleValue());
     }

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

@@ -359,12 +359,14 @@ public void bindTo(final int position) {
                             priceFormatter.format(product.getPrice() * embeddedAmount)));
                 } else if(embeddedWeight != null){
                     priceTextView.setText(String.format(" * %s = %s", price,
-                            priceFormatter.format(product.getPriceForQuantity(embeddedWeight))));
+                            priceFormatter.format(product.getPriceForQuantity(embeddedWeight,
+                                    SnabbleUI.getSdkInstance().getRoundingMode()))));
                 } else if (quantity == 1) {
                     priceTextView.setText(" " + price);
                 } else {
                     priceTextView.setText(String.format(" * %s = %s", price,
-                            priceFormatter.format(product.getPriceForQuantity(quantity))));
+                            priceFormatter.format(product.getPriceForQuantity(quantity,
+                                    SnabbleUI.getSdkInstance().getRoundingMode()))));
                 }
 
                 if (type == Product.Type.UserWeighed || embeddedWeight != null) {

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

@@ -310,9 +310,13 @@ private void addToCart() {
 
     private void updatePayText() {
         if (checkout.isAvailable()) {
+            SnabbleSdk sdkInstance = SnabbleUI.getSdkInstance();
+
             int totalPrice = shoppingCart.getTotalPrice();
-            totalPrice -= product.getPriceForQuantity(shoppingCart.getQuantity(product));
-            totalPrice += product.getPriceForQuantity(getQuantity());
+            totalPrice -= product.getPriceForQuantity(shoppingCart.getQuantity(product),
+                    sdkInstance.getRoundingMode());
+            totalPrice += product.getPriceForQuantity(getQuantity(),
+                    sdkInstance.getRoundingMode());
             String formattedTotalPrice = priceFormatter.format(totalPrice);
             payNow.setVisibility(totalPrice > 0 ? View.VISIBLE : View.INVISIBLE);
             payNow.setText(String.format(Locale.getDefault(), payNowText, formattedTotalPrice));