[WOOMOB-2397][POS Refunds M2] Part 1: Refunded items data layer by samiuelson · Pull Request #15488 · woocommerce/woocommerce-android

samiuelson · 2026-03-05T17:52:43Z

Description

Adds data layer support for refunded line items in POS order details. This is the first of two PRs for WOOMOB-2397.

Changes:

Introduce LineItemsState sealed interface (Loading/Loaded) for line items in order details state
Add refundedLineItems field to order details
Extract WooPosGetNonRefundedItems use-case for filtering out fully refunded items
Extract WooPosGroupRefundedItems use-case for aggregating refund data per order item
Wire new use-cases into WooPosOrderDetailsMapper and WooPosOrdersViewModel

Functional change: refunded products are now now shown inside Products section in POS Order Details. They are going to be shown in a dedicated Refunded Products section instead.

Testing instructions

Open POS and complete an order
Navigate to order details - products should display correctly
Issue a partial refund, return to order details
Verify the data loads without issues (UI for refunded items section will come in PR 2)

💡 To test the feature E2E, check out the final PR: #15489

Images/Gif

N/A (data layer only, no visual changes)

Introduce LineItemsState sealed interface to support loading/loaded states for line items. Add WooPosGetNonRefundedItems and WooPosGroupRefundedItems use-cases, wire them into WooPosOrderDetailsMapper and WooPosOrdersViewModel. Includes minimal UI adaptation for the new LineItemsState type.

dangermattic · 2026-03-05T17:53:28Z

	1 Warning
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2026-03-05T18:26:25Z

📲 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
	Build Number	`731`
	Version	`24.2.1`
	Application ID	`com.woocommerce.android.prealpha`
	Commit	`a73c3fa`
	Installation URL	275d4g7d3plfg

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

Copilot

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt

...src/main/kotlin/com/woocommerce/android/ui/woopos/orders/details/WooPosOrderDetailsMapper.kt

...src/main/kotlin/com/woocommerce/android/ui/woopos/orders/details/WooPosGroupRefundedItems.kt

...src/main/kotlin/com/woocommerce/android/ui/woopos/orders/details/WooPosOrderDetailsMapper.kt

...rc/main/kotlin/com/woocommerce/android/ui/woopos/orders/details/WooPosGetNonRefundedItems.kt

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

When mapOrderDetailsWithoutActions sets lineItems to Loading for orders with refunds, sideLoadBookings early-returns. After sideLoadActions replaces lineItems with Loaded, booking side-loading was never retried.

The copy() was inheriting price from items.first() which doesn't match the aggregated total/quantity. Now recomputes price = total / quantity.

Aligns with buildRefundedLineItems which already passes order.currency to formatPrice for consistency.

…ed items Zero-quantity items with no refunds are now preserved instead of being filtered out. Also uses BigDecimal math (multiply then divide) instead of Float division for proration to avoid precision loss.

codecov-commenter · 2026-03-06T15:49:55Z

Codecov Report

❌ Patch coverage is 56.00000% with 66 lines in your changes missing coverage. Please review.
✅ Project coverage is 39.55%. Comparing base (e370be1) to head (a73c3fa).
⚠️ Report is 423 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...oid/ui/woopos/orders/details/WooPosOrderDetails.kt	0.00%	38 Missing ⚠️
.../android/ui/woopos/orders/WooPosOrdersViewModel.kt	25.00%	9 Missing and 6 partials ⚠️
.../woopos/orders/details/WooPosOrderDetailsMapper.kt	80.76%	2 Missing and 8 partials ⚠️
.../woopos/orders/details/WooPosGroupRefundedItems.kt	87.50%	1 Missing and 1 partial ⚠️
...woopos/orders/details/WooPosGetNonRefundedItems.kt	95.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #15488      +/-   ##
============================================
+ Coverage     39.52%   39.55%   +0.03%     
- Complexity    11203    11220      +17     
============================================
  Files          2250     2252       +2     
  Lines        129313   129413     +100     
  Branches      18091    18115      +24     
============================================
+ Hits          51115    51195      +80     
- Misses        72987    72992       +5     
- Partials       5211     5226      +15

☔ 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.

malinajirka

LGTM, thanks!

malinajirka · 2026-03-09T08:06:17Z

...rc/main/kotlin/com/woocommerce/android/ui/woopos/orders/details/WooPosGetNonRefundedItems.kt

+            .fold(0) { acc, item -> acc + item.quantity }
+
+        return order.items.mapNotNull { item ->
+            val refundedQty = abs(refundedByItemId[item.itemId] ?: 0).toFloat()


❓ If quantity can be negative, shouldn't we invoke abs inside the fold on line 19 instead?

Fixed in a73c3fa, thanks.

samiuelson added 2 commits March 5, 2026 18:17

Fix import ordering in WooPosOrdersViewModelTest

a3729bb

samiuelson mentioned this pull request Mar 5, 2026

[WOOMOB-2397][POS Refunds M2] Part 2: Refunded items UI #15489

Merged

samiuelson changed the title ~~Add refunded items data layer for POS order details~~ [WOOMOB-2397][POS Refunds M2] Part 1: Refunded items data layer Mar 5, 2026

samiuelson added 2 commits March 5, 2026 18:59

Rename aggregated to groupedItems in buildRefundedLineItems

f615bfe

Rename val

0260b31

samiuelson requested a review from Copilot March 5, 2026 18:02

This comment was marked as off-topic.

Sign in to view

Hide Products section when line items list is empty

fb9b72d

samiuelson requested a review from Copilot March 6, 2026 14:11

samiuelson added this to the 24.4 milestone Mar 6, 2026

samiuelson added Android feature: point of sale POS project labels Mar 6, 2026

Merge branch 'trunk' into woomob-2397-data-layer

b97c17b

Copilot started reviewing on behalf of samiuelson March 6, 2026 14:11 View session

samiuelson requested review from Copilot and removed request for Copilot March 6, 2026 14:14

Copilot started reviewing on behalf of samiuelson March 6, 2026 14:14 View session

Copilot AI reviewed Mar 6, 2026

View reviewed changes

samiuelson and others added 6 commits March 6, 2026 15:17

Improve null orderItem.name handling

a3efc30

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Trigger booking side-loading after sideLoadActions completes

26b1449

When mapOrderDetailsWithoutActions sets lineItems to Loading for orders with refunds, sideLoadBookings early-returns. After sideLoadActions replaces lineItems with Loaded, booking side-loading was never retried.

Recompute price when grouping refunded items

eeb2d84

The copy() was inheriting price from items.first() which doesn't match the aggregated total/quantity. Now recomputes price = total / quantity.

Use order currency when formatting unit price in buildLineItems

4d3b967

Aligns with buildRefundedLineItems which already passes order.currency to formatPrice for consistency.

Handle zero-quantity items and fix BigDecimal precision in non-refund…

4e12c9c

…ed items Zero-quantity items with no refunds are now preserved instead of being filtered out. Also uses BigDecimal math (multiply then divide) instead of Float division for proration to avoid precision loss.

Add test for refund item name fallback in order details mapper

4c23507

samiuelson requested a review from malinajirka March 6, 2026 15:16

malinajirka self-assigned this Mar 9, 2026

malinajirka approved these changes Mar 9, 2026

View reviewed changes

Fix refund quantity calculation to handle absolute values correctly

a73c3fa

samiuelson merged commit 969ebd6 into trunk Mar 9, 2026
16 checks passed

samiuelson deleted the woomob-2397-data-layer branch March 9, 2026 15:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WOOMOB-2397][POS Refunds M2] Part 1: Refunded items data layer#15488

[WOOMOB-2397][POS Refunds M2] Part 1: Refunded items data layer#15488
samiuelson merged 13 commits intotrunkfrom
woomob-2397-data-layer

samiuelson commented Mar 5, 2026 •

edited

Loading

Uh oh!

dangermattic commented Mar 5, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 5, 2026 •

edited

Loading

Uh oh!

This comment was marked as off-topic.

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Mar 6, 2026 •

edited

Loading

Uh oh!

malinajirka left a comment

Uh oh!

malinajirka Mar 9, 2026

Uh oh!

samiuelson Mar 9, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

samiuelson commented Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing instructions

Images/Gif

Uh oh!

dangermattic commented Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as off-topic.

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

malinajirka left a comment

Choose a reason for hiding this comment

Uh oh!

malinajirka Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

samiuelson Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

samiuelson commented Mar 5, 2026 •

edited

Loading

dangermattic commented Mar 5, 2026 •

edited

Loading

wpmobilebot commented Mar 5, 2026 •

edited

Loading

codecov-commenter commented Mar 6, 2026 •

edited

Loading