Merge pull request #226 from Ecwid/usa-taxes

Add taxType to OrderItemTax

Author: Alexis2004

src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt

@@ -187,7 +187,8 @@ fun FetchedOrder.OrderItemTax.toUpdated(): UpdatedOrder.OrderItemTax {
 		total = total,
 		taxOnDiscountedSubtotal = taxOnDiscountedSubtotal,
 		taxOnShipping = taxOnShipping,
-		includeInPrice = includeInPrice
+		includeInPrice = includeInPrice,
+		taxType = taxType,
 	)
 }
 
@@ -258,7 +259,8 @@ fun FetchedOrder.BaseOrderItemTax.toUpdated(): UpdatedOrder.BaseOrderItemTax {
 	return UpdatedOrder.BaseOrderItemTax(
 		name = name,
 		value = value,
-		total = total
+		total = total,
+		taxType = taxType,
 	)
 }
 

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/enums/OrderItemTaxType.kt

@@ -0,0 +1,9 @@
+package com.ecwid.apiclient.v3.dto.order.enums
+
+@Suppress("unused")
+enum class OrderItemTaxType {
+	STATE,
+	COUNTY,
+	CITY,
+	SPECIAL_DISTRICT,
+}

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt

@@ -241,7 +241,8 @@ data class UpdatedOrder(
 	data class BaseOrderItemTax(
 		override val name: String? = null,
 		override val value: Double? = null,
-		override val total: Double? = null
+		override val total: Double? = null,
+		val taxType: OrderItemTaxType? = null,
 	) : BaseOrderTax
 
 	data class OrderItemTax(
@@ -250,7 +251,8 @@ data class UpdatedOrder(
 		override val total: Double? = null,
 		val taxOnDiscountedSubtotal: Double? = null,
 		val taxOnShipping: Double? = null,
-		val includeInPrice: Boolean? = null
+		val includeInPrice: Boolean? = null,
+		val taxType: OrderItemTaxType? = null,
 	) : BaseOrderTax
 
 	data class HandlingFeeTax(

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt

@@ -226,7 +226,8 @@ data class FetchedOrder(
 	data class BaseOrderItemTax(
 		override val name: String? = null,
 		override val value: Double? = null,
-		override val total: Double? = null
+		override val total: Double? = null,
+		val taxType: OrderItemTaxType? = null,
 	) : BaseOrderTax
 
 	data class OrderItemTax(
@@ -237,7 +238,8 @@ data class FetchedOrder(
 		val taxOnShipping: Double? = null,
 		val includeInPrice: Boolean? = null,
 		val sourceTaxRateId: Int? = null,
-		val sourceTaxRateType: RateType? = null
+		val sourceTaxRateType: RateType? = null,
+		val taxType: OrderItemTaxType? = null,
 	) : BaseOrderTax {
 		enum class RateType {
 			AUTO,

src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt

@@ -9,6 +9,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	AllowNullable(FetchedOrder.BaseOrderItemTax::name),
 	AllowNullable(FetchedOrder.BaseOrderItemTax::total),
 	AllowNullable(FetchedOrder.BaseOrderItemTax::value),
+	AllowNullable(FetchedOrder.BaseOrderItemTax::taxType),
 	AllowNullable(FetchedOrder.HandlingFeeTax::name),
 	AllowNullable(FetchedOrder.HandlingFeeTax::total),
 	AllowNullable(FetchedOrder.HandlingFeeTax::value),
@@ -126,6 +127,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	IgnoreNullable(FetchedOrder.OrderItemTax::value),
 	IgnoreNullable(FetchedOrder.OrderItemTax::sourceTaxRateId),
 	IgnoreNullable(FetchedOrder.OrderItemTax::sourceTaxRateType),
+	AllowNullable(FetchedOrder.OrderItemTax::taxType),
 	AllowNullable(FetchedOrder.Parcel::dimensionUnit),
 	AllowNullable(FetchedOrder.Parcel::height),
 	AllowNullable(FetchedOrder.Parcel::length),