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

Ecwid · Nov 13, 2024 · a27de08 · a27de08
1 parent de4559d
commit a27de08
Show file tree

Hide file tree

Showing 4 changed files with 18 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,
 	)
 }
 

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? = "",
+	val electronicInvoiceSdiCode: String? = "",
+	@JsonFieldName("b2b_b2c")
+	val commercialRelationshipScheme: CommercialRelationshipScheme = CommercialRelationshipScheme.b2c,
 
 ) : 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,
 
 	) : ApiFetchedDTO, ApiResultDTO {
 

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,4 +321,7 @@ 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),
 )