ECWID-141240 - add giftCardUuid

Ecwid · Jun 13, 2024 · 768e3e6 · 768e3e6
1 parent d033232
commit 768e3e6
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 0 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
@@ -47,6 +47,7 @@ fun FetchedOrder.toUpdated(): UpdatedOrder {
 		giftCardDoubleSpending = giftCardDoubleSpending,
 		giftCardCode = giftCardCode,
 		giftCardId = giftCardId,
+		giftCardUuid = giftCardUuid,
 
 		tax = tax,
 		customerTaxExempt = customerTaxExempt,

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
@@ -25,6 +25,7 @@ data class OrderForCalculate(
 	val paymentOptionsDetails: PaymentOption? = null,
 	val giftCardCode: String? = null,
 	val giftCardId: Int? = null,
+	val giftCardUuid: String? = null,
 	val giftCardTransactionOrderId: Int? = null,
 	val giftCardRedemption: Double? = null,
 	val totalBeforeGiftCardRedemption: Double? = 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
@@ -36,6 +36,7 @@ data class CalculateOrderDetailsResult(
 	val giftCardDoubleSpending: Boolean? = null,
 	val giftCardCode: String? = null,
 	val giftCardId: Int? = null,
+	val giftCardUuid: String? = null,
 
 	val tax: Double? = null,
 	val taxesOnShipping: List<TaxOnShipping>? = 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
@@ -49,6 +49,7 @@ data class FetchedCart(
 
 	val giftCardCode: String? = null,
 	val giftCardId: Int? = null,
+	val giftCardUuid: String? = null,
 	val giftCardRedemption: Double? = null,
 	val totalBeforeGiftCardRedemption: Double? = null,
 	val giftCardDoubleSpending: Boolean? = 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
@@ -52,6 +52,7 @@ data class UpdatedOrder(
 	val giftCardDoubleSpending: Boolean? = null,
 	val giftCardCode: String? = null,
 	val giftCardId: Int? = null,
+	val giftCardUuid: String? = null,
 
 	val tax: Double? = null,
 	val customerTaxExempt: Boolean? = 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
@@ -67,6 +67,7 @@ data class FetchedOrder(
 	val giftCardDoubleSpending: Boolean? = null,
 	val giftCardCode: String? = null,
 	val giftCardId: Int? = null,
+	val giftCardUuid: String? = null,
 
 	val total: Double? = null,
 	val totalWithoutTax: Double? = null,

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt
@@ -106,6 +106,7 @@ val nonUpdatablePropertyRules: List<NonUpdatablePropertyRule<*, *>> = listOf(
 	ReadOnly(FetchedCart::giftCardCode),
 	ReadOnly(FetchedCart::giftCardDoubleSpending),
 	ReadOnly(FetchedCart::giftCardId),
+	ReadOnly(FetchedCart::giftCardUuid),
 	ReadOnly(FetchedCart::giftCardRedemption),
 	ReadOnly(FetchedCart::totalBeforeGiftCardRedemption),
 	Ignored(FetchedCart::tax),
@@ -172,6 +173,7 @@ val nonUpdatablePropertyRules: List<NonUpdatablePropertyRule<*, *>> = listOf(
 	ReadOnly(FetchedOrder::giftCardCode),
 	ReadOnly(FetchedOrder::giftCardDoubleSpending),
 	ReadOnly(FetchedOrder::giftCardId),
+	ReadOnly(FetchedOrder::giftCardUuid),
 	ReadOnly(FetchedOrder::giftCardRedemption),
 	ReadOnly(FetchedOrder::totalBeforeGiftCardRedemption),
 	ReadOnly(FetchedOrder::totalWithoutTax),

diff --git a/...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt b/...lin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt
@@ -182,6 +182,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
 	AllowNullable(CalculateOrderDetailsResult::giftCardDoubleSpending),
 	AllowNullable(CalculateOrderDetailsResult::giftCardCode),
 	AllowNullable(CalculateOrderDetailsResult::giftCardId),
+	AllowNullable(CalculateOrderDetailsResult::giftCardUuid),
 	AllowNullable(CalculateOrderDetailsResult::totalWithoutTax),
 	IgnoreNullable(CalculateOrderDetailsResult::usdTotal),
 	IgnoreNullable(CalculateOrderDetailsResult::volumeDiscount)

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
@@ -55,6 +55,7 @@ val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
 	AllowNullable(FetchedCart::giftCardCode),
 	AllowNullable(FetchedCart::giftCardDoubleSpending),
 	AllowNullable(FetchedCart::giftCardId),
+	AllowNullable(FetchedCart::giftCardUuid),
 	AllowNullable(FetchedCart::giftCardRedemption),
 	AllowNullable(FetchedCart::totalBeforeGiftCardRedemption),
 	IgnoreNullable(FetchedCart::utmData),

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
@@ -244,6 +244,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	AllowNullable(FetchedOrder::giftCardCode),
 	AllowNullable(FetchedOrder::giftCardDoubleSpending),
 	AllowNullable(FetchedOrder::giftCardId),
+	AllowNullable(FetchedOrder::giftCardUuid),
 	AllowNullable(FetchedOrder::giftCardRedemption),
 	AllowNullable(FetchedOrder::globalReferer),
 	AllowNullable(FetchedOrder::handlingFee),

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
@@ -17,6 +17,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
 	AllowNullable(OrderForCalculate::handlingFee),
 	AllowNullable(OrderForCalculate::giftCardCode),
 	AllowNullable(OrderForCalculate::giftCardId),
+	AllowNullable(OrderForCalculate::giftCardUuid),
 	AllowNullable(OrderForCalculate::giftCardTransactionOrderId),
 	AllowNullable(OrderForCalculate::giftCardRedemption),
 	AllowNullable(OrderForCalculate::totalBeforeGiftCardRedemption),