showing applied manual discount, manual discount fixes, pull to refresh fixed

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.37.12]
+
+### Added
+- Added indicator if an manual discount was applied or not
+
+### Fixed
+- Fixed pull to refresh in ShoppingCartView
+- Fixed selecting manual discounts resetting amount, even when no item is already in cart
+- Products with manual discounts are now editable
+
 ## [0.37.11]
 
 ### Fixed

build.gradle

@@ -31,7 +31,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.37.11'
+        sdkVersion='0.37.12'
         versionCode=1
 
         compileSdkVersion=30

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

@@ -107,6 +107,7 @@ public static class LineItem {
         int totalPrice;
         LineItemType type;
         List<PriceModifier> priceModifiers;
+        boolean redeemed;
     }
 
     public static class PriceModifier {
@@ -123,6 +124,8 @@ public enum LineItemType {
         DISCOUNT,
         @SerializedName("giveaway")
         GIVEAWAY,
+        @SerializedName("coupon")
+        COUPON,
     }
 
     public static class ExitToken {

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

@@ -316,6 +316,7 @@ public void invalidateOnlinePrices() {
                 items.remove(i);
             } else {
                 item.lineItem = null;
+                item.isManualCouponApplied = false;
             }
         }
 
@@ -327,7 +328,7 @@ public void updatePrices(boolean debounce) {
         if(debounce) {
             updater.dispatchUpdate();
         } else {
-            updater.update();
+            updater.update(true);
         }
     }
 
@@ -534,6 +535,7 @@ public static class Item {
         private String id;
         private boolean isUsingSpecifiedQuantity;
         private transient ShoppingCart cart;
+        private boolean isManualCouponApplied;
         private Coupon coupon;
 
         protected Item() {
@@ -672,16 +674,16 @@ public ItemType getType() {
             return null;
         }
 
-        public boolean isManualCouponApplied() {
-            if (lineItem != null) {
-                return lineItem.priceModifiers.size() > 0; // TODO that is not correct
-            }
+        public void setManualCouponApplied(boolean manualCouponApplied) {
+            isManualCouponApplied = manualCouponApplied;
+        }
 
-            return false;
+        public boolean isManualCouponApplied() {
+            return isManualCouponApplied;
         }
 
         public boolean isEditable() {
-            if (coupon != null) {
+            if (coupon != null && coupon.getType() != CouponType.MANUAL) {
                 return false;
             }
 

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

@@ -39,15 +39,15 @@ class ShoppingCartUpdater {
     private Runnable updatePriceRunnable = new Runnable() {
         @Override
         public void run() {
-            update();
+            update(false);
         }
     };
 
     public CheckoutApi.PaymentMethodInfo[] getLastAvailablePaymentMethods() {
         return lastAvailablePaymentMethods;
     }
 
-    public void update() {
+    public void update(boolean force) {
         Logger.d("Updating prices...");
 
         if (cart.size() == 0) {
@@ -57,7 +57,7 @@ public void update() {
         }
 
         final int modCount = cart.getModCount();
-        if (modCount == successfulModCount) {
+        if (modCount == successfulModCount && !force) {
             return;
         }
 
@@ -199,6 +199,11 @@ private void commitCartUpdate(int modCount, CheckoutApi.SignedCheckoutInfo signe
                         if (add) {
                             cart.insert(cart.newItem(lineItem), cart.size(), false);
                         }
+
+                        if (lineItem.type == CheckoutApi.LineItemType.COUPON) {
+                            ShoppingCart.Item refersTo = cart.getByItemId(lineItem.refersTo);
+                            refersTo.setManualCouponApplied(lineItem.redeemed);
+                        }
                     }
                 }
             }

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

@@ -296,7 +296,7 @@ public void updatePrice() {
         enterReducedPrice.setVisibility(isVisible ? View.VISIBLE : View.GONE);
         enterReducedPrice.setOnClickListener(v -> {
             FragmentActivity fragmentActivity = UIUtils.getHostFragmentActivity(context);
-            new SelectReducedPriceDialogFragment(ProductConfirmationDialog.this, cartItem)
+            new SelectReducedPriceDialogFragment(ProductConfirmationDialog.this, cartItem, shoppingCart)
                     .show(fragmentActivity.getSupportFragmentManager(), null);
         });
 

ui/src/main/java/io/snabble/sdk/ui/scanner/SelectReducedPriceDialogFragment.kt

@@ -10,10 +10,12 @@ import io.snabble.sdk.CouponType
 import io.snabble.sdk.ShoppingCart
 import io.snabble.sdk.ui.R
 import io.snabble.sdk.ui.SnabbleUI
+import java.security.PrivateKey
 
 class SelectReducedPriceDialogFragment(
     private val productConfirmationDialog: ProductConfirmationDialog?,
-    private val cartItem: ShoppingCart.Item?
+    private val cartItem: ShoppingCart.Item?,
+    private val shoppingCart: ShoppingCart?
 ) : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         if (productConfirmationDialog == null || cartItem == null) {
@@ -22,6 +24,9 @@ class SelectReducedPriceDialogFragment(
 
         val project = SnabbleUI.getProject()
         val discounts = project.coupons.get(CouponType.MANUAL)
+        val dialog = productConfirmationDialog
+        val item = cartItem
+        val cart = shoppingCart
 
         val adapter = ArrayAdapter(requireContext(),
             R.layout.snabble_item_pricereduction_select,
@@ -33,12 +38,18 @@ class SelectReducedPriceDialogFragment(
             .setTitle(R.string.Snabble_addDiscount)
             .setAdapter(adapter) { _, which ->
                 if (which == 0) {
-                    cartItem?.coupon = null
+                    item?.coupon = null
                 } else {
-                    cartItem?.coupon = discounts[which - 1]
+                    item?.coupon = discounts[which - 1]
                 }
-                productConfirmationDialog?.updatePrice()
-                productConfirmationDialog?.updateQuantityText()
+
+                val existingItem = cart?.getExistingMergeableProduct(item?.product)
+                if (existingItem?.isMergeable == true) {
+                    dialog?.setQuantity(1)
+                }
+
+                dialog?.updatePrice()
+                dialog?.updateQuantityText()
             }
             .create()
     }