Skip to content

Commit ffb705a

Browse files
authored
Merge pull request #515 from Ecwid/ECWID-170495
ECWID-170495: Rename a field in Order object to specify whether the tax is already deducted from order or not.
2 parents a6ae968 + 1516d33 commit ffb705a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ data class OrderForCalculate(
1414
val customerTaxExempt: Boolean? = null,
1515
val customerTaxId: String? = null,
1616
val reversedTaxApplied: Boolean? = null,
17-
val taxAlreadyDeductedFromPrice: Boolean? = null,
17+
val taxAlreadyDeducted: Boolean? = null,
1818
val discountCoupon: DiscountCouponInfo? = null,
1919
val items: List<OrderItem>? = null,
2020
val billingPerson: PersonInfo? = null,
@@ -79,7 +79,7 @@ data class OrderForCalculate(
7979

8080
val price: Double? = null,
8181
val productPrice: Double? = null,
82-
val taxAlreadyDeducted: Boolean? = null,
82+
val taxAlreadyDeductedFromPrice: Boolean? = null,
8383
val needCalculateWholesalePrice: Boolean? = null,
8484
val isCustomerSetPrice: Boolean? = null,
8585
val selectedPrice: SelectedPrice? = null,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
2626
IgnoreNullable(OrderForCalculate::items),
2727
AllowNullable(OrderForCalculate::paymentOptionsDetails),
2828
AllowNullable(OrderForCalculate::reversedTaxApplied),
29-
AllowNullable(OrderForCalculate::taxAlreadyDeductedFromPrice),
29+
AllowNullable(OrderForCalculate::taxAlreadyDeducted),
3030
AllowNullable(OrderForCalculate::shippingOption),
3131
IgnoreNullable(OrderForCalculate::shippingPerson),
3232
AllowNullable(OrderForCalculate.CustomSurcharge::description),
@@ -77,7 +77,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
7777
IgnoreNullable(OrderForCalculate.OrderItem::imageUrl),
7878
IgnoreNullable(OrderForCalculate.OrderItem::isShippingRequired),
7979
IgnoreNullable(OrderForCalculate.OrderItem::name),
80-
AllowNullable(OrderForCalculate.OrderItem::taxAlreadyDeducted),
80+
AllowNullable(OrderForCalculate.OrderItem::taxAlreadyDeductedFromPrice),
8181
AllowNullable(OrderForCalculate.OrderItem::needCalculateWholesalePrice),
8282
IgnoreNullable(OrderForCalculate.OrderItem::price),
8383
IgnoreNullable(OrderForCalculate.OrderItem::productId),

0 commit comments

Comments
 (0)