Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package com.woocommerce.android.ui.woopos.orders

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
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.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import com.woocommerce.android.R
import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosDialogWrapper
import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosText
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

@Composable
fun WooPosIssueRefundDialog(
isVisible: Boolean,
orderId: Long,
onDismissRequest: () -> Unit
) {
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)
) {
Icon(
imageVector = Icons.Default.Close,
contentDescription = stringResource(R.string.close),
tint = MaterialTheme.colorScheme.onSurface
)
}

Spacer(Modifier.height(WooPosSpacing.Medium.value))

WooPosText(
text = stringResource(R.string.orderdetail_issue_refund_button),
style = WooPosTypography.Heading,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.onSurface
)

Spacer(Modifier.height(WooPosSpacing.Large.value))

WooPosText(
text = "Refund flow coming soon for order #$orderId",
style = WooPosTypography.BodyMedium,
color = WooPosTheme.colors.onSurfaceVariantHighest
)

Spacer(Modifier.height(WooPosSpacing.Large.value))
}
}
}

@WooPosPreview
@Composable
fun WooPosIssueRefundDialogPreview() {
WooPosTheme {
WooPosIssueRefundDialog(
isVisible = true,
orderId = 123L,
onDismissRequest = {}
)
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.woocommerce.android.ui.woopos.orders

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
Expand All @@ -10,14 +12,24 @@ import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Inventory2
import androidx.compose.material.icons.outlined.MoreVert
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
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.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
Expand All @@ -41,8 +53,8 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTyp
@Composable
fun WooPosOrderDetails(
modifier: Modifier = Modifier,
details: OrderDetailsViewState.Computed.Details,
onEmailReceiptButtonClicked: (Long) -> Unit
details: WooPosOrdersState.OrderDetailsViewState.Computed.Details,
onUIEvent: (WooPosOrdersUIEvent) -> Unit
) {
Column(
modifier = modifier
Expand All @@ -67,10 +79,31 @@ fun WooPosOrderDetails(

Spacer(Modifier.weight(1f))

WooPosButtonSmall(
text = stringResource(R.string.woopos_orders_email_receipt),
onClick = { onEmailReceiptButtonClicked(details.id) },
)
when {
details.actions.size > 1 -> {
val primaryAction = details.actions.first()
val overflowActions = details.actions.drop(1)

OrderActionButton(
action = primaryAction,
onClick = { onUIEvent(WooPosOrdersUIEvent.OrderActionClicked(it)) }
)

Spacer(Modifier.width(WooPosSpacing.Small.value))

OrderDetailsOverflowMenu(
actions = overflowActions,
onClick = { onUIEvent(WooPosOrdersUIEvent.OrderActionClicked(it)) }
)
}

details.actions.size == 1 -> {
OrderActionButton(
action = details.actions.first(),
onClick = { onUIEvent(WooPosOrdersUIEvent.OrderActionClicked(it)) }
)
}
}
}

Spacer(Modifier.height(WooPosSpacing.Small.value))
Expand All @@ -88,7 +121,7 @@ fun WooPosOrderDetails(
}

@Composable
private fun OrdersHeader(details: OrderDetailsViewState.Computed.Details) {
private fun OrdersHeader(details: WooPosOrdersState.OrderDetailsViewState.Computed.Details) {
Column(modifier = Modifier.fillMaxWidth()) {
WooPosText(
text = details.dateTime,
Expand All @@ -112,7 +145,7 @@ private fun OrdersHeader(details: OrderDetailsViewState.Computed.Details) {
}

@Composable
private fun OrdersProducts(lineItems: List<OrderDetailsViewState.Computed.Details.LineItemRow>) {
private fun OrdersProducts(lineItems: List<WooPosOrdersState.OrderDetailsViewState.Computed.Details.LineItemRow>) {
WooPosCard(shadowType = ShadowType.Soft) {
Column(Modifier.padding(WooPosSpacing.Medium.value)) {
WooPosText(
Expand All @@ -136,7 +169,7 @@ private fun OrdersProducts(lineItems: List<OrderDetailsViewState.Computed.Detail

@Composable
@Suppress("DestructuringDeclarationWithTooManyEntries")
private fun OrderProductItem(row: OrderDetailsViewState.Computed.Details.LineItemRow) {
private fun OrderProductItem(row: WooPosOrdersState.OrderDetailsViewState.Computed.Details.LineItemRow) {
ConstraintLayout(
modifier = Modifier
.fillMaxWidth()
Expand Down Expand Up @@ -188,7 +221,7 @@ private fun OrderProductItem(row: OrderDetailsViewState.Computed.Details.LineIte
}

@Composable
private fun OrdersTotals(details: OrderDetailsViewState.Computed.Details) {
private fun OrdersTotals(details: WooPosOrdersState.OrderDetailsViewState.Computed.Details) {
WooPosCard(shadowType = ShadowType.Soft) {
Column(Modifier.padding(WooPosSpacing.Medium.value)) {
WooPosText(
Expand Down Expand Up @@ -331,19 +364,99 @@ private fun DividerWithSpacing() {
Spacer(Modifier.height(WooPosSpacing.Medium.value))
}

@Composable
private fun OrderActionButton(
action: WooPosOrdersState.OrderAction,
onClick: (WooPosOrdersState.OrderAction) -> Unit
) {
when (action) {
is WooPosOrdersState.OrderAction.IssueRefund -> {
WooPosButtonSmall(
text = stringResource(R.string.orderdetail_issue_refund_button),
onClick = { onClick(action) }
)
}
is WooPosOrdersState.OrderAction.EmailReceipt -> {
WooPosButtonSmall(
text = stringResource(R.string.woopos_orders_email_receipt),
onClick = { onClick(action) }
)
}
}
}

@Composable
private fun OrderDetailsOverflowMenu(
actions: List<WooPosOrdersState.OrderAction>,
onClick: (WooPosOrdersState.OrderAction) -> Unit
) {
var showMenu by remember { mutableStateOf(false) }

Box {
IconButton(onClick = { showMenu = true }) {
Icon(
imageVector = Icons.Outlined.MoreVert,
contentDescription = stringResource(R.string.more_menu),
tint = MaterialTheme.colorScheme.onSurface
)
}

DropdownMenu(
modifier = Modifier.background(color = MaterialTheme.colorScheme.surfaceContainerLowest),
expanded = showMenu,
onDismissRequest = { showMenu = false }
) {
actions.forEach { action ->
DropdownMenuItem(
text = {
val text = when (action) {
is WooPosOrdersState.OrderAction.IssueRefund -> stringResource(
R.string.orderdetail_issue_refund_button
)
is WooPosOrdersState.OrderAction.EmailReceipt -> stringResource(
R.string.woopos_orders_email_receipt
)
}
WooPosText(
text = text,
style = WooPosTypography.BodyMedium
)
},
onClick = {
showMenu = false
onClick(action)
}
)
}
}
}
}

@WooPosPreview
@Composable
fun WooPosOrderDetailsPreview() {
val orderDetails = OrderDetailsViewState.Computed.Details(
val orderDetails = WooPosOrdersState.OrderDetailsViewState.Computed.Details(
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.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(
WooPosOrdersState.OrderDetailsViewState.Computed.Details.LineItemRow(
101,
"Cup",
"2 x $4.00",
"$8.00",
null
),
WooPosOrdersState.OrderDetailsViewState.Computed.Details.LineItemRow(
102,
"Coffee Container",
"1 x $10.00",
"$10.00",
null
),
WooPosOrdersState.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",
Expand All @@ -352,7 +465,7 @@ fun WooPosOrderDetailsPreview() {
null
)
),
breakdown = OrderDetailsViewState.Computed.Details.TotalsBreakdown(
breakdown = WooPosOrdersState.OrderDetailsViewState.Computed.Details.TotalsBreakdown(
products = "$23.00",
discount = "-$5.00",
discountCode = "SAVE5",
Expand All @@ -363,13 +476,17 @@ fun WooPosOrderDetailsPreview() {
),
total = "$18.00",
totalPaid = "$18.00",
paymentMethodTitle = "WooCommerce In-Person Payments"
paymentMethodTitle = "WooCommerce In-Person Payments",
actions = listOf(
WooPosOrdersState.OrderAction.IssueRefund(1L),
WooPosOrdersState.OrderAction.EmailReceipt(1L)
)
)

WooPosTheme {
WooPosOrderDetails(
details = orderDetails,
onEmailReceiptButtonClicked = {}
onUIEvent = {}
)
}
}
Loading