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
Expand Up @@ -625,10 +625,10 @@ class WooPosOrdersViewModel @Inject constructor(

return OrderDetailsViewState.Computed.Details.TotalsBreakdown(
products = formatPrice(order.productsTotal),
discount = order.discountTotal.takeIf { it != BigDecimal.ZERO }?.let { "-${formatPrice(it)}" },
discount = order.discountTotal.takeIf { !it.isZero() }?.let { "-${formatPrice(it)}" },
discountCode = discountCode,
taxes = formatPrice(order.totalTax),
shipping = order.shippingTotal.takeIf { it != BigDecimal.ZERO }?.let { formatPrice(it) },
shipping = order.shippingTotal.takeIf { !it.isZero() }?.let { formatPrice(it) },
refunds = refundInfo.refundAmounts,
netPayment = netPayment
)
Expand All @@ -648,3 +648,5 @@ private fun Order.Status.localizedLabel(resourceProvider: ResourceProvider, loca
Order.Status.Refunded -> resourceProvider.getString(R.string.woopos_orders_status_refunded)
}
}

private fun BigDecimal.isZero() = this.compareTo(BigDecimal.ZERO) == 0
4 changes: 2 additions & 2 deletions WooCommerce/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3826,8 +3826,8 @@
<string name="woopos_orders_details_totals_title">Totals</string>
<string name="woopos_orders_details_qty_unit_price_format">%1$d x %2$s</string>
<string name="woopos_orders_details_breakdown_products_label">Products</string>
<string name="woopos_orders_details_breakdown_discount_label">Discount</string>
<string name="woopos_orders_details_breakdown_discount_with_code_label">Discount (%1$s)</string>
<string name="woopos_orders_details_breakdown_discount_label">Discount total</string>
<string name="woopos_orders_details_breakdown_discount_with_code_label">Discount total (%1$s)</string>
<string name="woopos_orders_details_breakdown_taxes_label">Taxes</string>
<string name="woopos_orders_details_breakdown_shipping_label">Shipping</string>
<string name="woopos_orders_details_total_label">Total</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -844,4 +844,57 @@ class WooPosOrdersViewModelTest {
// THEN
verify(ordersAnalyticsTracker).trackOrdersListSearchResultsFetched(any())
}

@Test
fun `given order with zero discount and zero shipping, when mapped, then discount and shipping are absent`() = runTest {
// GIVEN
val base = order(1)
val withZeros = base.copy(
discountTotal = BigDecimal("0.00"),
shippingTotal = BigDecimal("0.00")
)

// WHEN
whenever(dataSource.loadOrders()).thenReturn(
flow { emit(LoadOrdersResult.SuccessRemote(ordersMap(withZeros))) }
)

viewModel = createViewModel()
advanceUntilIdle()

// THEN
val content = viewModel.state.value as WooPosOrdersState.Content
val breakdown = content.selectedDetails.breakdown
assertThat(breakdown.discount).isNull()
assertThat(breakdown.shipping).isNull()
}

@Test
fun `given order with non-zero discount and shipping, when mapped, then discount and shipping are formatted`() = runTest {
// GIVEN
val base = order(2)
val withValues = base.copy(
discountTotal = BigDecimal("3.50"),
shippingTotal = BigDecimal("4.00")
)

// WHEN
runBlocking {
whenever(formatPrice.invoke(BigDecimal("3.50"))).thenReturn("$3.50")
whenever(formatPrice.invoke(BigDecimal("4.00"))).thenReturn("$4.00")
}

whenever(dataSource.loadOrders()).thenReturn(
flow { emit(LoadOrdersResult.SuccessRemote(ordersMap(withValues))) }
)

viewModel = createViewModel()
advanceUntilIdle()

// THEN
val content = viewModel.state.value as WooPosOrdersState.Content
val breakdown = content.selectedDetails.breakdown
assertThat(breakdown.discount).isEqualTo("-$3.50")
assertThat(breakdown.shipping).isEqualTo("$4.00")
}
}