Skip to content

[Woo POS][Refunds] Issue Refund Dialog - refundable items #15039

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.

Sign up for GitHub

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

Draft
wants to merge 9 commits into
base: woomob-1801-add-the-issue-refund-button
Choose a base branch
from
+693 −46
Draft

[Woo POS][Refunds] Issue Refund Dialog - refundable items #15039

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b57e445
Implement 'Select items to refund' dialog UI in WooPos
samiuelson Nov 27, 2025
3a3c8d0
Add padding for status and navigation bars to WooPosDialogWrapper
samiuelson Nov 27, 2025
d77e355
Remove quantity and unit price display from WooPos order line items
samiuelson Nov 28, 2025
a781df1
Improv Refund Dialog layout
samiuelson Nov 28, 2025
1f33024
Add test for correctly formatting the items selected label in the iss…
samiuelson Nov 28, 2025
9b646f5
Revert "Remove quantity and unit price display from WooPos order line…
samiuelson Nov 28, 2025
1292472
Add getOrderById to WooPosOrdersDataSource
samiuelson Nov 28, 2025
2c12875
Refactor refund dialog to use dedicated ViewModel and fetch logic
samiuelson Nov 28, 2025
f10e759
Display quantity in refund dialog item row
samiuelson Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...otlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosDialogWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
Expand All @@ -27,7 +29,12 @@ fun WooPosDialogWrapper(
onDismissRequest: () -> Unit,
content: @Composable AnimatedVisibilityScope.() -> Unit
) {
Box(contentAlignment = Alignment.Center) {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.statusBarsPadding()
.navigationBarsPadding()
) {
WooPosBackgroundOverlay(
modifier = Modifier
.semantics {
Expand Down
259 changes: 229 additions & 30 deletions ...merce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosIssueRefundDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,287 @@
package com.woocommerce.android.ui.woopos.orders

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.outlined.Inventory2
import androidx.compose.material3.Checkbox
import androidx.compose.material3.CheckboxDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
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.WooPosDialogWrapper
import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosItemImage
import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosText
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosCornerRadius
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography

private val COLUMN_WIDTH = 104.dp

@Composable
fun WooPosIssueRefundDialog(
isVisible: Boolean,
orderId: Long,
onDismissRequest: () -> Unit
lineItems: List<OrderDetailsViewState.Computed.Details.LineItemRow>,
itemsSelectedLabel: String,
onDismissRequest: () -> Unit,
onContinue: () -> Unit
) {
val selectAllContentDescription = stringResource(R.string.order_refunds_items_select_all)

WooPosDialogWrapper(
isVisible = isVisible,
dialogBackgroundContentDescription = stringResource(
R.string.woopos_orders_issue_refund_content_description
),
onDismissRequest = onDismissRequest
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(WooPosSpacing.Large.value),
horizontalAlignment = Alignment.CenterHorizontally
) {
IconButton(
onClick = onDismissRequest,
modifier = Modifier.align(Alignment.End)
Column(modifier = Modifier.fillMaxSize()) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(WooPosSpacing.XLarge.value),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Icon(
imageVector = Icons.Default.Close,
contentDescription = stringResource(R.string.close),
tint = MaterialTheme.colorScheme.onSurface
WooPosText(
text = stringResource(R.string.woopos_orders_select_items_to_refund),
style = WooPosTypography.Heading,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.onSurface
)
IconButton(
modifier = Modifier.size(48.dp),
onClick = onDismissRequest,
) {
Icon(
modifier = Modifier.size(32.dp),
imageVector = Icons.Default.Close,
contentDescription = stringResource(R.string.close),
tint = MaterialTheme.colorScheme.onSurface
)
}
}

Spacer(Modifier.height(WooPosSpacing.Medium.value))
Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = WooPosSpacing.XLarge.value)
.padding(bottom = WooPosSpacing.Medium.value),
verticalAlignment = Alignment.CenterVertically
) {
Row(
modifier = Modifier.weight(1f),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(WooPosSpacing.Large.value)
) {
Checkbox(
checked = true,
onCheckedChange = null,
modifier = Modifier
.size(32.dp)
.semantics {
contentDescription = selectAllContentDescription
},
colors = CheckboxDefaults.colors(
checkedColor = MaterialTheme.colorScheme.primary,
checkmarkColor = MaterialTheme.colorScheme.onPrimary
)
)
WooPosText(
text = itemsSelectedLabel,
style = WooPosTypography.Caption,
fontWeight = FontWeight.Bold,
color = WooPosTheme.colors.onSurfaceVariantHighest
)
}
WooPosText(
modifier = Modifier.width(COLUMN_WIDTH),
text = stringResource(R.string.woopos_orders_amount),
style = WooPosTypography.Caption,
fontWeight = FontWeight.Bold,
color = WooPosTheme.colors.onSurfaceVariantHighest,
textAlign = TextAlign.End,
overflow = TextOverflow.Ellipsis
)
Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
WooPosText(
modifier = Modifier.width(COLUMN_WIDTH),
text = stringResource(R.string.woopos_orders_tax),
style = WooPosTypography.Caption,
fontWeight = FontWeight.Bold,
color = WooPosTheme.colors.onSurfaceVariantHighest,
textAlign = TextAlign.End,
overflow = TextOverflow.Ellipsis
)
}

WooPosText(
text = stringResource(R.string.orderdetail_issue_refund_button),
style = WooPosTypography.Heading,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.onSurface
HorizontalDivider(
modifier = Modifier.padding(horizontal = WooPosSpacing.XLarge.value),
color = WooPosTheme.colors.outlineVariant,
thickness = 0.25.dp
)

Spacer(Modifier.height(WooPosSpacing.Large.value))
LazyColumn(
modifier = Modifier
.weight(1f)
.fillMaxWidth()
.padding(horizontal = WooPosSpacing.XLarge.value)
.padding(vertical = WooPosSpacing.Medium.value),
verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Medium.value)
) {
itemsIndexed(lineItems) { index, item ->
LineItemRow(item = item)
if (index < lineItems.lastIndex) {
HorizontalDivider(
color = WooPosTheme.colors.outlineVariant,
thickness = 0.25.dp
)
}
}
}

WooPosText(
text = "Refund flow coming soon for order #$orderId",
style = WooPosTypography.BodyMedium,
color = WooPosTheme.colors.onSurfaceVariantHighest
HorizontalDivider(
modifier = Modifier.padding(horizontal = WooPosSpacing.XLarge.value),
color = WooPosTheme.colors.outlineVariant,
thickness = 0.25.dp
)

Spacer(Modifier.height(WooPosSpacing.Large.value))
WooPosButton(
text = stringResource(R.string.continue_button),
onClick = onContinue,
modifier = Modifier
.fillMaxWidth()
.padding(WooPosSpacing.XLarge.value)
)
}
}
}

@Composable
private fun LineItemRow(
item: OrderDetailsViewState.Computed.Details.LineItemRow
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = WooPosSpacing.XSmall.value),
verticalAlignment = Alignment.CenterVertically,
) {
Checkbox(
checked = true,
onCheckedChange = null,
modifier = Modifier
.size(32.dp)
.semantics {
contentDescription = item.name
},
colors = CheckboxDefaults.colors(
checkedColor = MaterialTheme.colorScheme.primary,
checkmarkColor = MaterialTheme.colorScheme.onPrimary
)
)
Spacer(modifier = Modifier.size(WooPosSpacing.Large.value))

WooPosItemImage(
modifier = Modifier
.size(56.dp)
.clip(RoundedCornerShape(WooPosCornerRadius.Small.value)),
imageUrl = item.imageUrl,
placeholderIcon = Icons.Outlined.Inventory2,
placeholderIconSize = 24.dp
)
Spacer(modifier = Modifier.size(WooPosSpacing.Medium.value))

WooPosText(
text = item.name,
style = WooPosTypography.BodyLarge,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.onSurface,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f)
)

WooPosText(
text = item.lineTotal,
style = WooPosTypography.BodyMedium,
color = MaterialTheme.colorScheme.onSurface,
textAlign = TextAlign.End,
modifier = Modifier.width(COLUMN_WIDTH),
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
Spacer(modifier = Modifier.size(WooPosSpacing.Medium.value))
WooPosText(
text = "-",
style = WooPosTypography.BodyMedium,
color = MaterialTheme.colorScheme.onSurface,
textAlign = TextAlign.End,
modifier = Modifier.width(COLUMN_WIDTH),
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
}
}

@WooPosPreview
@Composable
fun WooPosIssueRefundDialogPreview() {
val sampleLineItems = listOf(
OrderDetailsViewState.Computed.Details.LineItemRow(
id = 1,
name = "Cup",
lineTotal = "$999999.00",
imageUrl = null
),
OrderDetailsViewState.Computed.Details.LineItemRow(
id = 2,
name = "Coffee Storage Container",
lineTotal = "$30.00",
imageUrl = null
),
OrderDetailsViewState.Computed.Details.LineItemRow(
id = 3,
name = "Enamel Mug",
lineTotal = "$8.50",
imageUrl = null
)
)

WooPosTheme {
WooPosIssueRefundDialog(
isVisible = true,
orderId = 123L,
onDismissRequest = {}
lineItems = sampleLineItems,
itemsSelectedLabel = "ITEMS (${sampleLineItems.size} SELECTED)",
onDismissRequest = {},
onContinue = {}
)
}
}
20 changes: 3 additions & 17 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,13 @@ private fun OrdersProducts(lineItems: List<OrderDetailsViewState.Computed.Detail
}

@Composable
@Suppress("DestructuringDeclarationWithTooManyEntries")
private fun OrderProductItem(row: OrderDetailsViewState.Computed.Details.LineItemRow) {
ConstraintLayout(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = WooPosSpacing.Small.value)
) {
val (image, nameText, qtyText, totalText) = createRefs()
val (image, nameText, totalText) = createRefs()

OrderLineItemImage(
imageUrl = row.imageUrl,
Expand All @@ -202,18 +201,6 @@ private fun OrderProductItem(row: OrderDetailsViewState.Computed.Details.LineIte
}
)

WooPosText(
text = row.qtyAndUnitPrice,
style = WooPosTypography.BodyMedium,
color = WooPosTheme.colors.onSurfaceVariantHighest,
modifier = Modifier.constrainAs(qtyText) {
top.linkTo(nameText.bottom, margin = WooPosSpacing.XSmall.value)
start.linkTo(nameText.start)
end.linkTo(totalText.start, margin = WooPosSpacing.Small.value)
width = Dimension.fillToConstraints
}
)

WooPosText(
text = row.lineTotal,
style = WooPosTypography.BodyMedium,
Expand Down Expand Up @@ -448,13 +435,12 @@ fun WooPosOrderDetailsPreview() {
customerEmail = "[email protected]",
status = PosOrderStatus(text = "Completed", colorKey = OrderStatusColorKey.COMPLETED),
lineItems = listOf(
OrderDetailsViewState.Computed.Details.LineItemRow(101, "Cup", "2 x $4.00", "$8.00", null),
OrderDetailsViewState.Computed.Details.LineItemRow(102, "Coffee Container", "1 x $10.00", "$10.00", null),
OrderDetailsViewState.Computed.Details.LineItemRow(101, "Cup", "$8.00", null),
OrderDetailsViewState.Computed.Details.LineItemRow(102, "Coffee Container", "$10.00", null),
OrderDetailsViewState.Computed.Details.LineItemRow(
103,
"A vey tasty coffee that incidentally has a very long name " +
"and should go over a few lines without overlapping anything",
"1 x $5.00",
"$5.00",
null
)
Expand Down
Loading