Skip to content

Show replace modifier as negative disocunt (APPS-2496) #265

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
merged 1 commit into from
Oct 1, 2025
Merged

Show replace modifier as negative disocunt (APPS-2496) #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file.
### Removed
### Fixed

## [0.82.3]
### Fixed
* ui: Show replace Modifiers as negative discount

## [0.82.2]
### Added
* core: Add function to search for products by a prefix
Expand Down
32 changes: 19 additions & 13 deletions ui/src/main/java/io/snabble/sdk/ui/cart/shoppingcart/ShoppingCartViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,27 +198,33 @@ class ShoppingCartViewModel : ViewModel() {
val name = priceModifier.name.orEmpty()
val weightUnit = item.item.lineItem?.weightUnit
val referenceUnit = item.item.lineItem?.referenceUnit
val modifiedPrice = if (weightUnit != null && referenceUnit != null) {
priceModifier
.convertPriceModifier(
amount = item.quantity,
weightedUnit = weightUnit,
referencedUnit = referenceUnit
)
.let { priceFormatter?.format(it).orEmpty() }
} else {
(priceModifier.price * item.quantity).let {
priceFormatter?.format(it).orEmpty()
val modifiedPrice =
if (priceModifier.action == "replace") {
priceFormatter?.format(
(item.item.lineItem?.price ?: 0) - priceModifier.price
).orEmpty()
} else if (weightUnit != null && referenceUnit != null) {
priceModifier
.convertPriceModifier(
amount = item.quantity,
weightedUnit = weightUnit,
referencedUnit = referenceUnit
)
.let { priceFormatter?.format(it).orEmpty() }
} else {
(priceModifier.price * item.quantity).let {
priceFormatter?.format(it).orEmpty()
}
}
}
// Set this to zero because the backend already subtracted the discount from the total price:
val discountValue = 0
modifiedPrice.let {
discounts.add(
DiscountItem(
name = name,
discount = modifiedPrice,
discountValue = discountValue
discountValue = discountValue,
useNegativeValue = priceModifier.action == "replace"
)
)
}
Expand Down
3 changes: 2 additions & 1 deletion ui/src/main/java/io/snabble/sdk/ui/cart/shoppingcart/product/model/DiscountItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ package io.snabble.sdk.ui.cart.shoppingcart.product.model
internal data class DiscountItem(
val name: String,
val discount: String,
val discountValue: Int
val discountValue: Int,
val useNegativeValue: Boolean = false
)
2 changes: 1 addition & 1 deletion ui/src/main/java/io/snabble/sdk/ui/cart/shoppingcart/product/widget/Product.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private fun DiscountItemWidget(it: DiscountItem) {
verticalAlignment = Alignment.CenterVertically
) {
Text(
it.discount,
if (it.useNegativeValue) "-${it.discount}" else it.discount,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurface
)
Expand Down