Skip to content

Commit 1a85add

Browse files
committed
Revert "adjust order of product flag check"
This reverts commit 3062ba4
1 parent 3062ba4 commit 1a85add

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,9 @@ class ProductResolver private constructor(private val context: Context, private
194194
}
195195

196196
when {
197+
resolveBundles && product.bundleProducts.isNotEmpty() && !scannedCode.hasEmbeddedData() -> {
198+
showBundleDialog(product, scannedCode)
199+
}
197200
product.saleStop -> {
198201
onSaleStopListener?.onSaleStop()
199202
progressDialog.dismiss()
@@ -222,9 +225,6 @@ class ProductResolver private constructor(private val context: Context, private
222225
onProductFoundListener != null -> {
223226
onProductFoundListener?.onProductFound(product, scannedCode)
224227
}
225-
resolveBundles && product.bundleProducts.isNotEmpty() && !scannedCode.hasEmbeddedData() -> {
226-
showBundleDialog(product, scannedCode)
227-
}
228228
else -> {
229229
showProduct(product, scannedCode)
230230
val event = if (wasOnlineProduct) {

0 commit comments

Comments
 (0)