-
Notifications
You must be signed in to change notification settings - Fork 133
[Woo POS][Historical Orders] Add refund data to model and screen #14779
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
kidinov
merged 7 commits into
trunk
from
woomob-1533-woo-poshistorical-orders-add-refund-data-to-model-and-screen
Oct 21, 2025
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9176078
Refactor WooPosOrdersViewModel to use WooPosFormatPrice for currency …
kidinov 02605bc
Refactor WooPosOrdersViewModelTest to use WooPosFormatPrice for curre…
kidinov bac1215
Add refund data to WooPosOrders model and screen
kidinov 024f87e
Add refund data and net payment to WooPosOrdersScreen
kidinov 3d846dd
Add tests for refund data handling in WooPosOrdersViewModel
kidinov 80eb57c
Rename OrderDetails to WooPosOrderDetails and update layout for refun…
kidinov 8b8420a
Add unit tests for WooPosGetOrderRefundsByOrderId functionality
kidinov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
21 changes: 21 additions & 0 deletions
21
...in/kotlin/com/woocommerce/android/ui/woopos/common/data/WooPosGetOrderRefundsByOrderId.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package com.woocommerce.android.ui.woopos.common.data | ||
|
|
||
| import com.woocommerce.android.model.Refund | ||
| import com.woocommerce.android.model.toAppModel | ||
| import com.woocommerce.android.tools.SelectedSite | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import org.wordpress.android.fluxc.store.WCRefundStore | ||
| import javax.inject.Inject | ||
|
|
||
| class WooPosGetOrderRefundsByOrderId @Inject constructor( | ||
| private val refundStore: WCRefundStore, | ||
| private val selectedSite: SelectedSite | ||
| ) { | ||
| suspend operator fun invoke(orderId: Long): List<Refund> { | ||
| return withContext(Dispatchers.IO) { | ||
| refundStore.getAllRefunds(selectedSite.get(), orderId) | ||
| .map { it.toAppModel() } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,7 @@ import androidx.compose.ui.unit.dp | |
| import coil.compose.AsyncImage | ||
| import coil.request.ImageRequest | ||
| import com.woocommerce.android.R | ||
| import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview | ||
| import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosButton | ||
| import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosCard | ||
| import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosText | ||
|
|
@@ -42,7 +43,7 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosThe | |
| import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography | ||
|
|
||
| @Composable | ||
| fun OrderDetails( | ||
| fun WooPosOrderDetails( | ||
| modifier: Modifier = Modifier, | ||
| details: OrderDetailsViewState, | ||
| onEmailReceiptButtonClicked: (Long) -> Unit = {} | ||
|
|
@@ -227,28 +228,73 @@ fun OrderDetails( | |
| fontWeight = FontWeight.Bold | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Column { | ||
| Row(Modifier.fillMaxWidth()) { | ||
| WooPosText( | ||
| text = stringResource(R.string.woopos_orders_details_total_paid_label), | ||
| style = WooPosTypography.BodySmall, | ||
| modifier = Modifier.weight(1f) | ||
| ) | ||
| WooPosText( | ||
| text = details.totalPaid, | ||
| style = WooPosTypography.BodySmall | ||
| ) | ||
| } | ||
| details.paymentMethodTitle?.let { | ||
| Spacer(Modifier.height(WooPosSpacing.XSmall.value)) | ||
| WooPosText( | ||
| text = it, | ||
| style = WooPosTypography.BodySmall, | ||
| color = WooPosTheme.colors.onSurfaceVariantHighest | ||
| ) | ||
| Row( | ||
| Modifier | ||
| .fillMaxWidth() | ||
| ) { | ||
| WooPosText( | ||
| text = stringResource(R.string.woopos_orders_details_total_paid_label), | ||
| style = WooPosTypography.BodySmall, | ||
| modifier = Modifier.weight(1f) | ||
| ) | ||
| WooPosText( | ||
| text = details.totalPaid, | ||
| style = WooPosTypography.BodySmall | ||
| ) | ||
| } | ||
| details.paymentMethodTitle?.let { | ||
| Spacer(Modifier.height(WooPosSpacing.XSmall.value)) | ||
| WooPosText( | ||
| text = it, | ||
| style = WooPosTypography.BodySmall, | ||
| color = WooPosTheme.colors.onSurfaceVariantHighest, | ||
| ) | ||
| } | ||
|
|
||
| if (details.breakdown.refunds.isNotEmpty()) { | ||
| Spacer(Modifier.height(WooPosSpacing.Small.value)) | ||
| details.breakdown.refunds.forEachIndexed { index, refundAmount -> | ||
| Row( | ||
| Modifier | ||
| .fillMaxWidth() | ||
| ) { | ||
| WooPosText( | ||
| text = stringResource(R.string.woopos_orders_details_refunded_label), | ||
| style = WooPosTypography.BodySmall, | ||
| modifier = Modifier.weight(1f) | ||
| ) | ||
| WooPosText( | ||
| text = refundAmount, | ||
| style = WooPosTypography.BodySmall | ||
| ) | ||
| } | ||
| if (index < details.breakdown.refunds.size - 1) { | ||
| Spacer(Modifier.height(WooPosSpacing.XSmall.value)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| details.breakdown.netPayment?.let { netPayment -> | ||
| Spacer(Modifier.height(WooPosSpacing.Small.value)) | ||
| Row( | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .padding(bottom = WooPosSpacing.Medium.value) | ||
| ) { | ||
| WooPosText( | ||
| text = stringResource(R.string.woopos_orders_details_net_payment_label), | ||
| style = WooPosTypography.BodySmall, | ||
| fontWeight = FontWeight.Bold, | ||
| modifier = Modifier.weight(1f) | ||
| ) | ||
| WooPosText( | ||
| text = netPayment, | ||
| style = WooPosTypography.BodySmall, | ||
| fontWeight = FontWeight.Bold | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -281,3 +327,39 @@ private fun OrderLineItemImage(imageUrl: String?) { | |
| ) | ||
| } | ||
| } | ||
|
|
||
| @WooPosPreview | ||
| @Composable | ||
| fun WooPosOrderDetailsPreview() { | ||
| val orderDetails = OrderDetailsViewState( | ||
| id = 1L, | ||
| number = "#014", | ||
| dateTime = "Aug 28, 2025 at 10:31 AM", | ||
| customerEmail = "[email protected]", | ||
| status = PosOrderStatus(text = "Completed", colorKey = OrderStatusColorKey.COMPLETED), | ||
| lineItems = listOf( | ||
| OrderDetailsViewState.LineItemRow(101, "Cup", "1 x $8.50", "$15.00", null), | ||
| OrderDetailsViewState.LineItemRow(102, "Coffee Container", "1 x $10.00", "$8.00", null), | ||
| OrderDetailsViewState.LineItemRow(103, "Paper Filter", "1 x $4.50", "$8.00", null) | ||
| ), | ||
| breakdown = OrderDetailsViewState.TotalsBreakdown( | ||
| products = "$23.00", | ||
| discount = "-$5.00", | ||
| discountCode = "8qew4mnq", | ||
| taxes = "$0.00", | ||
| shipping = null, | ||
| refunds = listOf("-$3.00", "-$2.00"), | ||
| netPayment = "$12.00" | ||
| ), | ||
| total = "$17.00", | ||
| totalPaid = "$17.00", | ||
| paymentMethodTitle = "WooCommerce In-Person Payments" | ||
| ) | ||
|
|
||
| WooPosTheme { | ||
| WooPosOrderDetails( | ||
| details = orderDetails, | ||
| onEmailReceiptButtonClicked = {} | ||
| ) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please consider to add tests to this one if necessary
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
8b8420a