Skip to content

ECWID-159524 Add PickupPrecisionType to ShippingOption #474

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

Merged
amithgotamey merged 10 commits into from
Mar 25, 2025
Merged

ECWID-159524 Add PickupPrecisionType to ShippingOption #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0bf6c17
ECWID-159524 Add additional types
amithgotamey Mar 17, 2025
253c832
ECWID-159524 detekt: Remove semicolon
amithgotamey Mar 17, 2025
11666b4
ECWID-159524 Update additional places
amithgotamey Mar 17, 2025
d909613
ECWID-159524 Additional rules for fetched order
amithgotamey Mar 17, 2025
160a830
ECWID-159524 Trigger actions
amithgotamey Mar 17, 2025
555660c
ECWID-159524 Extract PickupPrecision into file
amithgotamey Mar 18, 2025
778a8fa
ECWID-159524 Temporarily disable failing tests
amithgotamey Mar 18, 2025
3d82fa7
ECWID-159524 Enable disabled tests
amithgotamey Mar 19, 2025
b6303fa
ECWID-159524 just a test
amithgotamey Mar 19, 2025
7413c03
Merge branch 'master' into ECWID-159524_pickup_precision_type
amithgotamey Mar 21, 2025
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
1 change: 1 addition & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedShippingOption.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ fun FetchedShippingOption.toUpdated(): UpdatedShippingOption {
pickupInstruction = pickupInstruction,
pickupInstructionTranslated = pickupInstructionTranslated,
scheduledPickup = scheduledPickup,
pickupPrecisionType = pickupPrecisionType,
type = type,
carrier = carrier,
carrierSettings = carrierSettings?.toUpdate(),
Expand Down
7 changes: 7 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/order/enums/PickupPrecisionType.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 PickupPrecisionType {
DATE_ONLY,
DATE_AND_TIME,
}
1 change: 1 addition & 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 @@ -342,6 +342,7 @@ data class FetchedOrder(
val estimatedTransitTime: String? = null,
val isPickup: Boolean? = null,
val pickupInstruction: String? = null,
val pickupPrecisionType: PickupPrecisionType? = null,
val fulfillmentType: FulfillmentType? = null,
val locationId: String? = null,
val localizedLabel: String? = null,
Expand Down
7 changes: 7 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/profile/enums/PickupPrecisionType.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.profile.enums

@Suppress("unused")
enum class PickupPrecisionType {
DATE_ONLY,
DATE_AND_TIME,
}
1 change: 1 addition & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/profile/request/UpdatedShippingOption.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ data class UpdatedShippingOption(
val pickupPreparationTimeHours: Int? = null,
val pickupBusinessHours: String? = null,
val scheduledPickup: Boolean? = null,
val pickupPrecisionType: PickupPrecisionType? = null,
val type: String? = null,
val carrier: String? = null,
val carrierMethods: List<CarrierMethod>? = null,
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/profile/result/FetchedShippingOption.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ data class FetchedShippingOption(
val pickupPreparationTimeHours: Int? = null,
val pickupBusinessHours: String? = null,
val scheduledPickup: Boolean? = null,
val pickupPrecisionType: PickupPrecisionType? = null,
val type: String? = null,
val carrier: String? = null,
val carrierMethods: List<CarrierMethod>? = null,
Expand Down
1 change: 1 addition & 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 @@ -227,6 +227,7 @@ val nonUpdatablePropertyRules: List<NonUpdatablePropertyRule<*, *>> = listOf(
ReadOnly(FetchedOrder.ShippingOption::scheduled),
ReadOnly(FetchedOrder.ShippingOption::scheduledTimePrecisionType),
ReadOnly(FetchedOrder.ShippingOption::timeSlotLengthInMinutes),
ReadOnly(FetchedOrder.ShippingOption::pickupPrecisionType),
ReadOnly(FetchedOrder.HandlingFee::valueWithoutTax),
ReadOnly(FetchedOrder.Surcharge::totalWithoutTax),
Ignored(FetchedOrder::refundedAmount),
Expand Down
1 change: 1 addition & 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 @@ -188,6 +188,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
AllowNullable(FetchedOrder.ShippingOption::scheduled),
AllowNullable(FetchedOrder.ShippingOption::scheduledTimePrecisionType),
AllowNullable(FetchedOrder.ShippingOption::timeSlotLengthInMinutes),
AllowNullable(FetchedOrder.ShippingOption::pickupPrecisionType),
AllowNullable(FetchedOrder.ShippingServiceInfo::carrier),
AllowNullable(FetchedOrder.ShippingServiceInfo::carrierName),
AllowNullable(FetchedOrder.ShippingServiceInfo::carrierServiceCode),
Expand Down
1 change: 1 addition & 0 deletions ...wid/apiclient/v3/rule/nullablepropertyrules/FetchedShippingoptionNullablePropertyRules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ val fetchedShippingOptionNullablePropertyRules: List<NullablePropertyRule<*, *>>
AllowNullable(FetchedShippingOption::pickupInstructionTranslated),
AllowNullable(FetchedShippingOption::pickupBusinessHours),
AllowNullable(FetchedShippingOption::pickupPreparationTimeHours),
AllowNullable(FetchedShippingOption::pickupPrecisionType),
AllowNullable(FetchedShippingOption::type),
AllowNullable(FetchedShippingOption::carrier),
AllowNullable(FetchedShippingOption::carrierSettings),
Expand Down