Version 0.8.0

ajungg · ajungg · commit 89f534ad312a · 2018-06-27T15:34:16.000+02:00
- Now showing online price after checkout
- Correctly embedding weight in embedded codes
- Maximum amount of shopping cart is now 99999, not 100000
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.7.20'
+        sdkVersion='0.8.0'
         versionCode=1
 
         compileSdkVersion=27
diff --git a/core/src/androidTest/java/io/snabble/sdk/EAN13Test.java b/core/src/androidTest/java/io/snabble/sdk/EAN13Test.java
@@ -59,8 +59,5 @@ public void testInternalChecksum() {
 
     private void checkInternalChecksum(int checksum, String code){
         Assert.assertEquals(checksum, EAN13.internalChecksum(code));
-
-        ScannableCode scannableCode = ScannableCode.parse(snabbleSdk, code);
-        Assert.assertEquals(true, scannableCode.isEmbeddedDataOk());
     }
 }
diff --git a/core/src/main/java/io/snabble/sdk/Checkout.java b/core/src/main/java/io/snabble/sdk/Checkout.java
@@ -176,6 +176,7 @@ public enum State {
     private SignedCheckoutInfo signedCheckoutInfo;
     private CheckoutProcessResponse checkoutProcess;
     private PaymentMethod paymentMethod;
+    private int priceToPay;
 
     private List<OnCheckoutStateChangedListener> checkoutStateListeners = new CopyOnWriteArrayList<>();
 
@@ -301,6 +302,7 @@ public void checkout() {
         checkoutProcess = null;
         signedCheckoutInfo = null;
         paymentMethod = null;
+        priceToPay = 0;
 
         notifyStateChanged(State.HANDSHAKING);
 
@@ -325,6 +327,25 @@ public void onResponse(Call call, Response response) throws IOException {
                     String json = IOUtils.toString(inputStream, Charset.forName("UTF-8"));
                     signedCheckoutInfo = gson.fromJson(json, SignedCheckoutInfo.class);
 
+                    Logger.d("Local price: " + shoppingCart.getTotalPrice()
+                            + ", Remote price: " + signedCheckoutInfo.checkoutInfo.get("price"));
+
+                    if(signedCheckoutInfo.checkoutInfo.has("price")
+                            && signedCheckoutInfo.checkoutInfo.get("price").getAsJsonObject().has("price")) {
+                        priceToPay = signedCheckoutInfo.checkoutInfo
+                                .get("price")
+                                .getAsJsonObject()
+                                .get("price")
+                                .getAsInt();
+                    } else {
+                        priceToPay = shoppingCart.getTotalPrice();
+                    }
+
+                    if(priceToPay != shoppingCart.getTotalPrice()){
+                        Logger.w("Warning local price is different from remotely calculated price! (Local: "
+                                + shoppingCart.getTotalPrice() + ", Remote: " + priceToPay);
+                    }
+
                     PaymentMethod[] availablePaymentMethods = getAvailablePaymentMethods();
                     if (availablePaymentMethods != null && availablePaymentMethods.length > 0) {
                         if (availablePaymentMethods.length == 1) {
@@ -596,6 +617,10 @@ public PaymentMethod getSelectedPaymentMethod() {
         return paymentMethod;
     }
 
+    public int getPriceToPay() {
+        return priceToPay;
+    }
+
     /**
      * Gets all available payment methods, callable after {@link Checkout.State#REQUEST_PAYMENT_METHOD}.
      */
diff --git a/core/src/main/java/io/snabble/sdk/ShoppingCart.java b/core/src/main/java/io/snabble/sdk/ShoppingCart.java
@@ -12,7 +12,7 @@
 import io.snabble.sdk.codes.ScannableCode;
 
 public class ShoppingCart {
-    public static final int MAX_QUANTITY = 100000;
+    public static final int MAX_QUANTITY = 99999;
 
     private static class Entry {
         private Product product;
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutEncodedCodesView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutEncodedCodesView.java
@@ -12,8 +12,10 @@
 import android.widget.TextView;
 
 import io.snabble.sdk.Checkout;
+import io.snabble.sdk.Product;
 import io.snabble.sdk.ShoppingCart;
 import io.snabble.sdk.SnabbleSdk;
+import io.snabble.sdk.codes.EAN13;
 import io.snabble.sdk.ui.PriceFormatter;
 import io.snabble.sdk.ui.R;
 import io.snabble.sdk.ui.SnabbleUI;
@@ -50,7 +52,6 @@ private void inflateView() {
         scrollView = findViewById(R.id.scroll_view);
 
         sdkInstance = SnabbleUI.getSdkInstance();
-        ShoppingCart shoppingCart = sdkInstance.getShoppingCart();
 
         Button paidButton = findViewById(R.id.paid);
         paidButton.setOnClickListener(new OnClickListener() {
@@ -67,7 +68,7 @@ public void onClick(View v) {
         });
 
         PriceFormatter priceFormatter = new PriceFormatter(sdkInstance);
-        String formattedAmount = priceFormatter.format(shoppingCart.getTotalPrice());
+        String formattedAmount = priceFormatter.format(sdkInstance.getCheckout().getPriceToPay());
 
         TextView textView = findViewById(R.id.pay_amount);
         textView.setText(getContext().getString(R.string.Snabble_PaymentSelection_title) + " " + formattedAmount);
@@ -122,21 +123,12 @@ public CodeListView(@NonNull Context context) {
 
             stringBuilder = new StringBuilder();
 
-            Checkout checkout = sdkInstance.getCheckout();
-            ShoppingCart shoppingCart = sdkInstance.getShoppingCart();
+
 
             int h = scrollContainer.getHeight();
             barcodeHeight = h - h / 5;
 
-            for (String code : checkout.getCodes()) {
-                addScannableCode(code);
-            }
-
-            for (int i = 0; i < shoppingCart.size(); i++) {
-                for (int j = 0; j < shoppingCart.getQuantity(i); j++) {
-                    addScannableCode(shoppingCart.getScannedCode(i));
-                }
-            }
+            addCodes();
 
             if(getChildCount() == 0){
                 barcodeHeight = h;
@@ -146,6 +138,42 @@ public CodeListView(@NonNull Context context) {
             updateExplanationText(getChildCount());
         }
 
+        private void addCodes() {
+            Checkout checkout = sdkInstance.getCheckout();
+            ShoppingCart shoppingCart = sdkInstance.getShoppingCart();
+
+            for (String code : checkout.getCodes()) {
+                addScannableCode(code);
+            }
+
+            for (int i = 0; i < shoppingCart.size(); i++) {
+                Product product = shoppingCart.getProduct(i);
+                if(product.getType() == Product.Type.UserWeighed){
+                    String[] weighItemIds = product.getWeighedItemIds();
+                    if(weighItemIds != null && weighItemIds.length > 0){
+                        StringBuilder code = new StringBuilder(weighItemIds[0]);
+                        if(code.length() == 13){
+                            StringBuilder embeddedWeight = new StringBuilder();
+                            String quantity = String.valueOf(shoppingCart.getQuantity(i));
+                            int leadingZeros = 5 - quantity.length();
+                            for(int j=0; j<leadingZeros; j++){
+                                embeddedWeight.append('0');
+                            }
+                            embeddedWeight.append(quantity);
+                            code.replace(7, 12, embeddedWeight.toString());
+                            code.setCharAt(6, Character.forDigit(EAN13.internalChecksum(code.toString()), 10));
+                            code.setCharAt(12, Character.forDigit(EAN13.checksum(code.substring(0, 12)), 10));
+                            addScannableCode(code.toString());
+                        }
+                    }
+                } else {
+                    for (int j = 0; j < shoppingCart.getQuantity(i); j++) {
+                        addScannableCode(shoppingCart.getScannedCode(i));
+                    }
+                }
+            }
+        }
+
         private void generateView() {
             stringBuilder.append(sdkInstance.getEncodedCodesSuffix());
             String code = stringBuilder.toString();
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutQRCodePOSView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutQRCodePOSView.java
@@ -47,7 +47,7 @@ public void onClick(View v) {
         SnabbleSdk sdkInstance = SnabbleUI.getSdkInstance();
 
         PriceFormatter priceFormatter = new PriceFormatter(sdkInstance);
-        String formattedAmount = priceFormatter.format(sdkInstance.getShoppingCart().getTotalPrice());
+        String formattedAmount = priceFormatter.format(sdkInstance.getCheckout().getPriceToPay());
 
         TextView textView = findViewById(R.id.pay_amount);
         textView.setText(getContext().getString(R.string.Snabble_PaymentSelection_title) + " " + formattedAmount);
diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentMethodView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentMethodView.java
@@ -92,7 +92,7 @@ private void inflateView() {
         TextView title = findViewById(R.id.choose_payment_title);
 
         PriceFormatter priceFormatter = new PriceFormatter(sdkInstance);
-        String totalPriceText = priceFormatter.format(sdkInstance.getShoppingCart().getTotalPrice());
+        String totalPriceText = priceFormatter.format(sdkInstance.getCheckout().getPriceToPay());
         title.setText(getResources().getString(R.string.Snabble_PaymentSelection_howToPay, totalPriceText));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ allprojects {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`project.ext {`
`27`		`- sdkVersion='0.7.20'`
	`27`	`+ sdkVersion='0.8.0'`
`28`	`28`	`versionCode=1`
`29`	`29`
`30`	`30`	`compileSdkVersion=27`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,5 @@ public void testInternalChecksum() {`
`59`	`59`
`60`	`60`	`private void checkInternalChecksum(int checksum, String code){`
`61`	`61`	`Assert.assertEquals(checksum, EAN13.internalChecksum(code));`
`62`		`-`
`63`		`- ScannableCode scannableCode = ScannableCode.parse(snabbleSdk, code);`
`64`		`- Assert.assertEquals(true, scannableCode.isEmbeddedDataOk());`
`65`	`62`	`}`
`66`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ private void inflateView() {`
`92`	`92`	`TextView title = findViewById(R.id.choose_payment_title);`
`93`	`93`
`94`	`94`	`PriceFormatter priceFormatter = new PriceFormatter(sdkInstance);`
`95`		`- String totalPriceText = priceFormatter.format(sdkInstance.getShoppingCart().getTotalPrice());`
	`95`	`+ String totalPriceText = priceFormatter.format(sdkInstance.getCheckout().getPriceToPay());`
`96`	`96`	`title.setText(getResources().getString(R.string.Snabble_PaymentSelection_howToPay, totalPriceText));`
`97`	`97`	`}`
`98`	`98`