Merge pull request #337 from Ecwid/ECWID-127029

ECWID-127029 OE2: tax reverse is ignored when editing order
Ecwid · Oct 11, 2023 · 830e064 · 830e064
2 parents 5cb6028 + b4114ea
commit 830e064
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
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
@@ -12,6 +12,8 @@ data class OrderForCalculate(
 	val ipAddress: String? = null,
 	val customerId: Int? = null,
 	val customerTaxExempt: Boolean? = null,
+	val customerTaxId: String? = null,
+	val reversedTaxApplied: Boolean? = null,
 	val discountCoupon: DiscountCouponInfo? = null,
 	val items: List<OrderItem>? = null,
 	val billingPerson: PersonInfo? = null,

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
@@ -20,6 +20,7 @@ data class CalculateOrderDetailsResult(
 
 	val customerId: Int? = null,
 	val customerTaxExempt: Boolean? = null,
+	val customerTaxId: String? = null,
 	val customerTaxIdValid: Boolean? = null,
 	val pricesIncludeTax: Boolean? = null,
 	val reversedTaxApplied: Boolean? = null,

diff --git a/...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt b/...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt
@@ -150,6 +150,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
 	IgnoreNullable(CalculateOrderDetailsResult::createTimestamp),
 	IgnoreNullable(CalculateOrderDetailsResult::customerId),
 	AllowNullable(CalculateOrderDetailsResult::customerTaxExempt),
+	AllowNullable(CalculateOrderDetailsResult::customerTaxId),
 	AllowNullable(CalculateOrderDetailsResult::customerTaxIdValid),
 	AllowNullable(CalculateOrderDetailsResult::customSurcharges),
 	IgnoreNullable(CalculateOrderDetailsResult::discount),

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
@@ -8,6 +8,7 @@ import com.ecwid.apiclient.v3.rule.NullablePropertyRule.IgnoreNullable
 val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	IgnoreNullable(OrderForCalculate::billingPerson),
 	IgnoreNullable(OrderForCalculate::customerId),
+	AllowNullable(OrderForCalculate::customerTaxId),
 	AllowNullable(OrderForCalculate::customerTaxExempt),
 	AllowNullable(OrderForCalculate::customSurcharges),
 	IgnoreNullable(OrderForCalculate::discountCoupon),
@@ -20,6 +21,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
 	IgnoreNullable(OrderForCalculate::ipAddress),
 	IgnoreNullable(OrderForCalculate::items),
 	AllowNullable(OrderForCalculate::paymentOptionsDetails),
+	AllowNullable(OrderForCalculate::reversedTaxApplied),
 	AllowNullable(OrderForCalculate::shippingOption),
 	IgnoreNullable(OrderForCalculate::shippingPerson),
 	AllowNullable(OrderForCalculate.CustomSurcharge::description),