Merge pull request #529 from Ecwid/ECWID-172968

ECWID-172968 Order Editor: "On card total" discounts limited by customer groups stop working after any edits are made

Author: hanna-ecwid

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

@@ -116,6 +116,7 @@ fun FetchedOrder.DiscountInfo.toUpdated(): UpdatedOrder.DiscountInfo {
 		description = description,
 		appliesToProducts = appliesToProducts,
 		appliesToItems = appliesToItems,
+		membershipId = membershipId,
 	)
 }
 

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

@@ -41,6 +41,7 @@ data class OrderForCalculate(
 		val description: String? = null,
 		val appliesToProducts: List<Int>? = null,
 		val appliesToItems: List<Long>? = null,
+		val membershipId: Int? = null,
 	)
 
 	data class OrderItemDiscountInfo(

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

@@ -99,6 +99,7 @@ data class CalculateOrderDetailsResult(
 		val description: String? = null,
 		val appliesToProducts: List<Int>? = null,
 		val appliesToItems: List<Long>? = null,
+		val membershipId: Int? = null,
 	)
 
 	data class OrderItemDiscountInfo(

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

@@ -120,6 +120,7 @@ data class UpdatedOrder(
 		val description: String? = null,
 		val appliesToProducts: List<Int>? = null,
 		val appliesToItems: List<Long>? = null,
+		val membershipId: Int? = null
 	)
 
 	data class DiscountCouponInfo(

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

@@ -143,6 +143,7 @@ data class FetchedOrder(
 		val description: String? = null,
 		val appliesToProducts: List<Int>? = null,
 		val appliesToItems: List<Long>? = null,
+		val membershipId: Int? = null
 	)
 
 	data class DiscountCouponInfo(

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

@@ -27,6 +27,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
 	IgnoreNullable(CalculateOrderDetailsResult.DiscountInfo::type),
 	IgnoreNullable(CalculateOrderDetailsResult.DiscountInfo::value),
 	AllowNullable(CalculateOrderDetailsResult.DiscountInfo::appliesToProducts),
+	AllowNullable(CalculateOrderDetailsResult.DiscountInfo::membershipId),
 	AllowNullable(CalculateOrderDetailsResult.DiscountInfo::appliesToItems),
 	IgnoreNullable(CalculateOrderDetailsResult.HandlingFeeInfo::description),
 	IgnoreNullable(CalculateOrderDetailsResult.HandlingFeeInfo::name),

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

@@ -44,6 +44,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	IgnoreNullable(FetchedOrder.DiscountInfo::type),
 	IgnoreNullable(FetchedOrder.DiscountInfo::value),
 	AllowNullable(FetchedOrder.DiscountInfo::appliesToProducts),
+	AllowNullable(FetchedOrder.DiscountInfo::membershipId),
 	AllowNullable(FetchedOrder.DiscountInfo::appliesToItems),
 	AllowNullable(FetchedOrder.ExtraFieldsInfo::customerInputType),
 	AllowNullable(FetchedOrder.ExtraFieldsInfo::id),

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

@@ -55,6 +55,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
 	IgnoreNullable(OrderForCalculate.DiscountInfo::type),
 	IgnoreNullable(OrderForCalculate.DiscountInfo::value),
 	AllowNullable(OrderForCalculate.DiscountInfo::appliesToProducts),
+	AllowNullable(OrderForCalculate.DiscountInfo::membershipId),
 	AllowNullable(OrderForCalculate.DiscountInfo::appliesToItems),
 	AllowNullable(OrderForCalculate.HandlingFee::description),
 	AllowNullable(OrderForCalculate.HandlingFee::name),