Skip to content

Commit 3f128b5

Browse files
committed
ECWID-134977 OE2: if an advanced discount is used for a product and more items are added to an order, the total is calculated incorrectly: added fields to calculated order
1 parent f53a93e commit 3f128b5

4 files changed

Lines changed: 10 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ data class OrderForCalculate(
3636
val type: DiscountType? = null,
3737
val base: DiscountBase? = null,
3838
val orderTotal: Double? = null,
39-
val description: String? = null
39+
val description: String? = null,
40+
val appliesToProducts: List<Int>? = null,
41+
val appliesToItems: List<Long>? = null,
4042
)
4143

4244
data class OrderItemDiscountInfo(

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ data class CalculateOrderDetailsResult(
9595
val type: DiscountType? = null,
9696
val base: DiscountBase? = null,
9797
val orderTotal: Double? = null,
98-
val description: String? = null
98+
val description: String? = null,
99+
val appliesToProducts: List<Int>? = null,
100+
val appliesToItems: List<Long>? = null,
99101
)
100102

101103
data class OrderItemDiscountInfo(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
2626
IgnoreNullable(CalculateOrderDetailsResult.DiscountInfo::orderTotal),
2727
IgnoreNullable(CalculateOrderDetailsResult.DiscountInfo::type),
2828
IgnoreNullable(CalculateOrderDetailsResult.DiscountInfo::value),
29+
AllowNullable(CalculateOrderDetailsResult.DiscountInfo::appliesToProducts),
30+
AllowNullable(CalculateOrderDetailsResult.DiscountInfo::appliesToItems),
2931
IgnoreNullable(CalculateOrderDetailsResult.HandlingFeeInfo::description),
3032
IgnoreNullable(CalculateOrderDetailsResult.HandlingFeeInfo::name),
3133
AllowNullable(CalculateOrderDetailsResult.HandlingFeeInfo::taxes),

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
5252
IgnoreNullable(OrderForCalculate.DiscountInfo::orderTotal),
5353
IgnoreNullable(OrderForCalculate.DiscountInfo::type),
5454
IgnoreNullable(OrderForCalculate.DiscountInfo::value),
55+
AllowNullable(OrderForCalculate.DiscountInfo::appliesToProducts),
56+
AllowNullable(OrderForCalculate.DiscountInfo::appliesToItems),
5557
AllowNullable(OrderForCalculate.HandlingFee::description),
5658
AllowNullable(OrderForCalculate.HandlingFee::name),
5759
AllowNullable(OrderForCalculate.HandlingFee::taxes),

0 commit comments

Comments
 (0)