Merge remote-tracking branch 'origin/master'

Author: mamirovlspeed

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

@@ -175,6 +175,7 @@ fun FetchedOrder.OrderItem.toUpdated(): UpdatedOrder.OrderItem {
 		discounts = discounts?.map(FetchedOrder.OrderItemDiscounts::toUpdated),
 		externalReferenceId = externalReferenceId,
 		isPreorder = isPreorder,
+		taxClassCode = taxClassCode,
 	)
 }
 

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

@@ -104,7 +104,8 @@ data class OrderForCalculate(
 		val taxes: List<OrderItemTax>? = null,
 		val files: List<OrderItemProductFile>? = null,
 		val dimensions: ProductDimensions? = null,
-		val discounts: List<OrderItemDiscounts>? = null
+		val discounts: List<OrderItemDiscounts>? = null,
+		val taxClassCode: String? = null
 	)
 
 	data class OrderItemOption(

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/UpdatedOrder.kt

@@ -180,6 +180,7 @@ data class UpdatedOrder(
 		val discounts: List<OrderItemDiscounts>? = null,
 		val externalReferenceId: String? = null,
 		val isPreorder: Boolean? = null,
+		val taxClassCode: String? = null,
 	)
 
 	data class OrderItemSelectedOption(

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

@@ -217,7 +217,8 @@ data class FetchedOrder(
 		val discounts: List<OrderItemDiscounts>? = null,
 		val externalReferenceId: String? = null,
 		val isPreorder: Boolean? = null,
-		val attributes: List<OrderItemAttributeValue>? = null
+		val attributes: List<OrderItemAttributeValue>? = null,
+		val taxClassCode: String? = null
 	)
 
 	data class RecurringChargeSettings(

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

@@ -46,4 +46,6 @@ enum class ReportType {
 	siteAddressActivity,
 	siteLocationMapActivity,
 	siteContactWidgetActivity,
+	siteSocialActivity,
+	siteAggregatedActivity,
 }

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

@@ -99,6 +99,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	IgnoreNullable(FetchedOrder.OrderItem::externalReferenceId),
 	AllowNullable(FetchedOrder.OrderItem::isPreorder),
 	AllowNullable(FetchedOrder.OrderItem::attributes),
+	AllowNullable(FetchedOrder.OrderItem::taxClassCode),
 	IgnoreNullable(FetchedOrder.OrderItemDiscounts::discountInfo),
 	IgnoreNullable(FetchedOrder.OrderItemDiscounts::total),
 	AllowNullable(FetchedOrder.OrderItemOptionFile::id),

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

@@ -91,6 +91,7 @@ val orderForCalculateNullablePropertyRules: List<NullablePropertyRule<*, *>> = l
 	IgnoreNullable(OrderForCalculate.OrderItem::taxes),
 	IgnoreNullable(OrderForCalculate.OrderItem::trackQuantity),
 	IgnoreNullable(OrderForCalculate.OrderItem::weight),
+	AllowNullable(OrderForCalculate.OrderItem::taxClassCode),
 	IgnoreNullable(OrderForCalculate.OrderItemDiscountInfo::base),
 	IgnoreNullable(OrderForCalculate.OrderItemDiscountInfo::orderTotal),
 	IgnoreNullable(OrderForCalculate.OrderItemDiscountInfo::type),