Skip to content

ECWID-163221 New Order Editor: Tax is automatically reset to a standard rate if a product was deleted from catalog #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlecwid merged 5 commits into from
Jun 30, 2025
Merged

ECWID-163221 New Order Editor: Tax is automatically reset to a standard rate if a product was deleted from catalog #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93aaf56
ECWID-163221 New Order Editor: Tax is automatically reset to a standa…
carlecwid Jun 28, 2025
0066d68
ECWID-163221: remove extra spaces
carlecwid Jun 28, 2025
558e338
ECWID-163221: make variable immutable
carlecwid Jun 28, 2025
35d4aeb
ECWID-163221: allow nullable values
carlecwid Jun 28, 2025
4746c21
ECWID-163221: also adding 'taxClassCode' property to order calculation
carlecwid Jun 28, 2025
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
1 change: 1 addition & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ fun FetchedOrder.OrderItem.toUpdated(): UpdatedOrder.OrderItem {
discounts = discounts?.map(FetchedOrder.OrderItemDiscounts::toUpdated),
externalReferenceId = externalReferenceId,
isPreorder = isPreorder,
taxClassCode = taxClassCode,
)
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ data class OrderForCalculate(
val taxes: List<OrderItemTax>? = null,
val files: List<OrderItemProductFile>? = null,
val dimensions: ProductDimensions? = null,
val discounts: List<OrderItemDiscounts>? = null
val discounts: List<OrderItemDiscounts>? = null,
val taxClassCode: String? = null
)

data class OrderItemOption(
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ data class UpdatedOrder(
val discounts: List<OrderItemDiscounts>? = null,
val externalReferenceId: String? = null,
val isPreorder: Boolean? = null,
val taxClassCode: String? = null,
)

data class OrderItemSelectedOption(
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ data class FetchedOrder(
val discounts: List<OrderItemDiscounts>? = null,
val externalReferenceId: String? = null,
val isPreorder: Boolean? = null,
val attributes: List<OrderItemAttributeValue>? = null
val attributes: List<OrderItemAttributeValue>? = null,
val taxClassCode: String? = null
)

data class RecurringChargeSettings(
Expand Down
1 change: 1 addition & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
IgnoreNullable(FetchedOrder.OrderItem::externalReferenceId),
AllowNullable(FetchedOrder.OrderItem::isPreorder),
AllowNullable(FetchedOrder.OrderItem::attributes),
AllowNullable(FetchedOrder.OrderItem::taxClassCode),
IgnoreNullable(FetchedOrder.OrderItemDiscounts::discountInfo),
IgnoreNullable(FetchedOrder.OrderItemDiscounts::total),
AllowNullable(FetchedOrder.OrderItemOptionFile::id),
Expand Down
1 change: 1 addition & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
IgnoreNullable(OrderForCalculate.OrderItem::taxes),
IgnoreNullable(OrderForCalculate.OrderItem::trackQuantity),
IgnoreNullable(OrderForCalculate.OrderItem::weight),
AllowNullable(OrderForCalculate.OrderItem::taxClassCode),
IgnoreNullable(OrderForCalculate.OrderItemDiscountInfo::base),
IgnoreNullable(OrderForCalculate.OrderItemDiscountInfo::orderTotal),
IgnoreNullable(OrderForCalculate.OrderItemDiscountInfo::type),
Expand Down