Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ fun FetchedOrder.OrderItemTax.toUpdated(): UpdatedOrder.OrderItemTax {
taxOnHandlingFee = taxOnHandlingFee,
includeInPrice = includeInPrice,
taxType = taxType,
sourceTaxRateType = sourceTaxRateType,
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.ecwid.apiclient.v3.dto.order.enums

enum class TaxRateType {
AUTO,
MANUAL,
CUSTOM,
LEGACY
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnDiscountedSubtotal),
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnShipping),
AllowNullable(CalculateOrderDetailsResult.OrderItemTax::taxOnHandlingFee),
AllowNullable(CalculateOrderDetailsResult.OrderItemTax::sourceTaxRateType),
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::total),
IgnoreNullable(CalculateOrderDetailsResult.OrderItemTax::value),
IgnoreNullable(CalculateOrderDetailsResult.PersonInfo::city),
Expand Down
Loading