Skip to content

Commit 9fb8199

Browse files
committed
ECOM-7571 Add handlingFee field to items info
`handlingFee` contains breakdown of only handling fee for the item same as `shipping` contains breakdown of only shipping cost
1 parent 9381a8c commit 9fb8199

14 files changed

Lines changed: 17 additions & 0 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ fun FetchedOrder.OrderItem.toUpdated(): UpdatedOrder.OrderItem {
145145
price = price,
146146
productPrice = productPrice,
147147
shipping = shipping,
148+
handlingFee = handlingFee,
148149
tax = tax,
149150
fixedShippingRate = fixedShippingRate,
150151
couponAmount = couponAmount,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ data class OrderForCalculate(
8585
val isCustomerSetPrice: Boolean? = null,
8686
val selectedPrice: SelectedPrice? = null,
8787
val shipping: Double? = null,
88+
val handlingFee: Double? = null,
8889
val tax: Double? = null,
8990
val fixedShippingRate: Double? = null,
9091
val couponAmount: Double? = null,

src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/CalculateOrderDetailsResult.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ data class CalculateOrderDetailsResult(
140140
val priceWithoutTax: Double? = null,
141141
val productPrice: Double? = null,
142142
val shipping: Double? = null,
143+
val handlingFee: Double? = null,
143144
val tax: Double? = null,
144145
val fixedShippingRate: Double? = null,
145146
val couponAmount: Double? = null,

src/main/kotlin/com/ecwid/apiclient/v3/dto/cart/result/FetchedCart.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ data class FetchedCart(
132132
val price: Double? = null,
133133
val productPrice: Double? = null,
134134
val shipping: Double? = null,
135+
val handlingFee: Double? = null,
135136
val tax: Double? = null,
136137
val fixedShippingRate: Double? = null,
137138
val couponAmount: Double? = null,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ data class UpdatedOrder(
153153
val isCustomerSetPrice: Boolean? = null,
154154
val selectedPrice: SelectedPrice? = null,
155155
val shipping: Double? = null,
156+
val handlingFee: Double? = null,
156157
val tax: Double? = null,
157158
val taxable: Boolean? = null,
158159
val fixedShippingRate: Double? = null,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ data class FetchedOrder(
183183
val selectedPrice: SelectedPrice? = null,
184184
val priceWithoutTax: Double? = null,
185185
val shipping: Double? = null,
186+
val handlingFee: Double? = null,
186187
val tax: Double? = null,
187188
val fixedShippingRate: Double? = null,
188189
val couponAmount: Double? = null,

src/main/kotlin/com/ecwid/apiclient/v3/dto/subscriptions/result/FetchedSubscription.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ data class FetchedSubscription(
107107
val price: Double? = null,
108108
val productPrice: Double? = null,
109109
val shipping: Double? = null,
110+
val handlingFee: Double? = null,
110111
val tax: Double? = null,
111112
val fixedShippingRate: Double? = null,
112113

src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.ecwid.apiclient.v3.dto.order.request.UpdatedOrder
1111
import com.ecwid.apiclient.v3.util.*
1212
import org.junit.jupiter.api.Assertions.assertEquals
1313
import org.junit.jupiter.api.Assertions.assertNotNull
14+
import org.junit.jupiter.api.Assertions.assertNull
1415
import org.junit.jupiter.api.BeforeEach
1516
import org.junit.jupiter.api.Disabled
1617
import org.junit.jupiter.api.Test
@@ -86,6 +87,7 @@ class CartsTest : BaseEntityTest() {
8687
assertEquals(orderItem.price, cartItem.price)
8788
assertEquals(orderItem.productPrice, cartItem.productPrice)
8889
assertEquals(orderItem.shipping, cartItem.shipping)
90+
assertEquals(orderItem.handlingFee, cartItem.handlingFee)
8991
assertEquals(orderItem.tax, cartItem.tax)
9092
assertEquals(orderItem.fixedShippingRate, cartItem.fixedShippingRate)
9193
assertEquals(orderItem.couponAmount, cartItem.couponAmount)
@@ -296,6 +298,7 @@ class CartsTest : BaseEntityTest() {
296298
assertEquals(forCalculateItem.price, calculatedItem.price)
297299
assertEquals(forCalculateItem.productPrice, calculatedItem.productPrice)
298300
assertEquals(0.0, calculatedItem.shipping)
301+
assertNull(calculatedItem.handlingFee)
299302
assertEquals(forCalculateItem.fixedShippingRate, calculatedItem.fixedShippingRate)
300303
assertEquals(
301304
null,
@@ -480,6 +483,7 @@ class CartsTest : BaseEntityTest() {
480483
price = 22.2,
481484
productPrice = 33.3,
482485
shipping = 44.4,
486+
handlingFee = 77.7,
483487
tax = 55.5,
484488
fixedShippingRate = 66.6,
485489
couponAmount = 15.0,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ val calculateOrderDetailsResultNullablePropertyRules: List<NullablePropertyRule<
6060
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::selectedOptions),
6161
AllowNullable(CalculateOrderDetailsResult.OrderItem::combinationId),
6262
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::shipping),
63+
AllowNullable(CalculateOrderDetailsResult.OrderItem::handlingFee),
6364
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::shortDescription),
6465
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::sku),
6566
IgnoreNullable(CalculateOrderDetailsResult.OrderItem::tax),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ val fetchedCartNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf(
107107
IgnoreNullable(FetchedCart.OrderItem::selectedOptions),
108108
AllowNullable(FetchedCart.OrderItem::combinationId),
109109
IgnoreNullable(FetchedCart.OrderItem::shipping),
110+
AllowNullable(FetchedCart.OrderItem::handlingFee),
110111
IgnoreNullable(FetchedCart.OrderItem::shortDescription),
111112
IgnoreNullable(FetchedCart.OrderItem::sku),
112113
IgnoreNullable(FetchedCart.OrderItem::tax),

0 commit comments

Comments
 (0)