Merge remote-tracking branch 'origin/master'

Author: mamirovlspeed

build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
 
 	api("com.google.code.gson:gson:2.10")
 	api("org.apache.httpcomponents:httpclient:4.5.13")
+	api("org.apache.httpcomponents.client5:httpclient5:5.5")
 	api("io.prometheus:prometheus-metrics-core:1.1.0")
 
 	testImplementation(kotlin("test"))
@@ -206,6 +207,8 @@ nexusPublishing {
 			useStaging.set(!project.isSnapshotVersion())
 			packageGroup.set(PublicationSettings.STAGING_PACKAGE_GROUP)
 			stagingProfileId.set(PublicationSettings.STAGING_PROFILE_ID)
+			nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+			snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
 			username.set(settingsProvider.ossrhUsername)
 			password.set(settingsProvider.ossrhPassword)
 		}
@@ -251,12 +254,6 @@ fun printFinalReleaseNote(groupId: String, artifactId: String, sanitizedVersion:
 	println("Discover on Maven Central:")
 	println("	https://repo1.maven.org/maven2/${groupId.replace('.', '/')}/$artifactId/")
 	println()
-	println("Edit or delete artifacts on OSS Nexus Repository Manager:")
-	println("	https://oss.sonatype.org/#nexus-search;gav~$groupId~~~~")
-	println()
-	println("Control staging repositories on OSS Nexus Repository Manager:")
-	println("	https://oss.sonatype.org/#stagingRepositories")
-	println()
 	println("========================================================")
 	println()
 }
@@ -271,10 +268,7 @@ fun printDevSnapshotReleaseNote(groupId: String, artifactId: String, sanitizedVe
 	println("	version: $sanitizedVersion")
 	println()
 	println("Discover on Maven Central:")
-	println("	https://oss.sonatype.org/content/groups/public/${groupId.replace('.', '/')}/$artifactId/")
-	println()
-	println("Edit or delete artifacts on OSS Nexus Repository Manager:")
-	println("	https://oss.sonatype.org/#nexus-search;gav~$groupId~~~~")
+	println("	https://central.sonatype.com/repository/maven-snapshots/${groupId.replace('.', '/')}/$artifactId/$sanitizedVersion/maven-metadata.xml")
 	println()
 	println("========================================================")
 	println()

src/main/kotlin/com/ecwid/apiclient/v3/ApiClient.kt

@@ -24,6 +24,8 @@ import com.ecwid.apiclient.v3.dto.customer.request.*
 import com.ecwid.apiclient.v3.dto.customer.result.*
 import com.ecwid.apiclient.v3.dto.customergroup.request.*
 import com.ecwid.apiclient.v3.dto.customergroup.result.*
+import com.ecwid.apiclient.v3.dto.images.request.ImagesMainColorsRequest
+import com.ecwid.apiclient.v3.dto.images.result.FetchedImagesMainColorsResult
 import com.ecwid.apiclient.v3.dto.instantsite.redirects.request.*
 import com.ecwid.apiclient.v3.dto.instantsite.redirects.result.*
 import com.ecwid.apiclient.v3.dto.productreview.request.*
@@ -50,6 +52,7 @@ import com.ecwid.apiclient.v3.dto.variation.result.*
 import com.ecwid.apiclient.v3.httptransport.HttpTransport
 import com.ecwid.apiclient.v3.impl.*
 import com.ecwid.apiclient.v3.jsontransformer.JsonTransformerProvider
+import java.io.Closeable
 import kotlin.reflect.KClass
 
 open class ApiClient private constructor(
@@ -76,6 +79,7 @@ open class ApiClient private constructor(
 	productReviewsApiClient: ProductReviewsApiClientImpl,
 	storeExtrafieldsApiClient: StoreExtrafieldsApiClientImpl,
 	swatchesApiClient: SwatchesApiClientImpl,
+	imagesApiClient: ImagesApiClientImpl,
 ) :
 	StoreProfileApiClient by storeProfileApiClient,
 	BrandsApiClient by brandsApiClient,
@@ -98,7 +102,9 @@ open class ApiClient private constructor(
 	SlugInfoApiClient by slugInfoApiClient,
 	ProductReviewsApiClient by productReviewsApiClient,
 	StoreExtrafieldsApiClient by storeExtrafieldsApiClient,
-	SwatchesApiClient by swatchesApiClient {
+	SwatchesApiClient by swatchesApiClient,
+	ImagesApiClient by imagesApiClient,
+	Closeable {
 
 	constructor(apiClientHelper: ApiClientHelper) : this(
 		apiClientHelper = apiClientHelper,
@@ -124,8 +130,13 @@ open class ApiClient private constructor(
 		productReviewsApiClient = ProductReviewsApiClientImpl(apiClientHelper),
 		storeExtrafieldsApiClient = StoreExtrafieldsApiClientImpl(apiClientHelper),
 		swatchesApiClient = SwatchesApiClientImpl(apiClientHelper),
+		imagesApiClient = ImagesApiClientImpl(apiClientHelper),
 	)
 
+	override fun close() {
+		apiClientHelper.httpTransport.close()
+	}
+
 	companion object {
 
 		fun create(
@@ -326,3 +337,7 @@ interface ProductReviewsApiClient {
 interface SwatchesApiClient {
 	fun getRecentSwatchColors(request: RecentSwatchColorsGetRequest): FetchedSwatchColorsResult
 }
+
+interface ImagesApiClient {
+	fun getImagesMainColors(request: ImagesMainColorsRequest): FetchedImagesMainColorsResult
+}

src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt

@@ -14,6 +14,7 @@ data class OrderForCalculate(
 	val customerTaxExempt: Boolean? = null,
 	val customerTaxId: String? = null,
 	val reversedTaxApplied: Boolean? = null,
+	val taxAlreadyDeductedFromShipping: Boolean? = null,
 	val discountCoupon: DiscountCouponInfo? = null,
 	val items: List<OrderItem>? = null,
 	val billingPerson: PersonInfo? = null,
@@ -78,7 +79,10 @@ data class OrderForCalculate(
 
 		val price: Double? = null,
 		val productPrice: Double? = null,
+		val taxAlreadyDeductedFromPrice: Boolean? = null,
 		val needCalculateWholesalePrice: Boolean? = null,
+		val isCustomerSetPrice: Boolean? = null,
+		val selectedPrice: SelectedPrice? = null,
 		val shipping: Double? = null,
 		val tax: Double? = null,
 		val fixedShippingRate: Double? = null,
@@ -275,4 +279,8 @@ data class OrderForCalculate(
 	data class PaymentOption(
 		val paymentId: String? = null,
 	)
+
+	data class SelectedPrice(
+		val value: Double? = null
+	)
 }

src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt

@@ -136,6 +136,7 @@ data class CalculateOrderDetailsResult(
 		val categoryId: Int? = null,
 
 		val price: Double? = null,
+		val priceWithoutTax: Double? = null,
 		val productPrice: Double? = null,
 		val shipping: Double? = null,
 		val tax: Double? = null,

src/main/kotlin/com/ecwid/apiclient/v3/dto/images/request/ImagesMainColorsRequest.kt

@@ -0,0 +1,27 @@
+package com.ecwid.apiclient.v3.dto.images.request
+
+import com.ecwid.apiclient.v3.dto.ApiRequest
+import com.ecwid.apiclient.v3.dto.common.ApiRequestDTO
+import com.ecwid.apiclient.v3.httptransport.HttpBody
+import com.ecwid.apiclient.v3.impl.RequestInfo
+
+data class ImagesMainColorsRequest(
+	val imagesMainColorsRequest: ImagesMainColorsRequestBody = ImagesMainColorsRequestBody()
+) : ApiRequest {
+	override fun toRequestInfo(): RequestInfo {
+		return RequestInfo.createPostRequest(
+			pathSegments = listOf(
+				"images",
+				"main-colors",
+			),
+			httpBody = HttpBody.JsonBody(
+				obj = imagesMainColorsRequest,
+			)
+		)
+	}
+}
+
+data class ImagesMainColorsRequestBody(
+	val imageUrls: List<String> = emptyList(),
+	val colorsCount: Int = 5,
+) : ApiRequestDTO

src/main/kotlin/com/ecwid/apiclient/v3/dto/images/result/FetchedImagesMainColorsResult.kt

@@ -0,0 +1,12 @@
+package com.ecwid.apiclient.v3.dto.images.result
+
+import com.ecwid.apiclient.v3.dto.common.ApiResultDTO
+
+data class FetchedImagesMainColorsResult(
+	val result: Map<String, FetchedImageMainColors> = emptyMap(),
+) : ApiResultDTO
+
+
+data class FetchedImageMainColors(
+	val colors: List<String> = emptyList(),
+) : ApiResultDTO

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt

@@ -9,6 +9,7 @@ import com.ecwid.apiclient.v3.dto.common.OrderedStringToStringMap
 import com.ecwid.apiclient.v3.dto.customer.enums.CommercialRelationshipScheme
 import com.ecwid.apiclient.v3.dto.order.enums.*
 import com.ecwid.apiclient.v3.dto.order.request.UpdatedOrder
+import com.ecwid.apiclient.v3.dto.productcomponent.result.FetchedProductComponent
 import com.ecwid.apiclient.v3.jsontransformer.JsonFieldName
 import java.util.*
 
@@ -218,7 +219,8 @@ data class FetchedOrder(
 		val externalReferenceId: String? = null,
 		val isPreorder: Boolean? = null,
 		val attributes: List<OrderItemAttributeValue>? = null,
-		val taxClassCode: String? = null
+		val taxClassCode: String? = null,
+		val compositeComponents: List<FetchedProductComponent>? = null,
 	)
 
 	data class RecurringChargeSettings(

src/main/kotlin/com/ecwid/apiclient/v3/dto/product/result/FetchedProduct.kt

@@ -4,6 +4,7 @@ import com.ecwid.apiclient.v3.dto.common.*
 import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO.ModifyKind
 import com.ecwid.apiclient.v3.dto.product.enums.*
 import com.ecwid.apiclient.v3.dto.product.request.UpdatedProduct
+import com.ecwid.apiclient.v3.dto.productcomponent.result.FetchedProductComponent
 import com.ecwid.apiclient.v3.dto.producttype.enums.AttributeType
 import com.ecwid.apiclient.v3.dto.variation.result.FetchedVariation
 import java.util.*
@@ -142,6 +143,7 @@ data class FetchedProduct(
 	val rating: Double? = null,
 	val reviewsModerated: Int? = null,
 	val reviewsPublished: Int? = null,
+	val compositeComponents: List<FetchedProductComponent>? = null,
 ) : ApiFetchedDTO, ApiResultDTO {
 
 	data class BorderInfo(

src/main/kotlin/com/ecwid/apiclient/v3/dto/productcomponent/result/FetchedProductComponent.kt

@@ -0,0 +1,14 @@
+package com.ecwid.apiclient.v3.dto.productcomponent.result
+
+import com.ecwid.apiclient.v3.dto.common.ApiFetchedDTO
+import com.ecwid.apiclient.v3.dto.common.ApiResultDTO
+
+data class FetchedProductComponent(
+	val productId: Long = 0L,
+	val combinationId: Long? = null,
+	val quantity: Int = 0,
+) : ApiFetchedDTO, ApiResultDTO {
+
+	override fun getModifyKind() = ApiFetchedDTO.ModifyKind.ReadOnly
+
+}

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

@@ -446,6 +446,9 @@ data class FetchedStoreProfile(
 		@JsonFieldName("feedback_message_position")
 		val feedbackMessagePosition: String? = null,
 
+		@JsonFieldName("hide_category_block_show_all_enabled_products")
+		val hideCategoryBlockShowAllEnabledProducts: Boolean? = null,
+
 		@JsonFieldName("legal_pages_show_page_links")
 		val legalPagesShowPageLinks: Boolean? = null,
 
@@ -751,6 +754,21 @@ data class FetchedStoreProfile(
 
 		@JsonFieldName("show_signin_link_with_unified_account_page")
 		val showSigninLinkWithUnifiedAccountPage: Boolean? = null,
+
+		@JsonFieldName("swatches_product_option_shape")
+		val swatchesProductOptionShape: String? = null,
+
+		@JsonFieldName("swatches_product_option_size")
+		val swatchesProductOptionSize: String? = null,
+
+		@JsonFieldName("product_details_show_image_alt_text_as_visible_description")
+		val productDetailsShowAltTextAsVisibleAsDescription: Boolean? = null,
+
+		@JsonFieldName("product_filters_orientation")
+		val productFiltersOrientation: String? = null,
+
+		@JsonFieldName("product_list_swatches_product_option_behavior")
+		val productListSwatchesProductOptionBehavior: String? = null,
 	)
 
 	data class ProductFilterItem(