Skip to content

Commit fae5f8c

Browse files
committed
ECOM-7571 Add sourceTaxRateType field to items taxes info
Required to set it correctly while calculating and creating order via API if value should differ from default LEGACY
1 parent 363067c commit fae5f8c

6 files changed

Lines changed: 14 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ fun FetchedOrder.OrderItemTax.toUpdated(): UpdatedOrder.OrderItemTax {
213213
taxOnHandlingFee = taxOnHandlingFee,
214214
includeInPrice = includeInPrice,
215215
taxType = taxType,
216+
sourceTaxRateType = sourceTaxRateType,
216217
)
217218
}
218219

src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ data class CalculateOrderDetailsResult(
192192
val taxOnDiscountedSubtotal: Double? = null,
193193
val taxOnShipping: Double? = null,
194194
val taxOnHandlingFee: Double? = null,
195+
val sourceTaxRateType: TaxRateType? = null,
195196
) : BaseOrderTax
196197

197198
data class OrderItemProductFile(
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.ecwid.apiclient.v3.dto.order.enums
2+
3+
enum class TaxRateType {
4+
AUTO,
5+
MANUAL,
6+
CUSTOM,
7+
LEGACY
8+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ data class UpdatedOrder(
279279
val taxOnShipping: Double? = null,
280280
val taxOnHandlingFee: Double? = null,
281281
val includeInPrice: Boolean? = null,
282+
val sourceTaxRateType: TaxRateType? = null,
282283
val taxType: OrderItemTaxType? = null,
283284
) : BaseOrderTax
284285

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -268,16 +268,9 @@ data class FetchedOrder(
268268
val taxOnHandlingFee: Double? = null,
269269
override val includeInPrice: Boolean? = null,
270270
val sourceTaxRateId: Int? = null,
271-
val sourceTaxRateType: RateType? = null,
271+
val sourceTaxRateType: TaxRateType? = null,
272272
val taxType: OrderItemTaxType? = null,
273-
) : ExtendedOrderTax {
274-
enum class RateType {
275-
AUTO,
276-
MANUAL,
277-
CUSTOM,
278-
LEGACY
279-
}
280-
}
273+
) : ExtendedOrderTax
281274

282275

283276
data class HandlingFeeTax(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
9898
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnDiscountedSubtotal),
9999
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnShipping),
100100
AllowNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnHandlingFee),
101+
AllowNullable(CalculateOrderDetailsResult.OrderItemTax::sourceTaxRateType),
101102
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::total),
102103
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::value),
103104
IgnoreNullable(CalculateOrderDetailsResult.PersonInfo::city),

0 commit comments

Comments
 (0)