diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 8d95d49a89e..7d96a9817e2 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -3,7 +3,7 @@
17.5
-----
- [*] [Internal] As side effect of adding tablet support, toolbar on the product list screen is not collapsible anymore [https://github.com/woocommerce/woocommerce-android/pull/10844]
-
+- [*] [Internal] Added the "Shipping Tax" display in the order creation form to enhance tax detail visibility, ensuring comprehensive financial tracking. [https://github.com/woocommerce/woocommerce-android/pull/10794]
17.4
-----
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Order.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Order.kt
index 5d290283dc6..ac9929c7b50 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Order.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Order.kt
@@ -50,7 +50,8 @@ data class Order(
val paymentUrl: String,
val isEditable: Boolean,
val selectedGiftCard: String?,
- val giftCardDiscountedAmount: BigDecimal?
+ val giftCardDiscountedAmount: BigDecimal?,
+ val shippingTax: BigDecimal,
) : Parcelable {
@IgnoredOnParcel
val isOrderPaid = datePaid != null
@@ -386,7 +387,8 @@ data class Order(
paymentUrl = "",
isEditable = true,
selectedGiftCard = "",
- giftCardDiscountedAmount = null
+ giftCardDiscountedAmount = null,
+ shippingTax = BigDecimal(0)
)
}
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/OrderMapper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/OrderMapper.kt
index d40eaa4088b..19e7fab520f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/OrderMapper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/OrderMapper.kt
@@ -64,7 +64,8 @@ class OrderMapper @Inject constructor(
isEditable = databaseEntity.isEditable,
selectedGiftCard = databaseEntity.giftCardCode,
giftCardDiscountedAmount = databaseEntity.giftCardAmount
- .toBigDecimalOrNull() ?: BigDecimal.ZERO
+ .toBigDecimalOrNull() ?: BigDecimal.ZERO,
+ shippingTax = databaseEntity.shippingTax.toBigDecimalOrNull() ?: BigDecimal.ZERO,
)
}
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsHelper.kt
index 2ff838e07f1..acc45277b82 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsHelper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/totals/OrderCreateEditTotalsHelper.kt
@@ -179,6 +179,15 @@ class OrderCreateEditTotalsHelper @Inject constructor(
label = "${it.label} ยท ${it.ratePercent}%",
value = bigDecimalFormatter(BigDecimal(it.taxTotal))
)
+ } + if (shippingTax > BigDecimal.ZERO) {
+ listOf(
+ TotalsSectionsState.Line.SimpleSmall(
+ label = resourceProvider.getString(R.string.order_creation_payment_shipping_tax_label),
+ value = bigDecimalFormatter(shippingTax)
+ )
+ )
+ } else {
+ emptyList()
} + TotalsSectionsState.Line.LearnMore(
text = taxBasedOnSettingLabel,
buttonText = resourceProvider.getString(R.string.learn_more),
diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
index 02f3f39e188..5e178bd9bc7 100644
--- a/WooCommerce/src/main/res/values/strings.xml
+++ b/WooCommerce/src/main/res/values/strings.xml
@@ -643,6 +643,7 @@
The code should be in XXXX-XXXX-XXXX-XXXX format
Collect Payment
Expand collapse order totals
+ Shipping Tax