ECOM-7571 Add taxOnHandling field to items taxes info

OlegShtchLS · OlegShtchLS · commit 049caf41e558 · 2026-03-18T13:52:21.000+04:00
`taxOnHandling` includes only tax on handling breakdown for item, while `taxOnShipping` includes tax on shipping plus handling.
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt
@@ -209,6 +209,7 @@ fun FetchedOrder.OrderItemTax.toUpdated(): UpdatedOrder.OrderItemTax {
 		total = total,
 		taxOnDiscountedSubtotal = taxOnDiscountedSubtotal,
 		taxOnShipping = taxOnShipping,
+		taxOnHandling = taxOnHandling,
 		includeInPrice = includeInPrice,
 		taxType = taxType,
 	)
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt
@@ -202,7 +202,8 @@ data class OrderForCalculate(
 		val includeInPrice: Boolean? = null,
 		val taxType: OrderItemTaxType? = null,
 		val taxOnDiscountedSubtotal: Double? = null,
-		val taxOnShipping: Double? = null
+		val taxOnShipping: Double? = null,
+		val taxOnHandling: Double? = null,
 	) : BaseOrderTax
 
 	data class OrderItemProductFile(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt
@@ -189,7 +189,8 @@ data class CalculateOrderDetailsResult(
 		val includeInPrice: Boolean? = null,
 		val taxType: OrderItemTaxType? = null,
 		val taxOnDiscountedSubtotal: Double? = null,
-		val taxOnShipping: Double? = null
+		val taxOnShipping: Double? = null,
+		val taxOnHandling: Double? = null,
 	) : BaseOrderTax
 
 	data class OrderItemProductFile(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/FetchedCart.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/FetchedCart.kt
@@ -182,7 +182,8 @@ data class FetchedCart(
 		val taxType: OrderItemTaxType? = null,
 		val includeInPrice: Boolean? = null,
 		val taxOnDiscountedSubtotal: Double? = null,
-		val taxOnShipping: Double? = null
+		val taxOnShipping: Double? = null,
+		val taxOnHandling: Double? = null,
 	) : BaseOrderTax
 
 	data class OrderItemProductFile(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt
@@ -276,6 +276,7 @@ data class UpdatedOrder(
 		override val total: Double? = null,
 		val taxOnDiscountedSubtotal: Double? = null,
 		val taxOnShipping: Double? = null,
+		val taxOnHandling: Double? = null,
 		val includeInPrice: Boolean? = null,
 		val taxType: OrderItemTaxType? = null,
 	) : BaseOrderTax
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt
@@ -264,6 +264,7 @@ data class FetchedOrder(
 		override val total: Double? = null,
 		val taxOnDiscountedSubtotal: Double? = null,
 		val taxOnShipping: Double? = null,
+		val taxOnHandling: Double? = null,
 		override val includeInPrice: Boolean? = null,
 		val sourceTaxRateId: Int? = null,
 		val sourceTaxRateType: RateType? = null,
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/subscriptions/result/FetchedSubscription.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/subscriptions/result/FetchedSubscription.kt
@@ -154,6 +154,7 @@ data class FetchedSubscription(
 		val total: Double? = null,
 		val taxOnDiscountedSubtotal: Double? = null,
 		val taxOnShipping: Double? = null,
+		val taxOnHandling: Double? = null,
 		val includeInPrice: Boolean? = null
 	)
 
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt b/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt
@@ -125,6 +125,7 @@ class CartsTest : BaseEntityTest() {
 				assertEquals(orderTaxes.total, cartTaxes.total)
 				assertEquals(orderTaxes.taxOnDiscountedSubtotal, cartTaxes.taxOnDiscountedSubtotal)
 				assertEquals(orderTaxes.taxOnShipping, cartTaxes.taxOnShipping)
+				assertEquals(orderTaxes.taxOnHandling, cartTaxes.taxOnHandling)
 				assertEquals(orderTaxes.includeInPrice, cartTaxes.includeInPrice)
 				assertEquals(orderTaxes.taxType, cartTaxes.taxType)
 			}
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt
@@ -96,6 +96,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::name),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnDiscountedSubtotal),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnShipping),
+	AllowNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnHandling),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::total),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::value),
 	IgnoreNullable(CalculateOrderDetailsResult.PersonInfo::city),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCartRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCartRules.kt
@@ -144,6 +144,7 @@ val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	IgnoreNullable(FetchedCart.OrderItemTax::name),
 	IgnoreNullable(FetchedCart.OrderItemTax::taxOnDiscountedSubtotal),
 	IgnoreNullable(FetchedCart.OrderItemTax::taxOnShipping),
+	AllowNullable(FetchedCart.OrderItemTax::taxOnHandling),
 	IgnoreNullable(FetchedCart.OrderItemTax::total),
 	IgnoreNullable(FetchedCart.OrderItemTax::value),
 	IgnoreNullable(FetchedCart.PersonInfo::city),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt
@@ -133,6 +133,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	IgnoreNullable(FetchedOrder.OrderItemTax::name),
 	IgnoreNullable(FetchedOrder.OrderItemTax::taxOnDiscountedSubtotal),
 	IgnoreNullable(FetchedOrder.OrderItemTax::taxOnShipping),
+	AllowNullable(FetchedOrder.OrderItemTax::taxOnHandling),
 	IgnoreNullable(FetchedOrder.OrderItemTax::total),
 	IgnoreNullable(FetchedOrder.OrderItemTax::value),
 	IgnoreNullable(FetchedOrder.OrderItemTax::sourceTaxRateId),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedSubscriptionRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedSubscriptionRules.kt
@@ -90,6 +90,7 @@ val fetchedSubscriptionsNullablePropertyRules: List<NullablePropertyRule<*, *>>
 	AllowNullable(FetchedSubscription.Taxes::total),
 	AllowNullable(FetchedSubscription.Taxes::taxOnDiscountedSubtotal),
 	AllowNullable(FetchedSubscription.Taxes::taxOnShipping),
+	AllowNullable(FetchedSubscription.Taxes::taxOnHandling),
 	AllowNullable(FetchedSubscription.Taxes::includeInPrice),
 
 	AllowNullable(FetchedSubscription.Dimensions::length),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt
@@ -127,6 +127,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
 	IgnoreNullable(OrderForCalculate.OrderItemTax::name),
 	IgnoreNullable(OrderForCalculate.OrderItemTax::taxOnDiscountedSubtotal),
 	IgnoreNullable(OrderForCalculate.OrderItemTax::taxOnShipping),
+	AllowNullable(OrderForCalculate.OrderItemTax::taxOnHandling),
 	IgnoreNullable(OrderForCalculate.OrderItemTax::total),
 	IgnoreNullable(OrderForCalculate.OrderItemTax::value),
 	AllowNullable(OrderForCalculate.PaymentOption::paymentId),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt b/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt
@@ -327,6 +327,7 @@ private fun generateTestOrderItemTax(): UpdatedOrder.OrderItemTax {
 		total = randomPrice(),
 		taxOnDiscountedSubtotal = randomPrice(),
 		taxOnShipping = randomPrice(),
+		taxOnHandling = randomPrice(),
 		includeInPrice = randomBoolean()
 	)
 }

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,7 @@ fun FetchedOrder.OrderItemTax.toUpdated(): UpdatedOrder.OrderItemTax {`
`209`	`209`	`total = total,`
`210`	`210`	`taxOnDiscountedSubtotal = taxOnDiscountedSubtotal,`
`211`	`211`	`taxOnShipping = taxOnShipping,`
	`212`	`+ taxOnHandling = taxOnHandling,`
`212`	`213`	`includeInPrice = includeInPrice,`
`213`	`214`	`taxType = taxType,`
`214`	`215`	`)`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ data class FetchedSubscription(`
`154`	`154`	`val total: Double? = null,`
`155`	`155`	`val taxOnDiscountedSubtotal: Double? = null,`
`156`	`156`	`val taxOnShipping: Double? = null,`
	`157`	`+ val taxOnHandling: Double? = null,`
`157`	`158`	`val includeInPrice: Boolean? = null`
`158`	`159`	`)`
`159`	`160`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ class CartsTest : BaseEntityTest() {`
`125`	`125`	`assertEquals(orderTaxes.total, cartTaxes.total)`
`126`	`126`	`assertEquals(orderTaxes.taxOnDiscountedSubtotal, cartTaxes.taxOnDiscountedSubtotal)`
`127`	`127`	`assertEquals(orderTaxes.taxOnShipping, cartTaxes.taxOnShipping)`
	`128`	`+ assertEquals(orderTaxes.taxOnHandling, cartTaxes.taxOnHandling)`
`128`	`129`	`assertEquals(orderTaxes.includeInPrice, cartTaxes.includeInPrice)`
`129`	`130`	`assertEquals(orderTaxes.taxType, cartTaxes.taxType)`
`130`	`131`	`}`