[Order creation] Update coupons display order details #12855

malinajirka · 2024-11-01T14:18:59Z

Closes: #12619 #12848
Ref: pe5pgL-5G4-p2#comment-4599

This PR updates the how coupons are displayed during Order creation to match the iOS behavior.

Changes:

Updated coupons behavior in the order creation to match the behavior of shipping lines.
Removed the ability to remove coupons from the totals bottom sheet.

Notes:

I planned to add unit tests for the added code. However, I haven't figured out how to test the code in the current state without significant refactoring. It felt like the unit tests would be tightly coupled with the inner workings of the VM, which felt off. In any case, if you have some ideas how to write reasonable tests or if you believe it's worth spending more time on, I will be happy to look into it more.

P.S. I also noticed shipping lines are editable at all times which is a bug I reported here.

Before	After

Testing

I tested the following flows on my phone and tablet.

Case: Add coupon to order success:

Create a new order, observe that the + Add Coupon row is disabled.
Add a product to the order, observe that the + Add Coupon row is now enabled.
Tap on + Add Coupon -> Apply a eligible coupon to that product -> Observe how it appears in the Order, with a "trash bin" button.
Expand the bottom drawer, observe how the coupon appears in the order details but is not editable from there.

Case: Delete coupon from order:

Tap on the trash icon and observe how the coupon is removed from the order.

Case: Add coupon to order error

Attempt to add a non-eligible coupon to the order (for example: a coupon that is only applicable to product category A, but the order has a product category B)
Observe how the coupon is not added to the order, and a error notice appears at the bottom

Case: Editing an existing order

Open an order that has coupons applied and is not paid
Tap on Edit
Observe the coupon rows are editable normally.

Case: Editing an existing PAID order

Open an order that has coupons applied and is paid
Tap on Edit
Observe the coupon rows are disabled.

I also tested adding and removing shipping lines in combination with coupons with gift card extension installed/uninstalled.

I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

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 all devices (phone/tablet) and no regressions are added.

wpmobilebot · 2024-11-01T14:25:15Z

📲 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	`eb1f773`
	Direct Download	`woocommerce-wear-prototype-build-pr12855-eb1f773.apk`

wpmobilebot · 2024-11-01T14:48:04Z

📲 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	`eb1f773`
	Direct Download	`woocommerce-prototype-build-pr12855-eb1f773.apk`

…ior-in-order-creation

malinajirka · 2024-11-04T17:04:24Z

...ce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt

@@ -738,6 +760,22 @@ class OrderCreateEditFormFragment :
        } else {
            additionalInfoCollectionSection.addShippingButtonGroup.show()
        }
+


This code would ideally live in the VM so it could be unit tested, however, refactoring it felt like out of scope and bringing inconsistency to the surrounding code feels worse than not having this tested. I'm open to suggestions though.

...merce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt

codecov-commenter · 2024-11-04T17:29:33Z

Codecov Report

Attention: Patch coverage is 17.43119% with 90 lines in your changes missing coverage. Please review.

Project coverage is 40.20%. Comparing base (995e65a) to head (eb1f773).
Report is 50 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...ui/orders/creation/coupon/CouponLineFormSection.kt	0.00%	81 Missing ⚠️
...rders/creation/shipping/ShippingLineFormSection.kt	0.00%	4 Missing ⚠️
...s/creation/totals/OrderCreateEditTotalsFullView.kt	0.00%	3 Missing ⚠️
...oid/ui/orders/creation/OrderCreateEditViewModel.kt	84.61%	0 Missing and 2 partials ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #12855      +/-   ##
============================================
- Coverage     40.24%   40.20%   -0.04%     
- Complexity     5784     5786       +2     
============================================
  Files          1247     1249       +2     
  Lines         71160    71247      +87     
  Branches       9933     9954      +21     
============================================
+ Hits          28638    28647       +9     
- Misses        39889    39966      +77     
- Partials       2633     2634       +1

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

dangermattic · 2024-11-06T12:15:10Z

	1 Warning
⚠️	This PR is assigned to the milestone 21.1. 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

…ior-in-order-creation

...merce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt

samiuelson

Great work, @malinajirka! I added small improvement ideas. The most important seems to be the one related to long coupon codes' appearance. Feel free to ignore others.

One more thing that caught my attention is the singular form of the "Coupon" label in the bottom sheet despite multiple coupons applied (isn't it slightly confusing?). Maybe worth considering reporting an issue:

...e/src/main/kotlin/com/woocommerce/android/ui/orders/creation/coupon/CouponLineFormSection.kt

samiuelson · 2024-11-07T10:01:50Z

...c/main/kotlin/com/woocommerce/android/ui/orders/creation/shipping/ShippingLineFormSection.kt

-    onAdd: () -> Unit,
-    onEdit: (id: Long) -> Unit,
+    onAddClicked: () -> Unit,
+    onEditClicked: (id: Long) -> Unit,


...merce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt

Co-authored-by: Samuel Urbanowicz <[email protected]>

malinajirka · 2024-11-07T10:59:09Z

Thanks so much for the thorough review @samiuelson ! I have implemented all the changes except of the performance optimization.

One more thing that caught my attention is the singular form of the "Coupon" label in the bottom sheet despite multiple coupons applied (isn't it slightly confusing?). Maybe worth considering reporting an issue:

I noticed this as well but then forgot about it :X. I updated it in 18e079d. We use plural for products no matter whether there is one or multiple, so the change brings it to consistency.

samiuelson

LGTM!

malinajirka added 7 commits November 1, 2024 12:25

Add compose implementation of coupons section

28fa782

Bind model to UI for the coupons section

da97057

Make changes to coupons list observable

37f601f

Disable coupons section when fetching order or in editing mode

9c6c2e9

Fix UI glitches when adding shipping and coupons

8b0c574

Remove coupon editing from totals bottom sheet

23d5577

Update release notes

fe9f6e9

malinajirka added type: enhancement A request for an enhancement. feature: order creation Related to the Order Creation feature labels Nov 1, 2024

malinajirka added this to the 21.1 milestone Nov 1, 2024

malinajirka mentioned this pull request Nov 1, 2024

[Coupons] Unify "Add coupon" button visibility in case order contains custom amount only #12848

Closed

Fix detekt

82ab70a

malinajirka added 2 commits November 4, 2024 17:54

Merge branch 'refs/heads/trunk' into issue/12619-adjust-coupons-behav…

96219e8

…ior-in-order-creation

Fix failing Unit Tests

f4f52ca

malinajirka commented Nov 4, 2024

View reviewed changes

...merce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt Show resolved Hide resolved

malinajirka commented Nov 4, 2024

View reviewed changes

...merce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt Show resolved Hide resolved

malinajirka requested a review from samiuelson November 5, 2024 10:11

malinajirka marked this pull request as ready for review November 5, 2024 10:11

malinajirka mentioned this pull request Nov 5, 2024

Shipping Lines in Order Creation are editable at all times #12869

Closed

1 task

malinajirka marked this pull request as draft November 6, 2024 08:48

Add unit tests for listed coupons lines

a5d5112

malinajirka marked this pull request as ready for review November 6, 2024 12:13

Merge branch 'refs/heads/trunk' into issue/12619-adjust-coupons-behav…

9ecd5d6

…ior-in-order-creation

samiuelson self-assigned this Nov 7, 2024

samiuelson reviewed Nov 7, 2024

View reviewed changes

...merce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt Outdated Show resolved Hide resolved

malinajirka added 2 commits November 7, 2024 09:46

Rename methods names for better clarity

43b863b

Rename methods names for better clarity

fa50c34

malinajirka enabled auto-merge November 7, 2024 08:53

malinajirka disabled auto-merge November 7, 2024 08:54

malinajirka requested a review from samiuelson November 7, 2024 08:54

samiuelson reviewed Nov 7, 2024

View reviewed changes

malinajirka and others added 6 commits November 7, 2024 11:23

Fix appearance of long coupons codes

99c5ac1

Co-authored-by: Samuel Urbanowicz <[email protected]>

Display both dark and light mode previews for coupons section

85d244e

Co-authored-by: Samuel Urbanowicz <[email protected]>

Add content description for remove coupon btn

fce8dda

Update preview

825b465

Update coupons line to plural

18e079d

Remove unused imports

eb1f773

malinajirka requested a review from samiuelson November 7, 2024 10:59

samiuelson approved these changes Nov 7, 2024

View reviewed changes

samiuelson merged commit fc0c7e6 into trunk Nov 7, 2024
15 checks passed

samiuelson deleted the issue/12619-adjust-coupons-behavior-in-order-creation branch November 7, 2024 11:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Order creation] Update coupons display order details #12855

[Order creation] Update coupons display order details #12855

malinajirka commented Nov 1, 2024 •

edited

Loading

wpmobilebot commented Nov 1, 2024 •

edited

Loading

wpmobilebot commented Nov 1, 2024 •

edited

Loading

malinajirka Nov 4, 2024 •

edited

Loading

codecov-commenter commented Nov 4, 2024 •

edited

Loading

dangermattic commented Nov 6, 2024

samiuelson left a comment

samiuelson Nov 7, 2024

malinajirka commented Nov 7, 2024

samiuelson left a comment

[Order creation] Update coupons display order details #12855

[Order creation] Update coupons display order details #12855

Conversation

malinajirka commented Nov 1, 2024 • edited Loading

Changes:

Notes:

Testing

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

wpmobilebot commented Nov 1, 2024 • edited Loading

wpmobilebot commented Nov 1, 2024 • edited Loading

malinajirka Nov 4, 2024 • edited Loading

Choose a reason for hiding this comment

codecov-commenter commented Nov 4, 2024 • edited Loading

Codecov Report

dangermattic commented Nov 6, 2024

samiuelson left a comment

Choose a reason for hiding this comment

samiuelson Nov 7, 2024

Choose a reason for hiding this comment

malinajirka commented Nov 7, 2024

samiuelson left a comment

Choose a reason for hiding this comment

malinajirka commented Nov 1, 2024 •

edited

Loading

wpmobilebot commented Nov 1, 2024 •

edited

Loading

wpmobilebot commented Nov 1, 2024 •

edited

Loading

malinajirka Nov 4, 2024 •

edited

Loading

codecov-commenter commented Nov 4, 2024 •

edited

Loading