[Woo POS] Update Totals View UI with Subtotals from Cart Total #11738

backwardstruck · 2024-06-16T12:32:56Z

Description

Enhances the Totals UI. It adjusts the UI to better match design requirements and ensures consistent formatting of prices.

PR is based on #11720 which should be merged first.

Steps to reproduce

Go to the POS screen in settings.
Add items to the cart.
Tab button to checkout.
Observe the displayed totals, including the subtotal and tax.

Testing information

Devices Used: Test on multiple devices to ensure UI consistency.
Critical Flows: Check the flow from adding products to cart, creating an order draft, and finally displaying totals.

Images/gif

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.

wpmobilebot · 2024-06-16T12:58:38Z

📲 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
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`97b3bb5`
	Direct Download	`woocommerce-prototype-build-pr11738-97b3bb5.apk`

…tals-view-ui-with-subtotals-from-cart-total

…-ui-with-subtotals-from-cart-total' into 11727-woo-pos-update-totals-view-ui-with-subtotals-from-cart-total

codecov-commenter · 2024-06-17T21:32:16Z

Codecov Report

Attention: Patch coverage is 0% with 10 lines in your changes missing coverage. Please review.

Project coverage is 40.26%. Comparing base (a84b138) to head (1e76ca3).

❗ Current head 1e76ca3 differs from pull request most recent head 97b3bb5

Please upload reports for the commit 97b3bb5 to get more accurate results.

Files	Patch %	Lines
...oid/ui/woopos/home/totals/WooPosTotalsViewModel.kt	0.00%	7 Missing ⚠️
...android/ui/woopos/home/totals/WooPosTotalsState.kt	0.00%	3 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #11738      +/-   ##
============================================
+ Coverage     40.21%   40.26%   +0.04%     
- Complexity     5331     5333       +2     
============================================
  Files          1132     1133       +1     
  Lines         65331    65178     -153     
  Branches       9058     9007      -51     
============================================
- Hits          26273    26243      -30     
+ Misses        36637    36534     -103     
+ Partials       2421     2401      -20

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

samiuelson

LGTM. I've just aded a few questions and ideas.

samiuelson · 2024-06-18T11:45:26Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt

+                        enabled = totalsState.value.isCollectPaymentButtonEnabled,
+                        modifier = Modifier.align(Alignment.CenterHorizontally)
+                    ) {
+                        Text("Collect Card Payment")


❓ Does it make sense to extract strings from this composable or are these temporary and will be replaced in the next iterations?

They are temporary. Thanks for reminding me. I've just made a ticket to go through and replace them:
#11746

samiuelson · 2024-06-18T11:46:43Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsState.kt

-    var orderTax: java.math.BigDecimal,
+    var orderSubtotalText: String,
+    var orderTaxText: String,
+    var orderTotalText: String,
 ) : Parcelable


💡 It would be nice to add also a loading state (to display shimmer loading indicator) in the next iterations.

Yes, updated in the other PR now:
f9434ef

…btotals-from-cart-total # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsState.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsViewModel.kt

dangermattic · 2024-06-20T13:32:13Z

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

Is order calculated

3c2e3ee

backwardstruck added 10 commits June 17, 2024 10:34

Actually we don't need this yet

80bb4f0

Arrange the items into rows

af587f4

Center everything

9897215

Center everything correctly

b31d234

Remove comments

85557dd

Show a border

3f4499f

Detekt

1a50c7d

Fix text issues

e00f77d

Fix spacing

e4b512a

Fix spacing

4884a43

backwardstruck added this to the 19.2 milestone Jun 17, 2024

backwardstruck added type: task An internally driven task. feature: point of sale POS project labels Jun 17, 2024

backwardstruck added 2 commits June 17, 2024 16:29

Show currency symbol

de5e181

Merge branch '11694-woo-pos-totals-view' into 11727-woo-pos-update-to…

b9f9259

…tals-view-ui-with-subtotals-from-cart-total

backwardstruck marked this pull request as ready for review June 17, 2024 20:45

backwardstruck added 2 commits June 17, 2024 16:54

Detekt

b8b6d08

Merge remote-tracking branch 'origin/11727-woo-pos-update-totals-view…

1e76ca3

…-ui-with-subtotals-from-cart-total' into 11727-woo-pos-update-totals-view-ui-with-subtotals-from-cart-total

backwardstruck requested review from samiuelson and kidinov June 17, 2024 21:19

samiuelson self-assigned this Jun 18, 2024

samiuelson approved these changes Jun 18, 2024

View reviewed changes

backwardstruck mentioned this pull request Jun 18, 2024

[Woo POS] Clean up UI and Strings for Amounts and Payment Processes #11746

Closed

Base automatically changed from 11694-woo-pos-totals-view to trunk June 19, 2024 12:54

kidinov added 2 commits June 20, 2024 15:26

Fixed wrong conflict resolution

97b3bb5

kidinov enabled auto-merge June 20, 2024 14:02

kidinov merged commit db895f8 into trunk Jun 20, 2024
14 checks passed

kidinov deleted the 11727-woo-pos-update-totals-view-ui-with-subtotals-from-cart-total branch June 20, 2024 14:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Woo POS] Update Totals View UI with Subtotals from Cart Total #11738

[Woo POS] Update Totals View UI with Subtotals from Cart Total #11738

Uh oh!

backwardstruck commented Jun 16, 2024 •

edited

Loading

Uh oh!

wpmobilebot commented Jun 16, 2024 •

edited

Loading

Uh oh!

codecov-commenter commented Jun 17, 2024 •

edited

Loading

Uh oh!

samiuelson left a comment

Uh oh!

samiuelson Jun 18, 2024

Uh oh!

backwardstruck Jun 18, 2024

Uh oh!

samiuelson Jun 18, 2024

Uh oh!

backwardstruck Jun 18, 2024

Uh oh!

dangermattic commented Jun 20, 2024

Uh oh!

Uh oh!

Uh oh!

[Woo POS] Update Totals View UI with Subtotals from Cart Total #11738

[Woo POS] Update Totals View UI with Subtotals from Cart Total #11738

Uh oh!

Conversation

backwardstruck commented Jun 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Steps to reproduce

Testing information

Images/gif

Uh oh!

wpmobilebot commented Jun 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Jun 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

samiuelson left a comment

Choose a reason for hiding this comment

Uh oh!

samiuelson Jun 18, 2024

Choose a reason for hiding this comment

Uh oh!

backwardstruck Jun 18, 2024

Choose a reason for hiding this comment

Uh oh!

samiuelson Jun 18, 2024

Choose a reason for hiding this comment

Uh oh!

backwardstruck Jun 18, 2024

Choose a reason for hiding this comment

Uh oh!

dangermattic commented Jun 20, 2024

Uh oh!

Uh oh!

Uh oh!

backwardstruck commented Jun 16, 2024 •

edited

Loading

wpmobilebot commented Jun 16, 2024 •

edited

Loading

codecov-commenter commented Jun 17, 2024 •

edited

Loading