Skip to content

APPS-177 Fix notForSale handling #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajungg merged 2 commits into from
Feb 23, 2022
Merged

APPS-177 Fix notForSale handling #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf9ac88
Fix handling of edge cases (such as notForSale) when selecting produc…
ajungg Feb 22, 2022
1a04528
check for product flags earlier
ajungg Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 63 additions & 48 deletions ui/src/main/java/io/snabble/sdk/ui/scanner/ProductResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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")
Expand Down