Skip to content

Commit a396ce5

Browse files
Merge pull request #219 from Ecwid/shipping-option-location-id
ECWID-105278 Added locationId field for local pickup shipping options
2 parents 4dfa7f8 + 8e694b1 commit a396ce5

6 files changed

Lines changed: 9 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ fun FetchedOrder.ShippingOption.toUpdated(): UpdatedOrder.ShippingOption {
226226
estimatedTransitTime = estimatedTransitTime,
227227
isPickup = isPickup,
228228
pickupInstruction = pickupInstruction,
229-
fulfillmentType = fulfillmentType
229+
fulfillmentType = fulfillmentType,
230+
locationId = locationId,
230231
)
231232
}
232233

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ data class UpdatedOrder(
287287
val estimatedTransitTime: String? = null,
288288
val isPickup: Boolean? = null,
289289
val pickupInstruction: String? = null,
290-
val fulfillmentType: FulfillmentType? = null
290+
val fulfillmentType: FulfillmentType? = null,
291+
val locationId: String? = null,
291292
)
292293

293294
data class HandlingFee(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ data class FetchedOrder(
306306
val estimatedTransitTime: String? = null,
307307
val isPickup: Boolean? = null,
308308
val pickupInstruction: String? = null,
309-
val fulfillmentType: FulfillmentType? = null
309+
val fulfillmentType: FulfillmentType? = null,
310+
val locationId: String? = null,
310311
)
311312

312313
data class HandlingFee(

src/main/kotlin/com/ecwid/apiclient/v3/dto/profile/result/FetchedStoreProfile.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ data class FetchedStoreProfile(
235235
val flatRate: FlatRate? = null,
236236
val ratesTable: TableRatesDetails? = null,
237237
val appClientId: String? = null,
238+
val locationId: String? = null,
238239
val pickupInstruction: String? = null,
239240
val scheduledPickup: Boolean? = null,
240241
val pickupPreparationTimeHours: Int? = null,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
167167
IgnoreNullable(FetchedOrder.ShippingOption::estimatedTransitTime),
168168
IgnoreNullable(FetchedOrder.ShippingOption::fulfillmentType),
169169
IgnoreNullable(FetchedOrder.ShippingOption::isPickup),
170+
AllowNullable(FetchedOrder.ShippingOption::locationId),
170171
IgnoreNullable(FetchedOrder.ShippingOption::pickupInstruction),
171172
IgnoreNullable(FetchedOrder.ShippingOption::shippingCarrierName),
172173
IgnoreNullable(FetchedOrder.ShippingOption::shippingMethodName),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ val fetchedStoreProfileNullablePropertyRules: List<NullablePropertyRule<*, *>> =
289289
IgnoreNullable(FetchedStoreProfile.ShippingOption::flatRate),
290290
IgnoreNullable(FetchedStoreProfile.ShippingOption::fulfilmentType),
291291
IgnoreNullable(FetchedStoreProfile.ShippingOption::id),
292+
AllowNullable(FetchedStoreProfile.ShippingOption::locationId),
292293
IgnoreNullable(FetchedStoreProfile.ShippingOption::orderBy),
293294
IgnoreNullable(FetchedStoreProfile.ShippingOption::pickupBusinessHours),
294295
IgnoreNullable(FetchedStoreProfile.ShippingOption::pickupInstruction),

0 commit comments

Comments
 (0)