checkout limit improvements

ajungg · ajungg · commit f0141a1d469a · 2019-04-09T12:02:31.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,22 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.13.5]
+
+### Added 
+- Added new onCheckoutLimitReached and onOnlinePaymentLimitReached callbacks to ShoppingCartListener. 
+
+This is a minor breaking change if you use the verbose listener because of additional interface methods.
+
+- Checkout has now an additional state: NO_PAYMENT_METHOD_AVAILABLE
+
+### Changed 
+- Added limit messages to shopping cart in addition to limit warnings in self scanning.
+- Added new message when no payment methods are available
+
+### New string keys
+- Snabble.Payment.noMethodAvailable
+
 ## [0.13.4]
 
 ### Fixed 
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.13.4'
+        sdkVersion='0.13.5'
         versionCode=1
 
         compileSdkVersion=28
diff --git a/core/src/main/java/io/snabble/sdk/Checkout.java b/core/src/main/java/io/snabble/sdk/Checkout.java
@@ -63,6 +63,10 @@ public enum State {
          * Invalid products detected. For example if a sale ∂stop was issued.
          */
         INVALID_PRODUCTS,
+        /**
+         * No payment method available.
+         */
+        NO_PAYMENT_METHOD_AVAILABLE,
         /**
          * No shop was selected.
          */
@@ -229,7 +233,12 @@ public void invalidProducts(List<Product> products) {
                 notifyStateChanged(State.INVALID_PRODUCTS);
             }
 
-                    @Override
+            @Override
+            public void noAvailablePaymentMethod() {
+                notifyStateChanged(State.NO_PAYMENT_METHOD_AVAILABLE);
+            }
+
+            @Override
             public void error() {
                 PaymentMethod fallback = getFallbackPaymentMethod();
                 if(fallback != null) {
@@ -418,7 +427,12 @@ public void invalidProducts(List<Product> products) {
 
                     }
 
-                            @Override
+                    @Override
+                    public void noAvailablePaymentMethod() {
+
+                    }
+
+                    @Override
                     public void error() {
 
                     }
diff --git a/core/src/main/java/io/snabble/sdk/CheckoutApi.java b/core/src/main/java/io/snabble/sdk/CheckoutApi.java
@@ -156,6 +156,7 @@ public interface CheckoutInfoResult {
         void success(SignedCheckoutInfo signedCheckoutInfo, int onlinePrice, PaymentMethod[] availablePaymentMethods);
         void noShop();
         void invalidProducts(List<Product> products);
+        void noAvailablePaymentMethod();
         void error();
     }
 
@@ -261,27 +262,38 @@ public void success(SignedCheckoutInfo signedCheckoutInfo) {
             @Override
             public void failure(JsonObject obj) {
                 try {
-                    List<String> invalidSkus = new ArrayList<>();
-                    JsonArray arr = obj
-                            .get("error").getAsJsonObject()
-                            .get("details").getAsJsonArray();
-
-                    for (int i=0; i<arr.size(); i++) {
-                        String sku = arr.get(0).getAsJsonObject().get("sku").getAsString();
-                        invalidSkus.add(sku);
+                    switch (obj.get("error").getAsJsonObject().get("type").getAsString()) {
+                        case "invalid_cart_item":
+                            List<String> invalidSkus = new ArrayList<>();
+                            JsonArray arr = obj
+                                    .get("error").getAsJsonObject()
+                                    .get("details").getAsJsonArray();
+
+                            for (int i=0; i<arr.size(); i++) {
+                                String sku = arr.get(0).getAsJsonObject().get("sku").getAsString();
+                                invalidSkus.add(sku);
+                            }
+
+                            List<Product> invalidProducts = new ArrayList<>();
+                            ShoppingCart cart = project.getShoppingCart();
+                            for (int i=0; i<cart.size(); i++) {
+                                Product product = cart.get(i).getProduct();
+                                if (invalidSkus.contains(product.getSku())) {
+                                    invalidProducts.add(product);
+                                }
+                            }
+
+                            Logger.e("Invalid products");
+                            checkoutInfoResult.invalidProducts(invalidProducts);
+                            break;
+                        case "no_available_method":
+                            checkoutInfoResult.noAvailablePaymentMethod();
+                            break;
+                        case "bad_shop_id":
+                        case "shop_not_found":
+                            checkoutInfoResult.noShop();
+                            break;
                     }
-
-                    List<Product> invalidProducts = new ArrayList<>();
-                    ShoppingCart cart = project.getShoppingCart();
-                    for (int i=0; i<cart.size(); i++) {
-                        Product product = cart.get(i).getProduct();
-                        if (invalidSkus.contains(product.getSku())) {
-                            invalidProducts.add(product);
-                        }
-                    }
-
-                    Logger.e("Invalid products");
-                    checkoutInfoResult.invalidProducts(invalidProducts);
                 } catch (Exception e) {
                     error(e);
                 }
diff --git a/core/src/main/java/io/snabble/sdk/ShoppingCart.java b/core/src/main/java/io/snabble/sdk/ShoppingCart.java
@@ -27,6 +27,10 @@ public class ShoppingCart {
     private int modCount = 0;
     private int addCount = 0;
     private Integer onlineTotalPrice;
+
+    private boolean hasRaisedMaxCheckoutLimit;
+    private boolean hasRaisedMaxOnlinePaymentLimit;
+
     private transient List<ShoppingCartListener> listeners;
     private transient Handler handler;
     private transient Project project;
@@ -87,6 +91,7 @@ void insert(Item item, int index, boolean update) {
                 items.remove(existing);
                 items.add(index, item);
                 modCount++;
+                checkLimits();
                 notifyQuantityChanged(this, item);
 
                 if (update) {
@@ -100,6 +105,7 @@ void insert(Item item, int index, boolean update) {
         addCount++;
         modCount++;
         items.add(index, item);
+        checkLimits();
         notifyItemAdded(this, item);
 
         if (update) {
@@ -146,7 +152,9 @@ public int indexOf(Item item) {
 
     public void remove(int index) {
         modCount++;
-        notifyItemRemoved(this, items.remove(index), index);
+        Item item = items.remove(index);
+        checkLimits();
+        notifyItemRemoved(this, item, index);
         invalidateOnlinePrices();
         updatePrices(true);
     }
@@ -160,6 +168,7 @@ public void clear() {
         modCount = 0;
         addCount = 0;
         onlineTotalPrice = null;
+        checkLimits();
         notifyCleared(this);
     }
 
@@ -199,6 +208,7 @@ public void invalidateOnlinePrices() {
             }
         }
 
+        checkLimits();
         notifyPriceUpdate(this);
     }
 
@@ -282,6 +292,27 @@ private void updateTimestamp() {
         lastModificationTime = System.currentTimeMillis();
     }
 
+    void checkLimits() {
+        int totalPrice = getTotalPrice();
+        if (totalPrice < project.getMaxCheckoutLimit()) {
+            hasRaisedMaxCheckoutLimit = false;
+        }
+
+        if (totalPrice < project.getMaxOnlinePaymentLimit()) {
+            hasRaisedMaxOnlinePaymentLimit = false;
+        }
+
+        if (!hasRaisedMaxCheckoutLimit && project.getMaxCheckoutLimit() > 0
+                && totalPrice >= project.getMaxCheckoutLimit()) {
+            hasRaisedMaxCheckoutLimit = true;
+            notifyCheckoutLimitReached(this);
+        } else if (!hasRaisedMaxOnlinePaymentLimit && project.getMaxOnlinePaymentLimit() > 0
+                && totalPrice >= project.getMaxOnlinePaymentLimit()) {
+            hasRaisedMaxOnlinePaymentLimit = true;
+            notifyOnlinePaymentLimitReached(this);
+        }
+    }
+
     public static class Item {
         private Product product;
         private ScannedCode scannedCode;
@@ -620,6 +651,10 @@ public interface ShoppingCartListener {
         void onProductsUpdated(ShoppingCart list);
 
         void onPricesUpdated(ShoppingCart list);
+
+        void onCheckoutLimitReached(ShoppingCart list);
+
+        void onOnlinePaymentLimitReached(ShoppingCart list);
     }
 
     public static abstract class SimpleShoppingCartListener implements ShoppingCartListener {
@@ -654,6 +689,16 @@ public void onItemRemoved(ShoppingCart list, Item item, int pos) {
         public void onPricesUpdated(ShoppingCart list) {
             onChanged(list);
         }
+
+        @Override
+        public void onCheckoutLimitReached(ShoppingCart list) {
+
+        }
+
+        @Override
+        public void onOnlinePaymentLimitReached(ShoppingCart list) {
+
+        }
     }
 
     private void notifyItemAdded(final ShoppingCart list, final Item item) {
@@ -717,6 +762,27 @@ public void run() {
         });
     }
 
+    void notifyCheckoutLimitReached(final ShoppingCart list) {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                for (ShoppingCartListener listener : listeners) {
+                    listener.onCheckoutLimitReached(list);
+                }
+            }
+        });
+    }
+
+    void notifyOnlinePaymentLimitReached(final ShoppingCart list) {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                for (ShoppingCartListener listener : listeners) {
+                    listener.onOnlinePaymentLimitReached(list);
+                }
+            }
+        });
+    }
     /**
      * Notifies all {@link #listeners} that the shopping list was cleared of all entries.
      *
diff --git a/core/src/main/java/io/snabble/sdk/ShoppingCartUpdater.java b/core/src/main/java/io/snabble/sdk/ShoppingCartUpdater.java
@@ -98,6 +98,7 @@ public void run() {
                             return;
                         }
 
+                        cart.checkLimits();
                         cart.notifyPriceUpdate(cart);
                     }
                 });
@@ -113,6 +114,11 @@ public void invalidProducts(List<Product> products) {
                 cart.notifyPriceUpdate(cart);
             }
 
+            @Override
+            public void noAvailablePaymentMethod() {
+                cart.notifyPriceUpdate(cart);
+            }
+
             @Override
             public void error() {
                 cart.notifyPriceUpdate(cart);
diff --git a/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java b/ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java
@@ -72,11 +72,37 @@ public class ShoppingCartView extends FrameLayout implements Checkout.OnCheckout
 
     private ShoppingCart.ShoppingCartListener shoppingCartListener = new ShoppingCart.SimpleShoppingCartListener() {
         @Override
-        public void onChanged(ShoppingCart list) {
+        public void onChanged(ShoppingCart cart) {
             swipeRefreshLayout.setRefreshing(false);
             submitList();
             update();
         }
+
+        @Override
+        public void onCheckoutLimitReached(ShoppingCart list) {
+            if (snackbar != null) {
+                snackbar.dismiss();
+            }
+
+            Project project = SnabbleUI.getProject();
+            String message = getResources().getString(R.string.Snabble_limitsAlert_checkoutNotAvailable,
+                    project.getPriceFormatter().format(project.getMaxCheckoutLimit()));
+            snackbar = UIUtils.snackbar(coordinatorLayout, message, UIUtils.SNACKBAR_LENGTH_VERY_LONG);
+            snackbar.show();
+        }
+
+        @Override
+        public void onOnlinePaymentLimitReached(ShoppingCart list) {
+            if (snackbar != null) {
+                snackbar.dismiss();
+            }
+
+            Project project = SnabbleUI.getProject();
+            String message = getResources().getString(R.string.Snabble_limitsAlert_notAllMethodsAvailable,
+                    project.getPriceFormatter().format(project.getMaxOnlinePaymentLimit()));
+            snackbar = UIUtils.snackbar(coordinatorLayout, message, UIUtils.SNACKBAR_LENGTH_VERY_LONG);
+            snackbar.show();
+        }
     };
 
     public ShoppingCartView(Context context) {
@@ -273,10 +299,18 @@ public void onStateChanged(Checkout.State state) {
             }
 
             progressDialog.dismiss();
-        } else if (state == Checkout.State.CONNECTION_ERROR) {
+        } else if (state == Checkout.State.CONNECTION_ERROR || state == Checkout.State.NO_SHOP) {
             UIUtils.snackbar(coordinatorLayout, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG)
                     .show();
             progressDialog.dismiss();
+        } else if (state == Checkout.State.NO_PAYMENT_METHOD_AVAILABLE) {
+            new AlertDialog.Builder(getContext())
+                    .setCancelable(false)
+                    .setTitle(R.string.Snabble_saleStop_errorMsg_title)
+                    .setMessage(R.string.Snabble_Payment_noMethodAvailable)
+                    .setPositiveButton(R.string.Snabble_OK, null)
+                    .show();
+            progressDialog.dismiss();
         } else if (state != Checkout.State.VERIFYING_PAYMENT_METHOD) {
             progressDialog.dismiss();
         }
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
@@ -22,6 +22,7 @@
 	<string name="Snabble.PaymentSelection.title">Pay</string>
 	<string name="Snabble.PaymentSelection.howToPay">How would you like to pay %s?</string>
 	<string name="Snabble.PaymentSelection.payNow">Pay %s now</string>
+	<string name="Snabble.Payment.noMethodAvailable">Unfortunately, this purchase can\'t be made using the app.</string>
 	<string name="Snabble.QRCode.didPay">I\'ve paid</string>
 	<string name="Snabble.QRCode.nextCode">Next Code</string>
 	<string name="Snabble.QRCode.priceMayDiffer">Total price is calculated at the register and may differ from the one shown here.</string>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ allprojects {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`project.ext {`
`26`		`- sdkVersion='0.13.4'`
	`26`	`+ sdkVersion='0.13.5'`
`27`	`27`	`versionCode=1`
`28`	`28`
`29`	`29`	`compileSdkVersion=28`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ public void run() {`
`98`	`98`	`return;`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ cart.checkLimits();`
`101`	`102`	`cart.notifyPriceUpdate(cart);`
`102`	`103`	`}`
`103`	`104`	`});`
`@@ -113,6 +114,11 @@ public void invalidProducts(List<Product> products) {`
`113`	`114`	`cart.notifyPriceUpdate(cart);`
`114`	`115`	`}`
`115`	`116`
	`117`	`+ @Override`
	`118`	`+ public void noAvailablePaymentMethod() {`
	`119`	`+ cart.notifyPriceUpdate(cart);`
	`120`	`+ }`
	`121`	`+`
`116`	`122`	`@Override`
`117`	`123`	`public void error() {`
`118`	`124`	`cart.notifyPriceUpdate(cart);`