Merge pull request #348 from Ecwid/ECWID-126274

ECWID-126274 OE2: The discount Based on Customer Groups is deducted f…
Ecwid · Nov 9, 2023 · 4ea84d1 · 4ea84d1
2 parents 6012f38 + 99b6ee8
commit 4ea84d1
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 4 deletions.
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt
@@ -146,10 +146,10 @@ fun FetchedOrder.OrderItem.toUpdated(): UpdatedOrder.OrderItem {
 		fixedShippingRateOnly = fixedShippingRateOnly,
 		digital = digital,
 		couponApplied = couponApplied,
+		giftCard = giftCard,
 
 		discountsAllowed = discountsAllowed,
 		isCustomerSetPrice = isCustomerSetPrice,
-		isGiftCard = isGiftCard,
 		nameTranslated = nameTranslated,
 		selectedPrice = selectedPrice?.toUpdated(),
 		shortDescriptionTranslated = shortDescriptionTranslated,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt
@@ -91,6 +91,7 @@ data class OrderForCalculate(
 		val fixedShippingRateOnly: Boolean? = null,
 		val digital: Boolean? = null,
 		val couponApplied: Boolean? = null,
+		val giftCard: Boolean? = null,
 
 		val selectedOptions: List<OrderItemOption>? = null,
 		val combinationId: Int? = null,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt
@@ -148,6 +148,7 @@ data class CalculateOrderDetailsResult(
 		val fixedShippingRateOnly: Boolean? = null,
 		val digital: Boolean? = null,
 		val couponApplied: Boolean? = null,
+		val giftCard: Boolean? = null,
 
 		val selectedOptions: List<OrderItemOption>? = null,
 		val combinationId: Int? = null,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/FetchedCart.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/FetchedCart.kt
@@ -142,6 +142,7 @@ data class FetchedCart(
 		val fixedShippingRateOnly: Boolean? = null,
 		val digital: Boolean? = null,
 		val couponApplied: Boolean? = null,
+		val giftCard: Boolean? = null,
 
 		val selectedOptions: List<OrderItemOption>? = null,
 		val combinationId: Int? = null,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt
@@ -154,7 +154,7 @@ data class UpdatedOrder(
 		val fixedShippingRateOnly: Boolean? = null,
 		val digital: Boolean? = null,
 		val couponApplied: Boolean? = null,
-		val isGiftCard: Boolean? = null,
+		val giftCard: Boolean? = null,
 
 		val selectedOptions: List<OrderItemSelectedOption>? = null,
 		val combinationId: Int? = null,

diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt
@@ -186,7 +186,7 @@ data class FetchedOrder(
 		val digital: Boolean? = null,
 		val productAvailable: Boolean? = null, // TODO Probably this field is always true
 		val couponApplied: Boolean? = null,
-		val isGiftCard: Boolean? = null,
+		val giftCard: Boolean? = null,
 
 		val recurringChargeSettings: RecurringChargeSettings? = null,
 		val subscriptionId: Long? = null,

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt b/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt
@@ -98,6 +98,7 @@ class CartsTest : BaseEntityTest() {
 			assertEquals(orderItem.fixedShippingRateOnly, cartItem.fixedShippingRateOnly)
 			assertEquals(orderItem.digital, cartItem.digital)
 			assertEquals(orderItem.couponApplied, cartItem.couponApplied)
+			assertEquals(orderItem.giftCard, cartItem.giftCard)
 
 			assertEquals(orderItem.dimensions?.length, cartItem.dimensions?.length)
 			assertEquals(orderItem.dimensions?.width, cartItem.dimensions?.width)
@@ -305,6 +306,7 @@ class CartsTest : BaseEntityTest() {
 			assertEquals(forCalculateItem.fixedShippingRateOnly, calculatedItem.fixedShippingRateOnly)
 			assertEquals(forCalculateItem.digital, calculatedItem.digital)
 			assertEquals(false, calculatedItem.couponApplied)
+			assertEquals(false, calculatedItem.giftCard)
 
 			assertEquals(forCalculateItem.selectedOptions?.count(), calculatedItem.selectedOptions?.count())
 			calculatedItem.selectedOptions?.forEachIndexed { selectedOptionIndex, calculatedOrderItemOptions ->
@@ -485,6 +487,7 @@ class CartsTest : BaseEntityTest() {
 			fixedShippingRateOnly = true,
 			digital = true,
 			couponApplied = true,
+			giftCard = false,
 			selectedOptions = listOf(
 				generateChoiceSelectedOption(),
 				generateChoicesSelectedOption(),

diff --git a/...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt b/...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt
@@ -37,6 +37,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::categoryId),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::couponAmount),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::couponApplied),
+	AllowNullable(CalculateOrderDetailsResult.OrderItem::giftCard),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::digital),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::dimensions),
 	IgnoreNullable(CalculateOrderDetailsResult.OrderItem::discounts),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCartRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCartRules.kt
@@ -82,6 +82,7 @@ val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	IgnoreNullable(FetchedCart.OrderItem::categoryId),
 	IgnoreNullable(FetchedCart.OrderItem::couponAmount),
 	IgnoreNullable(FetchedCart.OrderItem::couponApplied),
+	AllowNullable(FetchedCart.OrderItem::giftCard),
 	IgnoreNullable(FetchedCart.OrderItem::digital),
 	IgnoreNullable(FetchedCart.OrderItem::dimensions),
 	IgnoreNullable(FetchedCart.OrderItem::discounts),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt
@@ -66,7 +66,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	IgnoreNullable(FetchedOrder.OrderItem::id),
 	IgnoreNullable(FetchedOrder.OrderItem::imageUrl),
 	AllowNullable(FetchedOrder.OrderItem::isCustomerSetPrice),
-	AllowNullable(FetchedOrder.OrderItem::isGiftCard),
+	AllowNullable(FetchedOrder.OrderItem::giftCard),
 	IgnoreNullable(FetchedOrder.OrderItem::isShippingRequired),
 	IgnoreNullable(FetchedOrder.OrderItem::name),
 	AllowNullable(FetchedOrder.OrderItem::nameTranslated),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt
@@ -59,6 +59,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
 	IgnoreNullable(OrderForCalculate.OrderItem::categoryId),
 	IgnoreNullable(OrderForCalculate.OrderItem::couponAmount),
 	IgnoreNullable(OrderForCalculate.OrderItem::couponApplied),
+	AllowNullable(OrderForCalculate.OrderItem::giftCard),
 	IgnoreNullable(OrderForCalculate.OrderItem::digital),
 	IgnoreNullable(OrderForCalculate.OrderItem::dimensions),
 	IgnoreNullable(OrderForCalculate.OrderItem::discounts),

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt b/src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt
@@ -210,6 +210,7 @@ private fun generateTestOrderItem() = UpdatedOrder.OrderItem(
 	fixedShippingRateOnly = randomBoolean(),
 	digital = randomBoolean(),
 	couponApplied = randomBoolean(),
+	giftCard = false,
 	isCustomerSetPrice = randomBoolean(),
 	taxable = randomBoolean(),