ECWID-152638 OE2: add tax fields to ecwid-java-api-client — added

Ecwid · Feb 13, 2025 · bea3f6b · bea3f6b
1 parent 946ce2b
commit bea3f6b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt b/src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedOrder.kt
@@ -93,6 +93,9 @@ fun FetchedOrder.toUpdated(): UpdatedOrder {
 		paymentReference = paymentReference,
 		loyalty = loyalty?.toUpdated(),
 		customerFiscalCode = customerFiscalCode,
+		electronicInvoicePecEmail = electronicInvoicePecEmail,
+		electronicInvoiceSdiCode = electronicInvoiceSdiCode,
+		commercialRelationshipScheme = commercialRelationshipScheme,
 		lang = lang,
 	)
 }

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
@@ -5,8 +5,10 @@ import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO.ModifyKind
 import com.ecwid.apiclient.v3.dto.common.BaseOrderTax
 import com.ecwid.apiclient.v3.dto.common.OrderedStringToListStringMap
 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.result.FetchedOrder
+import com.ecwid.apiclient.v3.jsontransformer.JsonFieldName
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
@@ -97,6 +99,10 @@ data class UpdatedOrder(
 	val paymentReference: String? = null,
 	val loyalty: Loyalty? = null,
 	val customerFiscalCode: String? = null,
+	val electronicInvoicePecEmail: String? = null,
+	val electronicInvoiceSdiCode: String? = null,
+	@JsonFieldName("b2b_b2c")
+	val commercialRelationshipScheme: CommercialRelationshipScheme? = null,
 	val lang: String? = null,
 
 ) : ApiUpdatedDTO {

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
@@ -6,8 +6,10 @@ import com.ecwid.apiclient.v3.dto.common.ApiResultDTO
 import com.ecwid.apiclient.v3.dto.common.ExtendedOrderTax
 import com.ecwid.apiclient.v3.dto.common.OrderedStringToListStringMap
 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.jsontransformer.JsonFieldName
 import java.util.*
 
 data class FetchedOrder(
@@ -119,6 +121,10 @@ data class FetchedOrder(
 	val shippingLabelAvailableForShipment: Boolean = false,
 	val loyalty: Loyalty? = null,
 	val customerFiscalCode: String? = null,
+	val electronicInvoicePecEmail: String? = "",
+	val electronicInvoiceSdiCode: String? = "",
+	@JsonFieldName("b2b_b2c")
+	val commercialRelationshipScheme: CommercialRelationshipScheme? = CommercialRelationshipScheme.b2c,
 	val lang: String? = null,
 
 	) : ApiFetchedDTO, ApiResultDTO {

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt b/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt
@@ -706,6 +706,9 @@ private fun UpdatedOrder.cleanupForComparison(order: UpdatedOrder): UpdatedOrder
 			)
 		},
 		customerFiscalCode = null, // ApiOrder has empty string instead of null
+		electronicInvoicePecEmail = null,
+		electronicInvoiceSdiCode = null,
+		commercialRelationshipScheme = null,
 		discountInfo = order.discountInfo?.map {
 			it.copy(
 				appliesToItems = null

diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt b/src/test/kotlin/com/ecwid/apiclient/v3/entity/OrdersTest.kt
@@ -433,6 +433,9 @@ private fun UpdatedOrder.cleanupForComparison(order: UpdatedOrder): UpdatedOrder
 			item.cleanupForComparison(requestItem)
 		},
 		customerFiscalCode = null, // ApiOrder has empty string instead of null
+		electronicInvoicePecEmail = null,
+		electronicInvoiceSdiCode = null,
+		commercialRelationshipScheme = null,
 		discountInfo = order.discountInfo?.map {
 			it.copy(
 				appliesToItems = null

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
@@ -321,5 +321,8 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
 	AllowNullable(FetchedOrder.LoyaltyRedemption::amount),
 	AllowNullable(FetchedOrder.LoyaltyRedemption::cancelled),
 	AllowNullable(FetchedOrder::customerFiscalCode),
+	AllowNullable(FetchedOrder::electronicInvoicePecEmail),
+	AllowNullable(FetchedOrder::electronicInvoiceSdiCode),
+	AllowNullable(FetchedOrder::commercialRelationshipScheme),
 	AllowNullable(FetchedOrder::lang),
 )