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

Jump to bottom

ECWID-137762 X+E: Omni Loyalty - add auto-cancelation of loyalty on h… #415

Merged
merged 1 commit into from
Jun 20, 2024
Merged

ECWID-137762 X+E: Omni Loyalty - add auto-cancelation of loyalty on h… #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/FetchedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,5 +337,6 @@ fun FetchedOrder.LoyaltyRedemption.toUpdated(): UpdatedOrder.LoyaltyRedemption {
return UpdatedOrder.LoyaltyRedemption(
id = this.id,
amount = this.amount,
cancelled = this.cancelled,
)
}
2 changes: 2 additions & 0 deletions src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ data class UpdatedOrder(
val orderDetailsDisplaySection: String? = null,
val orderBy: String? = null
)

data class Loyalty(
val earned: Double? = null,
val redemption: LoyaltyRedemption? = null,
Expand All @@ -367,6 +368,7 @@ data class UpdatedOrder(
data class LoyaltyRedemption(
val id: String? = null,
val amount: Double? = null,
val cancelled: Boolean? = null,
)

companion object {
Expand Down
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 @@ -522,5 +522,6 @@ data class FetchedOrder(
data class LoyaltyRedemption(
val id: String? = null,
val amount: Double? = null,
val cancelled: Boolean? = null,
)
}
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 @@ -319,5 +319,6 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
AllowNullable(FetchedOrder.Loyalty::redemption),
AllowNullable(FetchedOrder.LoyaltyRedemption::id),
AllowNullable(FetchedOrder.LoyaltyRedemption::amount),
AllowNullable(FetchedOrder.LoyaltyRedemption::cancelled),
AllowNullable(FetchedOrder::customerFiscalCode),
)
Loading