ECWID-134924 OE2: add shippingMethodId field

Ecwid · Feb 26, 2024 · 150a301 · 150a301
1 parent 52c8b84
commit 150a301
Show file tree

Hide file tree

Showing 4 changed files with 4 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
@@ -232,6 +232,7 @@ fun FetchedOrder.PersonInfo.toUpdated(): UpdatedOrder.PersonInfo {
 
 fun FetchedOrder.ShippingOption.toUpdated(): UpdatedOrder.ShippingOption {
 	return UpdatedOrder.ShippingOption(
+		shippingMethodId = shippingMethodId,
 		shippingCarrierName = shippingCarrierName,
 		shippingMethodName = shippingMethodName,
 		shippingRate = shippingRate,

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
@@ -294,6 +294,7 @@ data class UpdatedOrder(
 	)
 
 	data class ShippingOption(
+		val shippingMethodId: String? = null,
 		val shippingCarrierName: String? = null,
 		val shippingMethodName: String? = null,
 		val shippingRate: Double? = 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
@@ -318,6 +318,7 @@ data class FetchedOrder(
 	)
 
 	data class ShippingOption(
+		val shippingMethodId: String? = null,
 		val shippingCarrierName: String? = null,
 		val shippingMethodName: String? = null,
 		val shippingRate: Double? = null,

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
@@ -178,6 +178,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	AllowNullable(FetchedOrder.ShippingOption::locationId),
 	IgnoreNullable(FetchedOrder.ShippingOption::pickupInstruction),
 	IgnoreNullable(FetchedOrder.ShippingOption::shippingCarrierName),
+	AllowNullable(FetchedOrder.ShippingOption::shippingMethodId),
 	IgnoreNullable(FetchedOrder.ShippingOption::shippingMethodName),
 	IgnoreNullable(FetchedOrder.ShippingOption::shippingRate),
 	AllowNullable(FetchedOrder.ShippingOption::isShippingLimit),