Skip to content

ECOM-7571 Add missing fields to item taxes and item itself about handling breakdown and its taxation #551

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

Merged
OlegShtchLS merged 2 commits into from
Mar 31, 2026
Merged

ECOM-7571 Add missing fields to item taxes and item itself about handling breakdown and its taxation #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9381a8c
ECOM-7571 Add taxOnHandlingFee field to items taxes info
OlegShtchLS Mar 16, 2026
9fb8199
ECOM-7571 Add handlingFee field to items info
OlegShtchLS Mar 17, 2026
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
2 changes: 2 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ fun FetchedOrder.OrderItem.toUpdated(): UpdatedOrder.OrderItem {
price = price,
productPrice = productPrice,
shipping = shipping,
handlingFee = handlingFee,
tax = tax,
fixedShippingRate = fixedShippingRate,
couponAmount = couponAmount,
Expand Down Expand Up @@ -209,6 +210,7 @@ fun FetchedOrder.OrderItemTax.toUpdated(): UpdatedOrder.OrderItemTax {
total = total,
taxOnDiscountedSubtotal = taxOnDiscountedSubtotal,
taxOnShipping = taxOnShipping,
taxOnHandlingFee = taxOnHandlingFee,
includeInPrice = includeInPrice,
taxType = taxType,
)
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ data class OrderForCalculate(
val isCustomerSetPrice: Boolean? = null,
val selectedPrice: SelectedPrice? = null,
val shipping: Double? = null,
val handlingFee: Double? = null,
val tax: Double? = null,
val fixedShippingRate: Double? = null,
val couponAmount: Double? = null,
Expand Down Expand Up @@ -202,7 +203,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 taxOnHandlingFee: Double? = null,
) : BaseOrderTax

data class OrderItemProductFile(
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ data class CalculateOrderDetailsResult(
val priceWithoutTax: Double? = null,
val productPrice: Double? = null,
val shipping: Double? = null,
val handlingFee: Double? = null,
val tax: Double? = null,
val fixedShippingRate: Double? = null,
val couponAmount: Double? = null,
Expand Down Expand Up @@ -189,7 +190,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 taxOnHandlingFee: Double? = null,
) : BaseOrderTax

data class OrderItemProductFile(
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/FetchedCart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ data class FetchedCart(
val price: Double? = null,
val productPrice: Double? = null,
val shipping: Double? = null,
val handlingFee: Double? = null,
val tax: Double? = null,
val fixedShippingRate: Double? = null,
val couponAmount: Double? = null,
Expand Down Expand Up @@ -182,7 +183,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 taxOnHandlingFee: Double? = null,
) : BaseOrderTax

data class OrderItemProductFile(
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ data class UpdatedOrder(
val isCustomerSetPrice: Boolean? = null,
val selectedPrice: SelectedPrice? = null,
val shipping: Double? = null,
val handlingFee: Double? = null,
val tax: Double? = null,
val taxable: Boolean? = null,
val fixedShippingRate: Double? = null,
Expand Down Expand Up @@ -276,6 +277,7 @@ data class UpdatedOrder(
override val total: Double? = null,
val taxOnDiscountedSubtotal: Double? = null,
val taxOnShipping: Double? = null,
val taxOnHandlingFee: Double? = null,
val includeInPrice: Boolean? = null,
val taxType: OrderItemTaxType? = null,
) : BaseOrderTax
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ data class FetchedOrder(
val selectedPrice: SelectedPrice? = null,
val priceWithoutTax: Double? = null,
val shipping: Double? = null,
val handlingFee: Double? = null,
val tax: Double? = null,
val fixedShippingRate: Double? = null,
val couponAmount: Double? = null,
Expand Down Expand Up @@ -264,6 +265,7 @@ data class FetchedOrder(
override val total: Double? = null,
val taxOnDiscountedSubtotal: Double? = null,
val taxOnShipping: Double? = null,
val taxOnHandlingFee: Double? = null,
override val includeInPrice: Boolean? = null,
val sourceTaxRateId: Int? = null,
val sourceTaxRateType: RateType? = null,
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/subscriptions/result/FetchedSubscription.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ data class FetchedSubscription(
val price: Double? = null,
val productPrice: Double? = null,
val shipping: Double? = null,
val handlingFee: Double? = null,
val tax: Double? = null,
val fixedShippingRate: Double? = null,

Expand Down Expand Up @@ -154,6 +155,7 @@ data class FetchedSubscription(
val total: Double? = null,
val taxOnDiscountedSubtotal: Double? = null,
val taxOnShipping: Double? = null,
val taxOnHandlingFee: Double? = null,
val includeInPrice: Boolean? = null
)

Expand Down
5 changes: 5 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.ecwid.apiclient.v3.dto.order.request.UpdatedOrder
import com.ecwid.apiclient.v3.util.*
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNotNull
import org.junit.jupiter.api.Assertions.assertNull
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
Expand Down Expand Up @@ -86,6 +87,7 @@ class CartsTest : BaseEntityTest() {
assertEquals(orderItem.price, cartItem.price)
assertEquals(orderItem.productPrice, cartItem.productPrice)
assertEquals(orderItem.shipping, cartItem.shipping)
assertEquals(orderItem.handlingFee, cartItem.handlingFee)
assertEquals(orderItem.tax, cartItem.tax)
assertEquals(orderItem.fixedShippingRate, cartItem.fixedShippingRate)
assertEquals(orderItem.couponAmount, cartItem.couponAmount)
Expand Down Expand Up @@ -125,6 +127,7 @@ class CartsTest : BaseEntityTest() {
assertEquals(orderTaxes.total, cartTaxes.total)
assertEquals(orderTaxes.taxOnDiscountedSubtotal, cartTaxes.taxOnDiscountedSubtotal)
assertEquals(orderTaxes.taxOnShipping, cartTaxes.taxOnShipping)
assertEquals(orderTaxes.taxOnHandlingFee, cartTaxes.taxOnHandlingFee)
assertEquals(orderTaxes.includeInPrice, cartTaxes.includeInPrice)
assertEquals(orderTaxes.taxType, cartTaxes.taxType)
}
Expand Down Expand Up @@ -295,6 +298,7 @@ class CartsTest : BaseEntityTest() {
assertEquals(forCalculateItem.price, calculatedItem.price)
assertEquals(forCalculateItem.productPrice, calculatedItem.productPrice)
assertEquals(0.0, calculatedItem.shipping)
assertNull(calculatedItem.handlingFee)
assertEquals(forCalculateItem.fixedShippingRate, calculatedItem.fixedShippingRate)
assertEquals(
null,
Expand Down Expand Up @@ -479,6 +483,7 @@ class CartsTest : BaseEntityTest() {
price = 22.2,
productPrice = 33.3,
shipping = 44.4,
handlingFee = 77.7,
tax = 55.5,
fixedShippingRate = 66.6,
couponAmount = 15.0,
Expand Down
2 changes: 2 additions & 0 deletions ...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::selectedOptions),
AllowNullable(CalculateOrderDetailsResult.OrderItem::combinationId),
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::shipping),
AllowNullable(CalculateOrderDetailsResult.OrderItem::handlingFee),
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::shortDescription),
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::sku),
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::tax),
Expand Down Expand Up @@ -96,6 +97,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::name),
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnDiscountedSubtotal),
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnShipping),
AllowNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnHandlingFee),
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::total),
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::value),
IgnoreNullable(CalculateOrderDetailsResult.PersonInfo::city),
Expand Down
2 changes: 2 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCartRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
IgnoreNullable(FetchedCart.OrderItem::selectedOptions),
AllowNullable(FetchedCart.OrderItem::combinationId),
IgnoreNullable(FetchedCart.OrderItem::shipping),
AllowNullable(FetchedCart.OrderItem::handlingFee),
IgnoreNullable(FetchedCart.OrderItem::shortDescription),
IgnoreNullable(FetchedCart.OrderItem::sku),
IgnoreNullable(FetchedCart.OrderItem::tax),
Expand Down Expand Up @@ -144,6 +145,7 @@ val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
IgnoreNullable(FetchedCart.OrderItemTax::name),
IgnoreNullable(FetchedCart.OrderItemTax::taxOnDiscountedSubtotal),
IgnoreNullable(FetchedCart.OrderItemTax::taxOnShipping),
AllowNullable(FetchedCart.OrderItemTax::taxOnHandlingFee),
IgnoreNullable(FetchedCart.OrderItemTax::total),
IgnoreNullable(FetchedCart.OrderItemTax::value),
IgnoreNullable(FetchedCart.PersonInfo::city),
Expand Down
2 changes: 2 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
AllowNullable(FetchedOrder.OrderItem::combinationId),
AllowNullable(FetchedOrder.OrderItem::selectedPrice),
IgnoreNullable(FetchedOrder.OrderItem::shipping),
AllowNullable(FetchedOrder.OrderItem::handlingFee),
IgnoreNullable(FetchedOrder.OrderItem::shortDescription),
AllowNullable(FetchedOrder.OrderItem::shortDescriptionTranslated),
IgnoreNullable(FetchedOrder.OrderItem::sku),
Expand Down Expand Up @@ -133,6 +134,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
IgnoreNullable(FetchedOrder.OrderItemTax::name),
IgnoreNullable(FetchedOrder.OrderItemTax::taxOnDiscountedSubtotal),
IgnoreNullable(FetchedOrder.OrderItemTax::taxOnShipping),
AllowNullable(FetchedOrder.OrderItemTax::taxOnHandlingFee),
IgnoreNullable(FetchedOrder.OrderItemTax::total),
IgnoreNullable(FetchedOrder.OrderItemTax::value),
IgnoreNullable(FetchedOrder.OrderItemTax::sourceTaxRateId),
Expand Down
2 changes: 2 additions & 0 deletions ...test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedSubscriptionRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ val fetchedSubscriptionsNullablePropertyRules: List<NullablePropertyRule<*, *>>
AllowNullable(FetchedSubscription.OrderItem::price),
AllowNullable(FetchedSubscription.OrderItem::productPrice),
AllowNullable(FetchedSubscription.OrderItem::shipping),
AllowNullable(FetchedSubscription.OrderItem::handlingFee),
AllowNullable(FetchedSubscription.OrderItem::tax),
AllowNullable(FetchedSubscription.OrderItem::fixedShippingRate),
AllowNullable(FetchedSubscription.OrderItem::sku),
Expand Down Expand Up @@ -90,6 +91,7 @@ val fetchedSubscriptionsNullablePropertyRules: List<NullablePropertyRule<*, *>>
AllowNullable(FetchedSubscription.Taxes::total),
AllowNullable(FetchedSubscription.Taxes::taxOnDiscountedSubtotal),
AllowNullable(FetchedSubscription.Taxes::taxOnShipping),
AllowNullable(FetchedSubscription.Taxes::taxOnHandlingFee),
AllowNullable(FetchedSubscription.Taxes::includeInPrice),

AllowNullable(FetchedSubscription.Dimensions::length),
Expand Down
2 changes: 2 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
IgnoreNullable(OrderForCalculate.OrderItem::selectedOptions),
AllowNullable(OrderForCalculate.OrderItem::combinationId),
IgnoreNullable(OrderForCalculate.OrderItem::shipping),
AllowNullable(OrderForCalculate.OrderItem::handlingFee),
IgnoreNullable(OrderForCalculate.OrderItem::shortDescription),
IgnoreNullable(OrderForCalculate.OrderItem::sku),
IgnoreNullable(OrderForCalculate.OrderItem::tax),
Expand Down Expand Up @@ -127,6 +128,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
IgnoreNullable(OrderForCalculate.OrderItemTax::name),
IgnoreNullable(OrderForCalculate.OrderItemTax::taxOnDiscountedSubtotal),
IgnoreNullable(OrderForCalculate.OrderItemTax::taxOnShipping),
AllowNullable(OrderForCalculate.OrderItemTax::taxOnHandlingFee),
IgnoreNullable(OrderForCalculate.OrderItemTax::total),
IgnoreNullable(OrderForCalculate.OrderItemTax::value),
AllowNullable(OrderForCalculate.PaymentOption::paymentId),
Expand Down
2 changes: 2 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ private fun generateTestOrderItem() = UpdatedOrder.OrderItem(
price = randomPrice(),
productPrice = randomPrice(),
shipping = randomPrice(),
handlingFee = randomPrice(),
tax = randomPrice(),
fixedShippingRate = randomPrice(),
couponAmount = randomPrice(),
Expand Down Expand Up @@ -327,6 +328,7 @@ private fun generateTestOrderItemTax(): UpdatedOrder.OrderItemTax {
total = randomPrice(),
taxOnDiscountedSubtotal = randomPrice(),
taxOnShipping = randomPrice(),
taxOnHandlingFee = randomPrice(),
includeInPrice = randomBoolean()
)
}
Expand Down
Loading