[WOMOB-178][POS] Coupons Checkout Screen - Happy Path #13987

malinajirka · 2025-04-29T11:22:12Z

Description

This PR updates coupons on the checkout screen to match designs - happy path only.

The coupon in the cart is green and contains the discount after the order is created. The cart item is reverted if the user goes back to the product selection screen. Lastly, the totals section is re-ordered and rephrased.

This PR also updates the success/onSuccess colors to match the updated Design System.

Known issues:

The There are changes in the cart snackbar is always shown - will be fixed here.

Testing information

No Coupon

Open POS
Add a product to the cart
Move to checkout
Verify Discount total section is hidden and the flow works as expected.

Coupon Added

Open POS
Add a product to the cart
Add a coupon to the cart
Move to checkout
Notice the item is green and contains the discount
Notice totals section contains the discount

Multiple coupons added

Open POS
Add a product to the cart
Add a couple coupons to the cart
Move to checkout
Notice both coupons are green and contain discount
Notice totals section contains the total discount

The tests that have been performed

I have verified the above.

Images/gif

	Designs	Implementation
Light Products
Light Checkout
Dark Products
Dark Checkout

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

Reviewer (or Author, in the case of optional code reviews):

Please make sure these conditions are met before approving the PR, or request changes if the PR needs improvement:

The PR is small and has a clear, single focus, or a valid explanation is provided in the description. If needed, please request to split it into smaller PRs.
Ensure Adequate Unit Test Coverage: The changes are reasonably covered by unit tests or an explanation is provided in the PR description.
Manual Testing: The author listed all the tests they ran, including smoke tests when needed (e.g., for refactorings). The reviewer confirmed that the PR works as expected on big (tablet) and small (phone) in case of UI changes, and no regressions are added.

…count-in-cart # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartViewModel.kt

Copilot

Pull Request Overview

This PR updates the coupons checkout screen for the happy path by aligning the UI, tests, and event communication with the latest designs. Key changes include:

Updating tests to verify proper coupon discount formatting and event handling.
Refactoring naming from cartProductUpdater to cartItemsUpdater across multiple modules.
Adjusting UI components and logging to support coupon discount displays and error reporting.

Reviewed Changes

Copilot reviewed 14 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
WooPosTotalsViewModelTest.kt	Added tests for coupon discount text correctness and handling of invalid coupons.
WooPosCartViewModelTest.kt	Updated dependency and null handling for formatted coupon discounts in the cart.
WooPosCartItemsUpdaterTest.kt	Revised tests to verify the updated coupons logic and reporting in cart items updater.
WooPosTotalsViewModel.kt	Adjusted coupon discount formatting and mapping of coupon lines from orders.
WooPosCartScreen.kt	Modified UI to conditionally style coupon items based on calculated discount.
WooPosCartItemsUpdater.kt	Updated coupon processing to include logging and crash reporting when a coupon is missing.
WooPosHomeViewModel.kt & Communication Files	Updated data structures and event communication for coupons.
WooPosTheme.kt	Revised color definitions for success states in the design system.

Files not reviewed (1)

WooCommerce/src/main/res/values/strings.xml: Language not supported

Comments suppressed due to low confidence (2)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartItemsUpdater.kt:87

[nitpick] Consider including the coupon code (e.g., item.name) in the error message to improve debugging when the coupon cannot be found.

val message = "Coupon not found in the cart"

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsViewModel.kt:490

[nitpick] If coupon parsing failures are an expected occurrence, consider logging a warning instead of an error to prevent over-reporting.

wooLogWrapper.e(POS, "Parsing coupon failed, discount: ${it.discount}, code: ${it.code}, id: ${it.id}")

wpmobilebot · 2025-04-29T11:33:19Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`079fa79`
	Direct Download	`woocommerce-wear-prototype-build-pr13987-079fa79.apk`

wpmobilebot · 2025-04-29T11:48:18Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`079fa79`
	Direct Download	`woocommerce-prototype-build-pr13987-079fa79.apk`

dangermattic · 2025-04-30T07:49:32Z

	1 Warning
⚠️	This PR is assigned to the milestone 22.3. This milestone is due in less than 2 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

codecov-commenter · 2025-04-30T08:10:47Z

Codecov Report

Attention: Patch coverage is 58.62069% with 36 lines in your changes missing coverage. Please review.

Project coverage is 38.32%. Comparing base (3551dd5) to head (079fa79).
Report is 201 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...android/ui/woopos/home/cart/WooPosCartViewModel.kt	10.52%	17 Missing ⚠️
...oopos/common/composeui/designsystem/WooPosTheme.kt	0.00%	8 Missing ⚠️
...erce/android/ui/woopos/home/WooPosHomeViewModel.kt	16.66%	5 Missing ⚠️
...roid/ui/woopos/home/cart/WooPosCartItemsUpdater.kt	80.00%	0 Missing and 3 partials ⚠️
...oid/ui/woopos/home/totals/WooPosTotalsViewModel.kt	86.36%	0 Missing and 3 partials ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #13987      +/-   ##
============================================
+ Coverage     38.30%   38.32%   +0.02%     
- Complexity     9495     9503       +8     
============================================
  Files          2116     2116              
  Lines        116422   116494      +72     
  Branches      14919    14922       +3     
============================================
+ Hits          44592    44644      +52     
- Misses        67747    67760      +13     
- Partials       4083     4090       +7

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

kidinov · 2025-04-30T11:08:38Z

...c/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeParentToChildCommunication.kt

@@ -65,6 +68,12 @@ sealed class ParentToChildrenEvent {
                val variationId: Long,
            ) : ProductInfo(id, name, price, quantity)
        }
+
+        data class CouponLine(


np: I think we should call it either CouponInfo or rename to ProductLine for consistance

kidinov · 2025-04-30T11:12:19Z

...mmerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartItemsUpdater.kt

+    private suspend fun updateCouponsWithFormattedDiscount(
+        updatedCoupons: List<ParentToChildrenEvent.OrderCreated.CouponLine>,
+        item: WooPosCartItemViewState.Coupon,
+    ) = updatedCoupons.find { it.code == item.name }?.let {


Is this ok, that apparently the same is called "code" in one place and "name" in another?

kidinov · 2025-04-30T11:14:46Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt

+                if (isDiscountCalculated) {
+                    Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                    WooPosText(
+                        text = requireNotNull(item.formattedDiscount) { "Can't be null" },


np: seems redundant message as it doesn't provide anything extra

text = requireNotNull(item.formattedDiscount),

kidinov · 2025-04-30T11:16:54Z

...merce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsViewModel.kt

@@ -420,7 +423,7 @@ class WooPosTotalsViewModel @Inject constructor(
                .fold(
                    onSuccess = { order -> handleCreatedOrder(order) },
                    onFailure = { error ->
-                        WooLog.e(T.POS, "Order creation failed - $error")
+                        WooLog.e(POS, "Order creation failed - $error")


np: if we inject wooLogWrapper, then maybe to use it here too

kidinov · 2025-04-30T11:17:51Z

...merce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsViewModel.kt

+                        code = it.code,
+                        discountAmount = BigDecimal(it.discount)
+                    )
+                } catch (e: NumberFormatException) {


np: e is unused

} catch (_: NumberFormatException) {

kidinov

Looks great! I left a couple of NPs, please take a look!

Some general feedback:

It's possible to checkout with just a coupon, with not products
When the discount is shown on the coupon, we move from 2 lines to 3

And this creates a small jaggering effect. Maybe to add a quite, subtle animation the this state change?

Also maybe consider adding animation on the color change from what it is to the green one
When we go from the checout, we kind a"unapply" the coupon, but the reduced price of the coupons stay there

malinajirka added 20 commits April 28, 2025 14:45

Pass couponLines in OrderCreated event

00300de

Test OrderCreated event is emitted from TotalsVM

c71682b

Pass couponLines from Home to Cart

498dc5f

Add test to verify OrderCreated event passed to cart

b09b7c6

Update coupon discount in cart when order created

76f997d

Display coupon discount in cart

dd82afa

Fix detekt issues

cafdb20

Rename field for better readability

15f10d2

Update success and onSuccess colors

85e0c49

Format discount in the cart

3677ad5

Change coupon discount to BigDecimal

0ea6323

Map couponLines and log errors

b908164

Add tests for couponLines mapping

9fe4dc9

Fix detekt issues

f2f2e28

Update coupons with success design

382b2d9

Change coupon in cart state in VM

ee0229e

Rename CartProductUpdater to CartItemsUpdater

fe63f75

Add tests for coupons handling in CartItemsUpdater

1e97f5d

Fix formatting

da0435a

Update discount formatting in totals screen to match designs

d8af27d

malinajirka added feature: point of sale POS project feature: POS labels Apr 29, 2025

malinajirka added this to the 22.3 milestone Apr 29, 2025

malinajirka requested review from kidinov and Copilot April 29, 2025 11:28

Copilot AI reviewed Apr 29, 2025

View reviewed changes

Fix failing test

079fa79

kidinov self-assigned this Apr 30, 2025

kidinov reviewed Apr 30, 2025

View reviewed changes

kidinov self-requested a review April 30, 2025 11:23

kidinov approved these changes Apr 30, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WOMOB-178][POS] Coupons Checkout Screen - Happy Path #13987

[WOMOB-178][POS] Coupons Checkout Screen - Happy Path #13987

malinajirka commented Apr 29, 2025 •

edited by kidinov

Loading

Copilot AI left a comment

wpmobilebot commented Apr 29, 2025 •

edited

Loading

wpmobilebot commented Apr 29, 2025 •

edited

Loading

dangermattic commented Apr 30, 2025

codecov-commenter commented Apr 30, 2025

kidinov Apr 30, 2025

kidinov Apr 30, 2025

kidinov Apr 30, 2025

kidinov Apr 30, 2025

kidinov Apr 30, 2025

kidinov left a comment

[WOMOB-178][POS] Coupons Checkout Screen - Happy Path #13987

Are you sure you want to change the base?

[WOMOB-178][POS] Coupons Checkout Screen - Happy Path #13987

Conversation

malinajirka commented Apr 29, 2025 • edited by kidinov Loading

Description

Testing information

No Coupon

Coupon Added

Multiple coupons added

The tests that have been performed

Images/gif

Reviewer (or Author, in the case of optional code reviews):

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

wpmobilebot commented Apr 29, 2025 • edited Loading

wpmobilebot commented Apr 29, 2025 • edited Loading

dangermattic commented Apr 30, 2025

codecov-commenter commented Apr 30, 2025

Codecov Report

kidinov Apr 30, 2025

Choose a reason for hiding this comment

kidinov Apr 30, 2025

Choose a reason for hiding this comment

kidinov Apr 30, 2025

Choose a reason for hiding this comment

kidinov Apr 30, 2025

Choose a reason for hiding this comment

kidinov Apr 30, 2025

Choose a reason for hiding this comment

kidinov left a comment

Choose a reason for hiding this comment

malinajirka commented Apr 29, 2025 •

edited by kidinov

Loading

wpmobilebot commented Apr 29, 2025 •

edited

Loading

wpmobilebot commented Apr 29, 2025 •

edited

Loading