Merge remote-tracking branch 'origin/master'

Author: mamirovlspeed

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

@@ -104,6 +104,7 @@ fun FetchedStoreProfile.Settings.toUpdated(): UpdatedStoreProfile.Settings {
 		googleRemarketingEnabled = googleRemarketingEnabled,
 		googleTagId = googleTagId,
 		hideOutOfStockProductsInStorefront = hideOutOfStockProductsInStorefront,
+		highlightCompositeProductsOnStorefront = highlightCompositeProductsOnStorefront,
 		openBagOnAddition = openBagOnAddition,
 		orderCommentsCaption = orderCommentsCaption,
 		orderCommentsEnabled = orderCommentsEnabled,
@@ -410,6 +411,7 @@ fun FetchedStoreProfile.DesignSettings.toUpdated(): UpdatedStoreProfile.DesignSe
 		productFiltersVisibleOnCatalogPages = productFiltersVisibleOnCatalogPages,
 		productListBuyNowBehaviour = productListBuyNowBehaviour,
 		productListCardLayout = productListCardLayout,
+		productListCardSpacingType = productListCardSpacingType,
 		productListCategoryCellSpacing = productListCategoryCellSpacing,
 		productListCategoryImageLayout = productListCategoryImageLayout,
 		productListCategoryImagePosition = productListCategoryImagePosition,
@@ -422,6 +424,7 @@ fun FetchedStoreProfile.DesignSettings.toUpdated(): UpdatedStoreProfile.DesignSe
 		productListImageSize = productListImageSize,
 		productListNameBehaviour = productListNameBehaviour,
 		productListPriceBehaviour = productListPriceBehaviour,
+		productListShowPriceRanges = productListShowPriceRanges,
 		productListRatingSectionBehavior = productListRatingSectionBehavior,
 		productListSKUBehaviour = productListSKUBehaviour,
 		productListShowAdditionalImage = productListShowAdditionalImage,

src/main/kotlin/com/ecwid/apiclient/v3/dto/profile/enums/HighlightCompositeProductsOnStorefront.kt

@@ -0,0 +1,6 @@
+package com.ecwid.apiclient.v3.dto.profile.enums
+
+enum class HighlightCompositeProductsOnStorefront {
+	DISABLED,
+	ENABLED,
+}

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

@@ -4,6 +4,7 @@ import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO
 import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO.ModifyKind
 import com.ecwid.apiclient.v3.dto.common.LocalizedValueMap
 import com.ecwid.apiclient.v3.dto.common.ProductCondition
+import com.ecwid.apiclient.v3.dto.profile.enums.HighlightCompositeProductsOnStorefront
 import com.ecwid.apiclient.v3.dto.profile.enums.ProductFilterType
 import com.ecwid.apiclient.v3.dto.profile.result.FetchedStoreProfile
 import com.ecwid.apiclient.v3.jsontransformer.JsonFieldName
@@ -98,6 +99,7 @@ data class UpdatedStoreProfile(
 		val googleRemarketingEnabled: Boolean? = null,
 		val googleTagId: String? = null,
 		val hideOutOfStockProductsInStorefront: Boolean? = null,
+		val highlightCompositeProductsOnStorefront: HighlightCompositeProductsOnStorefront? = null,
 		val orderCommentsCaption: String? = null,
 		val orderCommentsEnabled: Boolean? = null,
 		val orderCommentsRequired: Boolean? = null,
@@ -550,6 +552,9 @@ data class UpdatedStoreProfile(
 		@JsonFieldName("product_list_product_info_layout")
 		val productListCardLayout: String? = null,
 
+		@JsonFieldName("product_list_card_spacing_type")
+		val productListCardSpacingType: String? = null,
+
 		@JsonFieldName("product_list_category_cell_spacing")
 		val productListCategoryCellSpacing: Int? = null,
 
@@ -586,6 +591,9 @@ data class UpdatedStoreProfile(
 		@JsonFieldName("product_list_price_behavior")
 		val productListPriceBehaviour: String? = null,
 
+		@JsonFieldName("product_list_show_price_ranges")
+		val productListShowPriceRanges: Boolean? = null,
+
 		@JsonFieldName("product_list_rating_section_behavior")
 		val productListRatingSectionBehavior: String? = null,
 

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

@@ -5,6 +5,7 @@ import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO.ModifyKind
 import com.ecwid.apiclient.v3.dto.common.ApiResultDTO
 import com.ecwid.apiclient.v3.dto.common.LocalizedValueMap
 import com.ecwid.apiclient.v3.dto.common.ProductCondition
+import com.ecwid.apiclient.v3.dto.profile.enums.HighlightCompositeProductsOnStorefront
 import com.ecwid.apiclient.v3.dto.profile.enums.ProductFilterType
 import com.ecwid.apiclient.v3.dto.profile.request.UpdatedPaymentOption
 import com.ecwid.apiclient.v3.dto.profile.request.UpdatedStoreProfile
@@ -127,6 +128,7 @@ data class FetchedStoreProfile(
 		val googleRemarketingEnabled: Boolean? = null,
 		val googleTagId: String? = null,
 		val hideOutOfStockProductsInStorefront: Boolean? = null,
+		val highlightCompositeProductsOnStorefront: HighlightCompositeProductsOnStorefront = HighlightCompositeProductsOnStorefront.DISABLED,
 		val invoiceLogoUrl: String? = null,
 		val openBagOnAddition: Boolean = false,
 		val orderCommentsCaption: String? = null,
@@ -650,6 +652,9 @@ data class FetchedStoreProfile(
 		@JsonFieldName("product_list_product_info_layout")
 		val productListCardLayout: String? = null,
 
+		@JsonFieldName("product_list_card_spacing_type")
+		val productListCardSpacingType: String? = null,
+
 		@JsonFieldName("product_list_category_cell_spacing")
 		val productListCategoryCellSpacing: Int? = null,
 
@@ -686,6 +691,9 @@ data class FetchedStoreProfile(
 		@JsonFieldName("product_list_price_behavior")
 		val productListPriceBehaviour: String? = null,
 
+		@JsonFieldName("product_list_show_price_ranges")
+		val productListShowPriceRanges: Boolean? = null,
+
 		@JsonFieldName("product_list_rating_section_behavior")
 		val productListRatingSectionBehavior: String? = null,
 

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ReportType.kt

@@ -44,8 +44,11 @@ enum class ReportType {
 	siteActivity,
 	siteSocialActivity,
 	siteAggregatedActivity,
+	siteAggregatedActivityNewAndReturn,
 	siteGroupActivity,
 	siteGroupActivityNew,
 	siteGroupActivityReturn,
 	siteUniqueNewVisitorsByGroup,
+	sitePotentialLeads,
+	siteGroupEngagedActivity,
 }

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

@@ -2,6 +2,7 @@ package com.ecwid.apiclient.v3.entity
 
 import com.ecwid.apiclient.v3.converter.toUpdated
 import com.ecwid.apiclient.v3.dto.common.ProductCondition
+import com.ecwid.apiclient.v3.dto.profile.enums.HighlightCompositeProductsOnStorefront
 import com.ecwid.apiclient.v3.dto.profile.enums.ProductFilterType
 import com.ecwid.apiclient.v3.dto.profile.request.StoreProfileRequest
 import com.ecwid.apiclient.v3.dto.profile.request.StoreProfileUpdateRequest
@@ -49,6 +50,7 @@ class StoreProfileTest : BaseEntityTest() {
 				orderCommentsCaption = "orderCommentsCaption",
 				orderCommentsRequired = true,
 				hideOutOfStockProductsInStorefront = true,
+				highlightCompositeProductsOnStorefront = HighlightCompositeProductsOnStorefront.ENABLED,
 				askCompanyName = true,
 				favoritesEnabled = true,
 				defaultProductSortOrder = UpdatedStoreProfile.ProductSortOrder.NAME_ASC,

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

@@ -5,6 +5,7 @@ import com.ecwid.apiclient.v3.dto.coupon.request.UpdatedCoupon
 import com.ecwid.apiclient.v3.dto.customergroup.request.UpdatedCustomerGroup
 import com.ecwid.apiclient.v3.dto.product.request.UpdatedProduct
 import com.ecwid.apiclient.v3.dto.profile.request.UpdatedStoreProfile
+import com.ecwid.apiclient.v3.dto.profile.result.FetchedStoreProfile
 import com.ecwid.apiclient.v3.dto.storage.request.UpdatedStorageData
 import com.ecwid.apiclient.v3.dto.variation.request.UpdatedVariation
 import com.ecwid.apiclient.v3.rule.NonnullPropertyRule.AllowNonnull
@@ -56,6 +57,7 @@ val nonnullPropertyRules: List<NonnullPropertyRule<*, *>> = listOf(
 	AllowNonnull(UpdatedStoreProfile.ProductFiltersSettings::filterSections),
 	AllowNonnull(UpdatedVariation.RecurringChargeSettings::recurringInterval),
 	AllowNonnull(UpdatedVariation.RecurringChargeSettings::recurringIntervalCount),
+	AllowNonnull(FetchedStoreProfile.Settings::highlightCompositeProductsOnStorefront),
 )
 
 sealed class NonnullPropertyRule<T, R>(

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

@@ -136,6 +136,7 @@ val fetchedStoreProfileNullablePropertyRules: List<NullablePropertyRule<*, *>> =
 	AllowNullable(FetchedStoreProfile.DesignSettings::productFiltersVisibleOnCatalogPages),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListBuyNowBehaviour),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListCardLayout),
+	AllowNullable(FetchedStoreProfile.DesignSettings::productListCardSpacingType),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListCategoryCellSpacing),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListCategoryImageLayout),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListCategoryImagePosition),
@@ -148,6 +149,7 @@ val fetchedStoreProfileNullablePropertyRules: List<NullablePropertyRule<*, *>> =
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListImageSize),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListNameBehaviour),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListPriceBehaviour),
+	AllowNullable(FetchedStoreProfile.DesignSettings::productListShowPriceRanges),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListRatingSectionBehavior),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListSKUBehaviour),
 	AllowNullable(FetchedStoreProfile.DesignSettings::productListShowAdditionalImage),