Merge remote-tracking branch 'origin/master' into ECWID-175647

kitty-ecwid · kitty-ecwid · commit 8afe92a82c9c · 2025-11-26T10:51:27.000+04:00
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt
@@ -116,6 +116,7 @@ fun FetchedOrder.DiscountInfo.toUpdated(): UpdatedOrder.DiscountInfo {
 		description = description,
 		appliesToProducts = appliesToProducts,
 		appliesToItems = appliesToItems,
+		membershipId = membershipId,
 	)
 }
 
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/request/OrderForCalculate.kt
@@ -41,6 +41,7 @@ data class OrderForCalculate(
 		val description: String? = null,
 		val appliesToProducts: List<Int>? = null,
 		val appliesToItems: List<Long>? = null,
+		val membershipId: Int? = null,
 	)
 
 	data class OrderItemDiscountInfo(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt
@@ -99,6 +99,7 @@ data class CalculateOrderDetailsResult(
 		val description: String? = null,
 		val appliesToProducts: List<Int>? = null,
 		val appliesToItems: List<Long>? = null,
+		val membershipId: Int? = null,
 	)
 
 	data class OrderItemDiscountInfo(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/customer/request/CustomersSearchRequest.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/customer/request/CustomersSearchRequest.kt
@@ -10,6 +10,7 @@ data class CustomersSearchRequest(
 	val keyword: String? = null,
 	val name: String? = null,
 	val email: String? = null,
+	val useExactEmailMatch: Boolean? = null,
 	val customerGroupId: Int? = null,
 	val usePrecalculatedOrderCount: Boolean? = null,
 	val minOrderCount: Int? = null,
@@ -70,6 +71,7 @@ data class CustomersSearchRequest(
 			request.keyword?.let { put("keyword", it) }
 			request.name?.let { put("name", it) }
 			request.email?.let { put("email", it) }
+			request.useExactEmailMatch?.let { put("useExactEmailMatch", it.toString()) }
 			request.customerGroupId?.let { put("customerGroup", it.toString()) }
 			request.usePrecalculatedOrderCount?.let { put("usePrecalculatedOrderCount", it.toString()) }
 			request.minOrderCount?.let { put("minOrderCount", it.toString()) }
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/customer/result/FetchedCustomer.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/customer/result/FetchedCustomer.kt
@@ -11,6 +11,7 @@ import java.util.*
 
 data class FetchedCustomer(
 	val id: Int = 0,
+	val externalReferenceId: String? = null,
 	val email: String = "",
 	val registered: Date? = null,
 	val updated: Date? = null,
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt
@@ -120,6 +120,7 @@ data class UpdatedOrder(
 		val description: String? = null,
 		val appliesToProducts: List<Int>? = null,
 		val appliesToItems: List<Long>? = null,
+		val membershipId: Int? = null
 	)
 
 	data class DiscountCouponInfo(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt
@@ -143,6 +143,7 @@ data class FetchedOrder(
 		val description: String? = null,
 		val appliesToProducts: List<Int>? = null,
 		val appliesToItems: List<Long>? = null,
+		val membershipId: Int? = null
 	)
 
 	data class DiscountCouponInfo(
@@ -353,6 +354,7 @@ data class FetchedOrder(
 		val scheduled: Boolean? = null,
 		val scheduledTimePrecisionType: ScheduledTimePrecisionType? = null,
 		val timeSlotLengthInMinutes: Int? = null,
+		val discountedShippingRate: Double? = null,
 	)
 
 	data class HandlingFee(
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/producttype/enums/AttributeType.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/producttype/enums/AttributeType.kt
@@ -11,5 +11,13 @@ enum class AttributeType {
 	EBAY,
 	EBAY_REQUIRED,
 	PRICE_PER_UNIT,
-	UNITS_IN_PRODUCT
+	UNITS_IN_PRODUCT,
+	EXTERNAL_EAN,
+	EXTERNAL_ISBN,
+	EXTERNAL_ITF,
+	EXTERNAL_JAN,
+	EXTERNAL_CUSTOM,
+	EXTERNAL_UPC,
+	TAGS, // External for promo sync
+	SUPPLIER, // External for promo sync
 }
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ReportType.kt b/src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ReportType.kt
@@ -45,5 +45,7 @@ enum class ReportType {
 	siteSocialActivity,
 	siteAggregatedActivity,
 	siteGroupActivity,
+	siteGroupActivityNew,
+	siteGroupActivityReturn,
 	siteUniqueNewVisitorsByGroup,
 }
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt
@@ -147,6 +147,7 @@ val nonUpdatablePropertyRules: List<NonUpdatablePropertyRule<*, *>> = listOf(
 	Ignored(FetchedCoupon::updateDate),
 
 	ReadOnly(FetchedCustomer::id),
+	ReadOnly(FetchedCustomer::externalReferenceId),
 	Ignored(FetchedCustomer::registered),
 	Ignored(FetchedCustomer::updated),
 	Ignored(FetchedCustomer::customerGroupName),
@@ -230,6 +231,7 @@ val nonUpdatablePropertyRules: List<NonUpdatablePropertyRule<*, *>> = listOf(
 	ReadOnly(FetchedOrder.ShippingOption::scheduledTimePrecisionType),
 	ReadOnly(FetchedOrder.ShippingOption::timeSlotLengthInMinutes),
 	ReadOnly(FetchedOrder.ShippingOption::pickupPrecisionType),
+	ReadOnly(FetchedOrder.ShippingOption::discountedShippingRate),
 	ReadOnly(FetchedOrder.HandlingFee::valueWithoutTax),
 	ReadOnly(FetchedOrder.Surcharge::totalWithoutTax),
 	Ignored(FetchedOrder::refundedAmount),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CalculateOrderDetailsResultRules.kt
@@ -27,6 +27,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
 	IgnoreNullable(CalculateOrderDetailsResult.DiscountInfo::type),
 	IgnoreNullable(CalculateOrderDetailsResult.DiscountInfo::value),
 	AllowNullable(CalculateOrderDetailsResult.DiscountInfo::appliesToProducts),
+	AllowNullable(CalculateOrderDetailsResult.DiscountInfo::membershipId),
 	AllowNullable(CalculateOrderDetailsResult.DiscountInfo::appliesToItems),
 	IgnoreNullable(CalculateOrderDetailsResult.HandlingFeeInfo::description),
 	IgnoreNullable(CalculateOrderDetailsResult.HandlingFeeInfo::name),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CustomersSearchRequestRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/CustomersSearchRequestRules.kt
@@ -9,6 +9,7 @@ val customersSearchRequestNullablePropertyRules: List<NullablePropertyRule<*, *>
 	AllowNullable(CustomersSearchRequest::createdTo),
 	AllowNullable(CustomersSearchRequest::customerGroupId),
 	AllowNullable(CustomersSearchRequest::email),
+	AllowNullable(CustomersSearchRequest::useExactEmailMatch),
 	AllowNullable(CustomersSearchRequest::keyword),
 	AllowNullable(CustomersSearchRequest::usePrecalculatedOrderCount),
 	AllowNullable(CustomersSearchRequest::maxOrderCount),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCustomerRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedCustomerRules.kt
@@ -7,6 +7,7 @@ import com.ecwid.apiclient.v3.rule.NullablePropertyRule.AllowNullable
 import com.ecwid.apiclient.v3.rule.NullablePropertyRule.IgnoreNullable
 
 val fetchedCustomerNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
+	AllowNullable(FetchedCustomer::externalReferenceId),
 	IgnoreNullable(FetchedCustomer::acceptMarketing),
 	IgnoreNullable(FetchedCustomer::billingPerson),
 	IgnoreNullable(FetchedCustomer::customerGroupId),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt
@@ -44,6 +44,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	IgnoreNullable(FetchedOrder.DiscountInfo::type),
 	IgnoreNullable(FetchedOrder.DiscountInfo::value),
 	AllowNullable(FetchedOrder.DiscountInfo::appliesToProducts),
+	AllowNullable(FetchedOrder.DiscountInfo::membershipId),
 	AllowNullable(FetchedOrder.DiscountInfo::appliesToItems),
 	AllowNullable(FetchedOrder.ExtraFieldsInfo::customerInputType),
 	AllowNullable(FetchedOrder.ExtraFieldsInfo::id),
@@ -191,6 +192,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	AllowNullable(FetchedOrder.ShippingOption::scheduledTimePrecisionType),
 	AllowNullable(FetchedOrder.ShippingOption::timeSlotLengthInMinutes),
 	AllowNullable(FetchedOrder.ShippingOption::pickupPrecisionType),
+	AllowNullable(FetchedOrder.ShippingOption::discountedShippingRate),
 	AllowNullable(FetchedOrder.ShippingServiceInfo::carrier),
 	AllowNullable(FetchedOrder.ShippingServiceInfo::carrierName),
 	AllowNullable(FetchedOrder.ShippingServiceInfo::carrierServiceCode),
diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/OrderForCalculateRules.kt
@@ -55,6 +55,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
 	IgnoreNullable(OrderForCalculate.DiscountInfo::type),
 	IgnoreNullable(OrderForCalculate.DiscountInfo::value),
 	AllowNullable(OrderForCalculate.DiscountInfo::appliesToProducts),
+	AllowNullable(OrderForCalculate.DiscountInfo::membershipId),
 	AllowNullable(OrderForCalculate.DiscountInfo::appliesToItems),
 	AllowNullable(OrderForCalculate.HandlingFee::description),
 	AllowNullable(OrderForCalculate.HandlingFee::name),

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ fun FetchedOrder.DiscountInfo.toUpdated(): UpdatedOrder.DiscountInfo {`
`116`	`116`	`description = description,`
`117`	`117`	`appliesToProducts = appliesToProducts,`
`118`	`118`	`appliesToItems = appliesToItems,`
	`119`	`+ membershipId = membershipId,`
`119`	`120`	`)`
`120`	`121`	`}`
`121`	`122`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ data class OrderForCalculate(`
`41`	`41`	`val description: String? = null,`
`42`	`42`	`val appliesToProducts: List<Int>? = null,`
`43`	`43`	`val appliesToItems: List<Long>? = null,`
	`44`	`+ val membershipId: Int? = null,`
`44`	`45`	`)`
`45`	`46`
`46`	`47`	`data class OrderItemDiscountInfo(`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ data class CalculateOrderDetailsResult(`
`99`	`99`	`val description: String? = null,`
`100`	`100`	`val appliesToProducts: List<Int>? = null,`
`101`	`101`	`val appliesToItems: List<Long>? = null,`
	`102`	`+ val membershipId: Int? = null,`
`102`	`103`	`)`
`103`	`104`
`104`	`105`	`data class OrderItemDiscountInfo(`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ data class UpdatedOrder(`
`120`	`120`	`val description: String? = null,`
`121`	`121`	`val appliesToProducts: List<Int>? = null,`
`122`	`122`	`val appliesToItems: List<Long>? = null,`
	`123`	`+ val membershipId: Int? = null`
`123`	`124`	`)`
`124`	`125`
`125`	`126`	`data class DiscountCouponInfo(`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ data class FetchedOrder(`
`143`	`143`	`val description: String? = null,`
`144`	`144`	`val appliesToProducts: List<Int>? = null,`
`145`	`145`	`val appliesToItems: List<Long>? = null,`
	`146`	`+ val membershipId: Int? = null`
`146`	`147`	`)`
`147`	`148`
`148`	`149`	`data class DiscountCouponInfo(`
`@@ -353,6 +354,7 @@ data class FetchedOrder(`
`353`	`354`	`val scheduled: Boolean? = null,`
`354`	`355`	`val scheduledTimePrecisionType: ScheduledTimePrecisionType? = null,`
`355`	`356`	`val timeSlotLengthInMinutes: Int? = null,`
	`357`	`+ val discountedShippingRate: Double? = null,`
`356`	`358`	`)`
`357`	`359`
`358`	`360`	`data class HandlingFee(`
Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,7 @@ enum class ReportType {`
`45`	`45`	`siteSocialActivity,`
`46`	`46`	`siteAggregatedActivity,`
`47`	`47`	`siteGroupActivity,`
	`48`	`+ siteGroupActivityNew,`
	`49`	`+ siteGroupActivityReturn,`
`48`	`50`	`siteUniqueNewVisitorsByGroup,`
`49`	`51`	`}`