Merge pull request #20 from snabble/fixBundleProductEdgeCases

APPS-177 Fix notForSale handling

Author: ajungg

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

@@ -197,34 +197,6 @@ class ProductResolver private constructor(private val context: Context, private
             resolveBundles && product.bundleProducts.isNotEmpty() && !scannedCode.hasEmbeddedData() -> {
                 showBundleDialog(product, scannedCode)
             }
-            product.saleStop -> {
-                onSaleStopListener?.onSaleStop()
-                progressDialog.dismiss()
-                onDismissListener?.onDismiss()
-            }
-            product.notForSale -> {
-                onNotForSaleListener?.onNotForSale(product)
-                progressDialog.dismiss()
-                onDismissListener?.onDismiss()
-            }
-            product.availability == Product.Availability.NOT_AVAILABLE -> {
-                handleProductNotFound(scannedCode)
-            }
-            product.type == Product.Type.PreWeighed
-                    && (!scannedCode.hasEmbeddedData() || scannedCode.embeddedData == 0) -> {
-                onShelfCodeScannedListener?.onShelfCodeScanned()
-                progressDialog.dismiss()
-                onDismissListener?.onDismiss()
-            }
-            product.type == Product.Type.DepositReturnVoucher
-                    && project.shoppingCart.containsScannedCode(scannedCode) -> {
-                onAlreadyScannedListener?.onAlreadyScanned()
-                progressDialog.dismiss()
-                onDismissListener?.onDismiss()
-            }
-            onProductFoundListener != null -> {
-                onProductFoundListener?.onProductFound(product, scannedCode)
-            }
             else -> {
                 showProduct(product, scannedCode)
                 val event = if (wasOnlineProduct) {
@@ -238,30 +210,32 @@ class ProductResolver private constructor(private val context: Context, private
     }
 
     private fun showBundleDialog(product: Product, scannedCode: ScannedCode) {
-        SelectBundleDialog.show(context, product, object : SelectBundleDialog.Callback {
-            override fun onProductSelected(product: Product) {
-                Telemetry.event(Telemetry.Event.SelectedBundleProduct, product)
-                val codes = product.scannableCodes
-                if (codes.isNotEmpty() && codes[0].lookupCode != null) {
-                    val newCodes = ScannedCode.parse(project, codes[0].lookupCode)
-                    if (newCodes.size > 0) {
-                        var defaultCode = newCodes[0]
-                        for (newCode in newCodes) {
-                            if (newCode.templateName == "default") {
-                                defaultCode = newCode
+        if (handleProductFlags(product, scannedCode)) {
+            SelectBundleDialog.show(context, product, object : SelectBundleDialog.Callback {
+                override fun onProductSelected(product: Product) {
+                    Telemetry.event(Telemetry.Event.SelectedBundleProduct, product)
+                    val codes = product.scannableCodes
+                    if (codes.isNotEmpty() && codes[0].lookupCode != null) {
+                        val newCodes = ScannedCode.parse(project, codes[0].lookupCode)
+                        if (newCodes.size > 0) {
+                            var defaultCode = newCodes[0]
+                            for (newCode in newCodes) {
+                                if (newCode.templateName == "default") {
+                                    defaultCode = newCode
+                                }
                             }
+                            showProduct(product, defaultCode)
+                        } else {
+                            showProduct(product, scannedCode)
                         }
-                        showProduct(product, defaultCode)
-                    } else {
-                        showProduct(product, scannedCode)
                     }
                 }
-            }
 
-            override fun onDismissed() {
-                onDismissListener?.onDismiss()
-            }
-        })
+                override fun onDismissed() {
+                    onDismissListener?.onDismiss()
+                }
+            })
+        }
     }
 
     private fun handleProductNotFound(scannedCode: ScannedCode) {
@@ -279,7 +253,48 @@ class ProductResolver private constructor(private val context: Context, private
 
     private fun showProduct(product: Product?, scannedCode: ScannedCode?) {
         lastProduct = product
-        productConfirmationDialog.show(product, scannedCode)
+
+        if (product != null && scannedCode != null) {
+            if (handleProductFlags(product, scannedCode)) {
+                productConfirmationDialog.show(product, scannedCode)
+            }
+        }
+    }
+
+    private fun handleProductFlags(product: Product, scannedCode: ScannedCode) : Boolean {
+        when {
+            product.saleStop -> {
+                onSaleStopListener?.onSaleStop()
+                progressDialog.dismiss()
+                onDismissListener?.onDismiss()
+            }
+            product.notForSale -> {
+                onNotForSaleListener?.onNotForSale(product)
+                progressDialog.dismiss()
+                onDismissListener?.onDismiss()
+            }
+            product.availability == Product.Availability.NOT_AVAILABLE -> {
+                handleProductNotFound(scannedCode)
+            }
+            product.type == Product.Type.PreWeighed
+                    && (!scannedCode.hasEmbeddedData() || scannedCode.embeddedData == 0) -> {
+                onShelfCodeScannedListener?.onShelfCodeScanned()
+                progressDialog.dismiss()
+                onDismissListener?.onDismiss()
+            }
+            product.type == Product.Type.DepositReturnVoucher
+                    && project.shoppingCart.containsScannedCode(scannedCode) -> {
+                onAlreadyScannedListener?.onAlreadyScanned()
+                progressDialog.dismiss()
+                onDismissListener?.onDismiss()
+            }
+            onProductFoundListener != null -> {
+                onProductFoundListener?.onProductFound(product, scannedCode)
+            }
+            else -> return true
+        }
+
+        return false
     }
 
     @Deprecated("Use resolve() instead")