Add coupon violations

Author: rekire

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

@@ -3,6 +3,7 @@
 import static io.snabble.sdk.Unit.PIECE;
 import static io.snabble.sdk.Unit.PRICE;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 
@@ -11,24 +12,25 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
 import io.snabble.sdk.auth.AppUser;
-import io.snabble.sdk.checkout.DefaultCheckoutApi;
 import io.snabble.sdk.checkout.LineItem;
 import io.snabble.sdk.checkout.LineItemType;
 import io.snabble.sdk.checkout.PaymentMethodInfo;
 import io.snabble.sdk.checkout.PriceModifier;
+import io.snabble.sdk.checkout.Violation;
 import io.snabble.sdk.codes.ScannedCode;
 import io.snabble.sdk.codes.templates.CodeTemplate;
 import io.snabble.sdk.utils.Dispatch;
 import io.snabble.sdk.utils.GsonHolder;
 
-public class ShoppingCart {
+public class ShoppingCart implements Iterable<ShoppingCart.Item> {
     public enum ItemType {
         PRODUCT,
         LINE_ITEM,
@@ -209,6 +211,13 @@ public Item get(int index) {
         return items.get(index);
     }
 
+    @NonNull
+    @Override
+    public Iterator<Item> iterator() {
+        return items.iterator();
+    }
+
+
     public Item getExistingMergeableProduct(Product product) {
         if (product == null) {
             return null;
@@ -590,6 +599,7 @@ public static class Item {
         private transient ShoppingCart cart;
         private boolean isManualCouponApplied;
         private Coupon coupon;
+        private String couponId;
 
         protected Item() {
             // for gson
@@ -600,6 +610,7 @@ private Item(ShoppingCart cart, Coupon coupon, ScannedCode scannedCode) {
             this.cart = cart;
             this.scannedCode = scannedCode;
             this.coupon = coupon;
+            this.couponId = UUID.randomUUID().toString();
         }
 
         private Item(ShoppingCart cart, Product product, ScannedCode scannedCode) {
@@ -1155,15 +1166,15 @@ public BackendCart toBackendCart() {
 
                 if (cartItem.coupon != null) {
                     BackendCartItem couponItem = new BackendCartItem();
-                    couponItem.id = UUID.randomUUID().toString();
+                    couponItem.id = cartItem.coupon.getId();
                     couponItem.refersTo = item.id;
                     couponItem.amount = 1;
                     couponItem.couponID = cartItem.coupon.getId();
                     items.add(couponItem);
                 }
             } else if (cartItem.getType() == ItemType.COUPON) {
                 BackendCartItem item = new BackendCartItem();
-                item.id = UUID.randomUUID().toString();
+                item.id = cartItem.couponId;
                 item.amount = 1;
 
                 ScannedCode scannedCode = cartItem.getScannedCode();
@@ -1222,6 +1233,8 @@ public interface ShoppingCartListener {
         void onOnlinePaymentLimitReached(ShoppingCart list);
 
         void onTaxationChanged(ShoppingCart list, Taxation taxation);
+
+        void onViolationDetected(@NonNull List<Violation> violations);
     }
 
     public static abstract class SimpleShoppingCartListener implements ShoppingCartListener {
@@ -1263,14 +1276,13 @@ public void onTaxationChanged(ShoppingCart list, Taxation taxation) {
         }
 
         @Override
-        public void onCheckoutLimitReached(ShoppingCart list) {
-
-        }
+        public void onCheckoutLimitReached(ShoppingCart list) {}
 
         @Override
-        public void onOnlinePaymentLimitReached(ShoppingCart list) {
+        public void onOnlinePaymentLimitReached(ShoppingCart list) {}
 
-        }
+        @Override
+        public void onViolationDetected(List<Violation> violations) {}
     }
 
     private void notifyItemAdded(final ShoppingCart list, final Item item) {
@@ -1348,6 +1360,32 @@ void notifyOnlinePaymentLimitReached(final ShoppingCart list) {
             }
         });
     }
+
+    public void notifyViolations(@NonNull List<Violation> violations) {
+        Dispatch.mainThread(() -> {
+            for (ShoppingCartListener listener : listeners) {
+                listener.onViolationDetected(violations);
+            }
+            for (Violation violation : violations) {
+                for (int i = items.size() - 1; i >= 0; i--) {
+                    if (items.get(i).coupon != null && items.get(i).couponId.equals(violation.getRefersTo())) {
+                        items.remove(items.get(i));
+                    }
+                }
+            }
+        });
+    }
+
+    @Nullable
+    public Coupon getCouponByCartId(String id) {
+        for (int i = items.size() - 1; i >= 0; i--) {
+            if (items.get(i).coupon != null && items.get(i).couponId.equals(id)) {
+                return items.get(i).coupon;
+            }
+        }
+        return null;
+    }
+
     /**
      * Notifies all {@link #listeners} that the shopping list was cleared of all entries.
      *

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

@@ -142,6 +142,10 @@ private void commitCartUpdate(int modCount, SignedCheckoutInfo signedCheckoutInf
 
             CheckoutInfo checkoutInfo = GsonHolder.get().fromJson(signedCheckoutInfo.getCheckoutInfo(), CheckoutInfo.class);
 
+            if (checkoutInfo.getViolations().size() > 0) {
+                cart.notifyViolations(checkoutInfo.getViolations());
+            }
+
             Set<String> referrerIds = new HashSet<>();
             Set<String> requiredIds = new HashSet<>();
 

core/src/main/java/io/snabble/sdk/checkout/CheckoutApi.kt

@@ -207,6 +207,13 @@ data class SignedCheckoutInfo(
 data class CheckoutInfo(
     val price: Price? = null,
     val lineItems: List<LineItem> = emptyList(),
+    val violations: List<Violation> = emptyList(),
+)
+
+data class Violation(
+    val type: String? = null,
+    val refersTo: String? = null,
+    val message: String? = null,
 )
 
 data class LineItem(

ui/src/main/res/values-de/strings.xml

@@ -64,6 +64,7 @@
     <string name="Snabble.paydirekt.gotoWebsite">Zu paydirekt.de</string>
     <string name="Snabble.paydirekt.payNow">Jetzt mit paydirekt bezahlen</string>
     <string name="Snabble.paydirekt.savedAuthorization">Du hast die Snabble-App erfolgreich für paydirekt autorisiert. Um dies rückgängig zu machen, musst du dich bei deinem paydirekt-Konto auf der Webseite anmelden. Möchtest du paydirekt nicht mehr als Bezahlmethode angezeigt bekommen, kannst du sie hier einfach entfernen.</string>
+    <string name="Snabble.paydirekt.title">paydirekt</string>
     <!-- SECTION: SnabbleAndroid -->
     <string name="Snabble.Payment.aborted">Der Bezahlvorgang wurde abgebrochen</string>
     <string name="Snabble.Payment.add">Bezahlverfahren hinzufügen</string>
@@ -312,5 +313,9 @@
     <string name="Snabble.Taxation.pleaseChoose">Bitte wählen</string>
     <string name="Snabble.TWINT.payNow">Jetzt mit TWINT bezahlen</string>
     <string name="Snabble.undo">Rückgängig</string>
+    <string name="Snabble.Violations.couponAlreadyVoided">Der Coupon „%s“ wurde bereits benutzt und wird aus dem Warenkorb entfernt</string>
+    <string name="Snabble.Violations.couponCurrentlyNotValid">Der Coupon „%s“ ist akuell ungültig und wird aus dem Warenkorb entfernt</string>
+    <string name="Snabble.Violations.couponInvalid">Der Coupon „%s“ ist ungültig und wird aus dem Warenkorb entfernt</string>
+    <string name="Snabble.Violations.title">Coupon ungültig</string>
     <string name="Snabble.Yes">Ja</string>
 </resources>

ui/src/main/res/values-en/strings.xml

@@ -64,6 +64,7 @@
     <string name="Snabble.paydirekt.gotoWebsite">Go to paydirekt.de</string>
     <string name="Snabble.paydirekt.payNow">Pay now using paydirekt</string>
     <string name="Snabble.paydirekt.savedAuthorization">You\'ve successfully authorized Snabble for paydirekt. To remove this authorization, you need to log in to your paydirekt account. If you do not want to use this payment method anymore, you can remove it here.</string>
+    <string name="Snabble.paydirekt.title">paydirekt</string>
     <!-- SECTION: SnabbleAndroid -->
     <string name="Snabble.Payment.aborted">Payment process was cancelled</string>
     <string name="Snabble.Payment.add">Add payment method</string>
@@ -312,5 +313,9 @@
     <string name="Snabble.Taxation.pleaseChoose">Please choose</string>
     <string name="Snabble.TWINT.payNow">Pay now using TWINT</string>
     <string name="Snabble.undo">Undo</string>
+    <string name="Snabble.Violations.couponAlreadyVoided">The coupon „%s“ is already redeemed and will be removed from cart</string>
+    <string name="Snabble.Violations.couponCurrentlyNotValid">The coupon „%s“ is currently not valid and will be removed from cart</string>
+    <string name="Snabble.Violations.couponInvalid">The coupon „%s“ is invalid and will be removed from cart</string>
+    <string name="Snabble.Violations.title">Coupon invalid</string>
     <string name="Snabble.Yes">Yes</string>
 </resources>

ui/src/main/res/values-fr/strings.xml

@@ -64,6 +64,7 @@
     <string name="Snabble.paydirekt.gotoWebsite">Vers paydirekt.de</string>
     <string name="Snabble.paydirekt.payNow">Payer maintenant avec paydirekt</string>
     <string name="Snabble.paydirekt.savedAuthorization">Tu as autorisé avec succès l’application Snabble pour paydirekt. Pour l’annuler, tu devras te connecter à ton compte paydirekt sur le site Web. Si tu ne souhaites plus que paydirekt s’affiche comme mode de paiement, tu peux simplement le supprimer ici.</string>
+    <string name="Snabble.paydirekt.title">paydirekt</string>
     <!-- SECTION: SnabbleAndroid -->
     <string name="Snabble.Payment.aborted">Le processus de paiement a été annulé</string>
     <string name="Snabble.Payment.add">Ajouter une procédure de paiement</string>

ui/src/main/res/values-hu/strings.xml

@@ -64,6 +64,7 @@
     <string name="Snabble.paydirekt.gotoWebsite">A paydirekt.de oldalra</string>
     <string name="Snabble.paydirekt.payNow">Fizetés paydirekttel</string>
     <string name="Snabble.paydirekt.savedAuthorization">A Snabble alkalmazást sikeresen bejelentetted a paydirektre. Visszavonásához a paydirekt fiókadataiddal be kell jelentkezned a honlapon. Ha nem szeretnéd, hogy a paydirekt a fizetési lehetőségeid között legyen, akkor itt egyszerűen eltávolíthatod.</string>
+    <string name="Snabble.paydirekt.title">paydirekt</string>
     <!-- SECTION: SnabbleAndroid -->
     <string name="Snabble.Payment.aborted">Megszakadt a fizetési folyamat</string>
     <string name="Snabble.Payment.add">Fizetési mód hozzáadása</string>
@@ -106,6 +107,7 @@
     <string name="Snabble.Payment.usableAt">Itt használható: %s</string>
     <string name="Snabble.Payment.waiting">Várj a nyugtázásra</string>
     <string name="Snabble.PaymentCard.editingHint">A kártyaadataidat kódolva tároljuk, éppen ezért nem tudjuk feldolgozni.</string>
+    <string name="Snabble.PaymentContinuation.message">A fizetés folytatódik</string>
     <string name="Snabble.PaymentError.title">Hiba történt</string>
     <string name="Snabble.PaymentError.tryAgain">Próbálkozz újra</string>
     <string name="Snabble.PaymentMethods.add">Fizetési mód hozzáadása</string>
@@ -176,6 +178,7 @@
     <string name="Snabble.Save">Mentés</string>
     <string name="Snabble.Scanner.Accessibility.actionHideHint">Megjegyzés tartós elrejtése</string>
     <string name="Snabble.Scanner.Accessibility.actionUnderstood">Megértettem</string>
+    <string name="Snabble.Scanner.Accessibility.enterQuantity">Add meg a mennyiséget %s-ben</string>
     <string name="Snabble.Scanner.Accessibility.eventBackInScanner">Visszatértél a szkennerbe</string>
     <string name="Snabble.Scanner.Accessibility.eventBarcodeDetected">Vonalkód ismert</string>
     <string name="Snabble.Scanner.Accessibility.eventMaxQuantityReached">Nem tudsz több terméket tenni a kosárba</string>

ui/src/main/res/values-it/strings.xml

@@ -64,6 +64,7 @@
     <string name="Snabble.paydirekt.gotoWebsite">A paydirekt.de</string>
     <string name="Snabble.paydirekt.payNow">Paga ora con paydirekt</string>
     <string name="Snabble.paydirekt.savedAuthorization">L’autorizzazione dell’app Snabble per paydirekt è avvenuta con successo. Per revocare l’autorizzazione, è necessario accedere al tuo account paydirekt sul sito web. Se non desideri più che paydirekt sia visualizzato come metodo di pagamento, è sufficiente rimuoverlo.</string>
+    <string name="Snabble.paydirekt.title">paydirekt</string>
     <!-- SECTION: SnabbleAndroid -->
     <string name="Snabble.Payment.aborted">Il pagamento è stato interrotto</string>
     <string name="Snabble.Payment.add">Aggiungi modalità di pagamento</string>

ui/src/main/res/values-sk/strings.xml

@@ -64,6 +64,7 @@
     <string name="Snabble.paydirekt.gotoWebsite">Prejsť na paydirekt.de</string>
     <string name="Snabble.paydirekt.payNow">Teraz zaplatiť prostredníctvom paydirekt</string>
     <string name="Snabble.paydirekt.savedAuthorization">Autorizácia aplikácie Snabble pre paydirekt bola úspešná. Ak chceš autorizáciu zrušiť, musíš sa prihlásiť do svojho konta paydirekt na webovej stránke. Pokiaľ nechceš, aby paydirekt bol v budúcnosti zobrazovaný ako spôsob platby, tu ho môžeš jednoducho odstrániť.</string>
+    <string name="Snabble.paydirekt.title">paydirekt</string>
     <!-- SECTION: SnabbleAndroid -->
     <string name="Snabble.Payment.aborted">Platobný proces bol prerušený</string>
     <string name="Snabble.Payment.add">Pridať spôsob platby</string>
@@ -106,6 +107,7 @@
     <string name="Snabble.Payment.usableAt">Použiteľné tu: %s</string>
     <string name="Snabble.Payment.waiting">Čakanie na potvrdenie</string>
     <string name="Snabble.PaymentCard.editingHint">Údaje o tvojej karte budeme uchovávať len v šifrovanej forme, a preto nemôžu byť spracované.</string>
+    <string name="Snabble.PaymentContinuation.message">Pokračovanie platby</string>
     <string name="Snabble.PaymentError.title">Vyskytla sa chyba</string>
     <string name="Snabble.PaymentError.tryAgain">Skúsiť znovu</string>
     <string name="Snabble.PaymentMethods.add">Pridať spôsob platby</string>
@@ -176,6 +178,7 @@
     <string name="Snabble.Save">Uložiť</string>
     <string name="Snabble.Scanner.Accessibility.actionHideHint">Skryť upozornenie natrvalo</string>
     <string name="Snabble.Scanner.Accessibility.actionUnderstood">Rozumiem</string>
+    <string name="Snabble.Scanner.Accessibility.enterQuantity">Zadaj množstvo v %s</string>
     <string name="Snabble.Scanner.Accessibility.eventBackInScanner">Si opäť v skeneri</string>
     <string name="Snabble.Scanner.Accessibility.eventBarcodeDetected">Čiarový kód bol rozpoznaný</string>
     <string name="Snabble.Scanner.Accessibility.eventMaxQuantityReached">Nemôžeš vložiť do košíka ďalšie položky</string>

ui/src/main/res/values/strings.xml

@@ -64,6 +64,7 @@
     <string name="Snabble.paydirekt.gotoWebsite">Go to paydirekt.de</string>
     <string name="Snabble.paydirekt.payNow">Pay now using paydirekt</string>
     <string name="Snabble.paydirekt.savedAuthorization">You\'ve successfully authorized Snabble for paydirekt. To remove this authorization, you need to log in to your paydirekt account. If you do not want to use this payment method anymore, you can remove it here.</string>
+    <string name="Snabble.paydirekt.title">paydirekt</string>
     <!-- SECTION: SnabbleAndroid -->
     <string name="Snabble.Payment.aborted">Payment process was cancelled</string>
     <string name="Snabble.Payment.add">Add payment method</string>
@@ -312,5 +313,9 @@
     <string name="Snabble.Taxation.pleaseChoose">Please choose</string>
     <string name="Snabble.TWINT.payNow">Pay now using TWINT</string>
     <string name="Snabble.undo">Undo</string>
+    <string name="Snabble.Violations.couponAlreadyVoided">The coupon „%s“ is already redeemed and will be removed from cart</string>
+    <string name="Snabble.Violations.couponCurrentlyNotValid">The coupon „%s“ is currently not valid and will be removed from cart</string>
+    <string name="Snabble.Violations.couponInvalid">The coupon „%s“ is invalid and will be removed from cart</string>
+    <string name="Snabble.Violations.title">Coupon invalid</string>
     <string name="Snabble.Yes">Yes</string>
 </resources>