Skip to content

Commit a6db375

Browse files
committed
ECWID-152638 OE2: add tax fields to ecwid-java-api-client — added
1 parent de4559d commit a6db375

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ fun FetchedOrder.toUpdated(): UpdatedOrder {
9393
paymentReference = paymentReference,
9494
loyalty = loyalty?.toUpdated(),
9595
customerFiscalCode = customerFiscalCode,
96+
electronicInvoicePecEmail = electronicInvoicePecEmail,
97+
electronicInvoiceSdiCode = electronicInvoiceSdiCode,
98+
commercialRelationshipScheme = commercialRelationshipScheme,
9699
)
97100
}
98101

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import com.ecwid.apiclient.v3.dto.common.ApiUpdatedDTO.ModifyKind
55
import com.ecwid.apiclient.v3.dto.common.BaseOrderTax
66
import com.ecwid.apiclient.v3.dto.common.OrderedStringToListStringMap
77
import com.ecwid.apiclient.v3.dto.common.OrderedStringToStringMap
8+
import com.ecwid.apiclient.v3.dto.customer.enums.CommercialRelationshipScheme
89
import com.ecwid.apiclient.v3.dto.order.enums.*
910
import com.ecwid.apiclient.v3.dto.order.result.FetchedOrder
11+
import com.ecwid.apiclient.v3.jsontransformer.JsonFieldName
1012
import java.text.DateFormat
1113
import java.text.SimpleDateFormat
1214
import java.util.*
@@ -97,6 +99,10 @@ data class UpdatedOrder(
9799
val paymentReference: String? = null,
98100
val loyalty: Loyalty? = null,
99101
val customerFiscalCode: String? = null,
102+
val electronicInvoicePecEmail: String? = null,
103+
val electronicInvoiceSdiCode: String? = null,
104+
@JsonFieldName("b2b_b2c")
105+
val commercialRelationshipScheme: CommercialRelationshipScheme? = null,
100106

101107
) : ApiUpdatedDTO {
102108

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ import com.ecwid.apiclient.v3.dto.common.ApiResultDTO
66
import com.ecwid.apiclient.v3.dto.common.ExtendedOrderTax
77
import com.ecwid.apiclient.v3.dto.common.OrderedStringToListStringMap
88
import com.ecwid.apiclient.v3.dto.common.OrderedStringToStringMap
9+
import com.ecwid.apiclient.v3.dto.customer.enums.CommercialRelationshipScheme
910
import com.ecwid.apiclient.v3.dto.order.enums.*
1011
import com.ecwid.apiclient.v3.dto.order.request.UpdatedOrder
12+
import com.ecwid.apiclient.v3.jsontransformer.JsonFieldName
1113
import java.util.*
1214

1315
data class FetchedOrder(
@@ -119,6 +121,10 @@ data class FetchedOrder(
119121
val shippingLabelAvailableForShipment: Boolean = false,
120122
val loyalty: Loyalty? = null,
121123
val customerFiscalCode: String? = null,
124+
val electronicInvoicePecEmail: String? = "",
125+
val electronicInvoiceSdiCode: String? = "",
126+
@JsonFieldName("b2b_b2c")
127+
val commercialRelationshipScheme: CommercialRelationshipScheme? = CommercialRelationshipScheme.b2c,
122128

123129
) : ApiFetchedDTO, ApiResultDTO {
124130

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,4 +321,7 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
321321
AllowNullable(FetchedOrder.LoyaltyRedemption::amount),
322322
AllowNullable(FetchedOrder.LoyaltyRedemption::cancelled),
323323
AllowNullable(FetchedOrder::customerFiscalCode),
324+
AllowNullable(FetchedOrder::electronicInvoicePecEmail),
325+
AllowNullable(FetchedOrder::electronicInvoiceSdiCode),
326+
AllowNullable(FetchedOrder::commercialRelationshipScheme),
324327
)

0 commit comments

Comments
 (0)