Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ECWID-134924 OE2: add scheduled fields to ecwid-java-api-client: adde… #377

Merged
merged 4 commits into from
Mar 6, 2024
Merged

ECWID-134924 OE2: add scheduled fields to ecwid-java-api-client: adde… #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7baf859
ECWID-134924 OE2: add scheduled fields to ecwid-java-api-client: adde…
zont163 Feb 15, 2024
ab2c57c
ECWID-134924 OE2: add scheduled fields to ecwid-java-api-client: remo…
zont163 Feb 15, 2024
977df11
Merge remote-tracking branch 'origin/master' into ECWID-134924
qblake Feb 26, 2024
52c8b84
ECWID-134924 OE2: add scheduled fields to ecwid-java-api-client — add…
qblake Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/order/enums/ScheduledTimePrecisionType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.ecwid.apiclient.v3.dto.order.enums

@Suppress("unused")
enum class ScheduledTimePrecisionType {
DATE,
DATE_AND_TIME_SLOT,
}
2 changes: 2 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ data class FetchedOrder(
val locationId: String? = null,
val localizedLabel: String? = null,
val isShippingLimit: Boolean? = null,
val scheduled: Boolean? = null,
val scheduledTimePrecisionType: ScheduledTimePrecisionType? = null,
)

data class HandlingFee(
Expand Down
10 changes: 9 additions & 1 deletion src/main/kotlin/com/ecwid/apiclient/v3/dto/profile/result/FetchedStoreProfile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,17 @@ data class FetchedStoreProfile(
val pickupInstruction: String? = null,
val scheduledPickup: Boolean? = null,
val pickupPreparationTimeHours: Int? = null,
val pickupBusinessHours: String? = null
val pickupBusinessHours: String? = null,
val scheduled: Boolean? = null,
val scheduledTimePrecisionType: ScheduledTimePrecisionType? = null,
)

@Suppress("unused")
enum class ScheduledTimePrecisionType {
DATE,
DATE_AND_TIME_SLOT
}

@Suppress("unused")
enum class FulfilmentType {
pickup, shipping, delivery
Expand Down
2 changes: 2 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ val nonUpdatablePropertyRules: List<NonUpdatablePropertyRule<*, *>> = listOf(
ReadOnly(FetchedOrder.ShippingOption::shippingRateWithoutTax),
ReadOnly(FetchedOrder.ShippingOption::localizedLabel),
ReadOnly(FetchedOrder.ShippingOption::isShippingLimit),
ReadOnly(FetchedOrder.ShippingOption::scheduled),
ReadOnly(FetchedOrder.ShippingOption::scheduledTimePrecisionType),
ReadOnly(FetchedOrder.HandlingFee::valueWithoutTax),
ReadOnly(FetchedOrder.Surcharge::totalWithoutTax),
Ignored(FetchedOrder::refundedAmount),
Expand Down
2 changes: 2 additions & 0 deletions src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
IgnoreNullable(FetchedOrder.ShippingOption::shippingRate),
AllowNullable(FetchedOrder.ShippingOption::isShippingLimit),
AllowNullable(FetchedOrder.ShippingOption::localizedLabel),
AllowNullable(FetchedOrder.ShippingOption::scheduled),
AllowNullable(FetchedOrder.ShippingOption::scheduledTimePrecisionType),
AllowNullable(FetchedOrder.ShippingServiceInfo::carrier),
AllowNullable(FetchedOrder.ShippingServiceInfo::carrierName),
AllowNullable(FetchedOrder.ShippingServiceInfo::carrierServiceCode),
Expand Down
2 changes: 2 additions & 0 deletions ...test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedStoreProfileRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ val fetchedStoreProfileNullablePropertyRules: List<NullablePropertyRule<*, *>> =
IgnoreNullable(FetchedStoreProfile.ShippingOption::scheduledPickup),
IgnoreNullable(FetchedStoreProfile.ShippingOption::shippingCostMarkup),
IgnoreNullable(FetchedStoreProfile.ShippingOption::title),
AllowNullable(FetchedStoreProfile.ShippingOption::scheduled),
AllowNullable(FetchedStoreProfile.ShippingOption::scheduledTimePrecisionType),
IgnoreNullable(FetchedStoreProfile.ShippingOrigin::city),
IgnoreNullable(FetchedStoreProfile.ShippingOrigin::companyName),
IgnoreNullable(FetchedStoreProfile.ShippingOrigin::countryCode),
Expand Down
Loading