Skip to content

Commit 9a14398

Browse files
authored
Merge pull request #545 from Ecwid/ECOM-260
ECOM-260 store setting highlightCompositeProductsOnStorefront
2 parents 894ddff + 88167e7 commit 9a14398

File tree

5 files changed

+6
-0
lines changed

5 files changed

+6
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ fun FetchedStoreProfile.Settings.toUpdated(): UpdatedStoreProfile.Settings {
104104
googleRemarketingEnabled = googleRemarketingEnabled,
105105
googleTagId = googleTagId,
106106
hideOutOfStockProductsInStorefront = hideOutOfStockProductsInStorefront,
107+
highlightCompositeProductsOnStorefront = highlightCompositeProductsOnStorefront,
107108
openBagOnAddition = openBagOnAddition,
108109
orderCommentsCaption = orderCommentsCaption,
109110
orderCommentsEnabled = orderCommentsEnabled,

src/main/kotlin/com/ecwid/apiclient/v3/dto/profile/request/UpdatedStoreProfile.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ data class UpdatedStoreProfile(
9898
val googleRemarketingEnabled: Boolean? = null,
9999
val googleTagId: String? = null,
100100
val hideOutOfStockProductsInStorefront: Boolean? = null,
101+
val highlightCompositeProductsOnStorefront: Boolean? = null,
101102
val orderCommentsCaption: String? = null,
102103
val orderCommentsEnabled: Boolean? = null,
103104
val orderCommentsRequired: Boolean? = null,

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
@@ -127,6 +127,7 @@ data class FetchedStoreProfile(
127127
val googleRemarketingEnabled: Boolean? = null,
128128
val googleTagId: String? = null,
129129
val hideOutOfStockProductsInStorefront: Boolean? = null,
130+
val highlightCompositeProductsOnStorefront: Boolean = false,
130131
val invoiceLogoUrl: String? = null,
131132
val openBagOnAddition: Boolean = false,
132133
val orderCommentsCaption: String? = null,

src/test/kotlin/com/ecwid/apiclient/v3/entity/StoreProfileTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class StoreProfileTest : BaseEntityTest() {
4949
orderCommentsCaption = "orderCommentsCaption",
5050
orderCommentsRequired = true,
5151
hideOutOfStockProductsInStorefront = true,
52+
highlightCompositeProductsOnStorefront = true,
5253
askCompanyName = true,
5354
favoritesEnabled = true,
5455
defaultProductSortOrder = UpdatedStoreProfile.ProductSortOrder.NAME_ASC,

src/test/kotlin/com/ecwid/apiclient/v3/rule/NonnullPropertyRules.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.ecwid.apiclient.v3.dto.coupon.request.UpdatedCoupon
55
import com.ecwid.apiclient.v3.dto.customergroup.request.UpdatedCustomerGroup
66
import com.ecwid.apiclient.v3.dto.product.request.UpdatedProduct
77
import com.ecwid.apiclient.v3.dto.profile.request.UpdatedStoreProfile
8+
import com.ecwid.apiclient.v3.dto.profile.result.FetchedStoreProfile
89
import com.ecwid.apiclient.v3.dto.storage.request.UpdatedStorageData
910
import com.ecwid.apiclient.v3.dto.variation.request.UpdatedVariation
1011
import com.ecwid.apiclient.v3.rule.NonnullPropertyRule.AllowNonnull
@@ -56,6 +57,7 @@ val nonnullPropertyRules: List<NonnullPropertyRule<*, *>> = listOf(
5657
AllowNonnull(UpdatedStoreProfile.ProductFiltersSettings::filterSections),
5758
AllowNonnull(UpdatedVariation.RecurringChargeSettings::recurringInterval),
5859
AllowNonnull(UpdatedVariation.RecurringChargeSettings::recurringIntervalCount),
60+
AllowNonnull(FetchedStoreProfile.Settings::highlightCompositeProductsOnStorefront),
5961
)
6062

6163
sealed class NonnullPropertyRule<T, R>(

0 commit comments

Comments
 (0)