diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt index 92ca179d..12706c99 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt @@ -213,6 +213,7 @@ fun FetchedOrder.OrderItemTax.toUpdated(): UpdatedOrder.OrderItemTax { taxOnHandlingFee = taxOnHandlingFee, includeInPrice = includeInPrice, taxType = taxType, + sourceTaxRateType = sourceTaxRateType, ) } 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 index 6b933bc1..2c76245c 100644 --- 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 @@ -192,6 +192,7 @@ data class CalculateOrderDetailsResult( val taxOnDiscountedSubtotal: Double? = null, val taxOnShipping: Double? = null, val taxOnHandlingFee: Double? = null, + val sourceTaxRateType: TaxRateType? = null, ) : BaseOrderTax data class OrderItemProductFile( diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/enums/TaxRateType.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/enums/TaxRateType.kt new file mode 100644 index 00000000..e63fd98a --- /dev/null +++ b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/enums/TaxRateType.kt @@ -0,0 +1,8 @@ +package com.ecwid.apiclient.v3.dto.order.enums + +enum class TaxRateType { + AUTO, + MANUAL, + CUSTOM, + LEGACY +} 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 index 9013f919..82358cc5 100644 --- 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 @@ -279,6 +279,7 @@ data class UpdatedOrder( val taxOnShipping: Double? = null, val taxOnHandlingFee: Double? = null, val includeInPrice: Boolean? = null, + val sourceTaxRateType: TaxRateType? = 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 index 9fb1fbc9..9997bca4 100644 --- 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 @@ -268,16 +268,9 @@ data class FetchedOrder( val taxOnHandlingFee: Double? = null, override val includeInPrice: Boolean? = null, val sourceTaxRateId: Int? = null, - val sourceTaxRateType: RateType? = null, + val sourceTaxRateType: TaxRateType? = null, val taxType: OrderItemTaxType? = null, - ) : ExtendedOrderTax { - enum class RateType { - AUTO, - MANUAL, - CUSTOM, - LEGACY - } - } + ) : ExtendedOrderTax data class HandlingFeeTax( 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 index 68de0ddc..ccb648b9 100644 --- a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt +++ b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt @@ -98,6 +98,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List