[Woo POS][Cash & Receipts] Order completion call. Navigation to the payment success #13086

kidinov · 2024-12-06T13:39:33Z

Closes: #13084

Description

Testing information

More -> POS -> New order
Choose pay with cash
Complete the order
Notice that success screen is shown
Go to the order list in the main app. Notice new, complete order. Check it detals

Try back navigation from the cash payment screen, too

The tests that have been performed

Above

Images/gif

12-09--11-06.mp4

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.

wpmobilebot · 2024-12-06T13:44:07Z

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

wpmobilebot · 2024-12-06T13:56:56Z

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

…all-from-the-mocked-cash-payment-screen' into 13084-woo-poscash-receipts-implement-order-completion-call-during-cash-payment-flow-with-navigation-to-the-payment-success # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeViewModel.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsViewModel.kt

…as done once

…all-from-the-mocked-cash-payment-screen' into 13084-woo-poscash-receipts-implement-order-completion-call-during-cash-payment-flow-with-navigation-to-the-payment-success

codecov-commenter · 2024-12-09T12:49:16Z

Codecov Report

Attention: Patch coverage is 41.59292% with 66 lines in your changes missing coverage. Please review.

Project coverage is 40.45%. Comparing base (a2b4711) to head (c4d2887).
Report is 54 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...i/woopos/cashpayment/WooPosCashPaymentViewModel.kt	0.00%	20 Missing ⚠️
...id/ui/woopos/cashpayment/WooPosCashPaymentState.kt	0.00%	14 Missing ⚠️
...rce/android/ui/woopos/home/WooPosHomeNavigation.kt	0.00%	9 Missing ⚠️
...erce/android/ui/woopos/home/WooPosHomeViewModel.kt	68.96%	8 Missing and 1 partial ⚠️
...oid/ui/woopos/home/totals/WooPosTotalsViewModel.kt	64.28%	2 Missing and 3 partials ⚠️
.../woopos/cashpayment/WooPosCashPaymentNavigation.kt	0.00%	3 Missing ⚠️
...os/root/navigation/WooPosNavigationEventHandler.kt	0.00%	3 Missing ⚠️
.../woopos/cashpayment/WooPosCashPaymentRepository.kt	94.73%	0 Missing and 1 partial ⚠️
...mmerce/android/ui/woopos/home/WooPosHomeUIEvent.kt	0.00%	1 Missing ⚠️
...ui/woopos/root/navigation/WooPosNavigationEvent.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##              trunk   #13086   +/-   ##
=========================================
  Coverage     40.44%   40.45%           
- Complexity     6187     6192    +5     
=========================================
  Files          1292     1292           
  Lines         74270    74326   +56     
  Branches      10159    10170   +11     
=========================================
+ Hits          30039    30069   +30     
- Misses        41623    41646   +23     
- Partials       2608     2611    +3

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

samiuelson · 2024-12-11T18:00:59Z

...src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentRepository.kt

+            site = selectedSite.get(),
+            newStatus = statusModel,
+            newPaymentMethodId = CASH_ON_DELIVERY_PAYMENT_TYPE,
+            codGateway?.title ?: "Pay in Person",


Suggested change

codGateway?.title ?: "Pay in Person",

newPaymentMethodTitle = codGateway?.title ?: "Pay in Person",

💡 np

samiuelson

Looks good, @kidinov. I left some non-blocking comments.

I also noticed that the Totals screen is visible for a while before Payment successful is shown. Can we avoid that? See video:

Screen_recording_20241211_190849.mp4

samiuelson · 2024-12-11T18:03:39Z

...rce/src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentScreen.kt

@@ -196,11 +199,15 @@ fun WooPosTotalsPaymentCashScreenScreen() {
                enteredAmount = "5$",
                changeDue = "5$",
                total = "10$",
-                canBeOrderBeCompleted = true,
+                button = WooPosCashPaymentState.Collecting.Button(
+                    text = "Complete order",


💡 To Res

samiuelson · 2024-12-11T18:06:33Z

.../src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentViewModel.kt

+
+    private fun handleOrderCompletion() {
+        viewModelScope.launch {
+            val stateBeforeCompleting = _state.value as? WooPosCashPaymentState.Collecting ?: return@launch


❓ Do we expect other states – shouldn't we crash? What will happen if we return here?

kidinov added 6 commits December 6, 2024 09:27

completeOrder to repository

7af85f4

Handle order completion

fcc008e

Simplification of the code that handles request

4ec0eed

Navigate back and show success screen

23d4975

Working navigation, animatio is broken

013a53e

Fixed formatting

defe37b

kidinov marked this pull request as draft December 6, 2024 13:39

kidinov added 10 commits December 9, 2024 08:34

Fixed wrong code merge

e17790c

Better naming for route to keep navigation clear

a06da29

Fixed arg setting

95b2023

Fixed back and forward animations

3c8fa06

Navigate to the success screen via forward navigation

4e0d796

Fixed a bug when it was navigating to success after success payment w…

f49d93f

…as done once

Merge branch '13063-woo-poscash-receipts-implement-order-complition-c…

8d4a1cb

…all-from-the-mocked-cash-payment-screen' into 13084-woo-poscash-receipts-implement-order-completion-call-during-cash-payment-flow-with-navigation-to-the-payment-success

Use const as order id key

b3de009

Repository unit test

a0c133a

kidinov requested a review from samiuelson December 9, 2024 11:34

kidinov added the feature: point of sale POS project label Dec 9, 2024

kidinov added this to the 21.3 milestone Dec 9, 2024

kidinov added the unit-tests-exemption label Dec 9, 2024

kidinov marked this pull request as ready for review December 9, 2024 12:16

kidinov added 2 commits December 9, 2024 12:27

Fixed unit test

1d482ff

Formatting

c4d2887

Base automatically changed from 13063-woo-poscash-receipts-implement-order-complition-call-from-the-mocked-cash-payment-screen to trunk December 11, 2024 09:23

kidinov linked an issue Dec 11, 2024 that may be closed by this pull request

[Woo POS][Cash & Receipts] Implement order completion call during cash payment flow with navigation to the payment success #13084

Open

samiuelson self-assigned this Dec 11, 2024

samiuelson reviewed Dec 11, 2024

View reviewed changes

samiuelson approved these changes Dec 11, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Woo POS][Cash & Receipts] Order completion call. Navigation to the payment success #13086

[Woo POS][Cash & Receipts] Order completion call. Navigation to the payment success #13086

kidinov commented Dec 6, 2024 •

edited

Loading

wpmobilebot commented Dec 6, 2024 •

edited

Loading

wpmobilebot commented Dec 6, 2024 •

edited

Loading

codecov-commenter commented Dec 9, 2024 •

edited

Loading

samiuelson Dec 11, 2024

samiuelson left a comment

samiuelson Dec 11, 2024

samiuelson Dec 11, 2024

	codGateway?.title ?: "Pay in Person",
	newPaymentMethodTitle = codGateway?.title ?: "Pay in Person",

[Woo POS][Cash & Receipts] Order completion call. Navigation to the payment success #13086

Are you sure you want to change the base?

[Woo POS][Cash & Receipts] Order completion call. Navigation to the payment success #13086

Conversation

kidinov commented Dec 6, 2024 • edited Loading

Description

Testing information

The tests that have been performed

Images/gif

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

wpmobilebot commented Dec 6, 2024 • edited Loading

wpmobilebot commented Dec 6, 2024 • edited Loading

codecov-commenter commented Dec 9, 2024 • edited Loading

Codecov Report

samiuelson Dec 11, 2024

Choose a reason for hiding this comment

samiuelson left a comment

Choose a reason for hiding this comment

samiuelson Dec 11, 2024

Choose a reason for hiding this comment

samiuelson Dec 11, 2024

Choose a reason for hiding this comment

kidinov commented Dec 6, 2024 •

edited

Loading

wpmobilebot commented Dec 6, 2024 •

edited

Loading

wpmobilebot commented Dec 6, 2024 •

edited

Loading

codecov-commenter commented Dec 9, 2024 •

edited

Loading