Skip to content

Commit 1015563

Browse files
Merge pull request #559 from Ecwid/ECOM-27390
ECOM-27390 add withdrawalRequested to FetchedOrder
2 parents a15e39f + e56c3a1 commit 1015563

4 files changed

Lines changed: 4 additions & 2 deletions

File tree

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
@@ -128,6 +128,7 @@ data class FetchedOrder(
128128
val commercialRelationshipScheme: CommercialRelationshipScheme? = CommercialRelationshipScheme.b2c,
129129
val lang: String? = null,
130130
val storeCredit: StoreCredit? = null,
131+
val withdrawalRequested: Boolean? = null,
131132

132133
) : ApiFetchedDTO, ApiResultDTO {
133134

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ 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
1514
import org.junit.jupiter.api.BeforeEach
1615
import org.junit.jupiter.api.Disabled
1716
import org.junit.jupiter.api.Test
@@ -298,7 +297,7 @@ class CartsTest : BaseEntityTest() {
298297
assertEquals(forCalculateItem.price, calculatedItem.price)
299298
assertEquals(forCalculateItem.productPrice, calculatedItem.productPrice)
300299
assertEquals(0.0, calculatedItem.shipping)
301-
assertNull(calculatedItem.handlingFee)
300+
assertEquals(0.0, calculatedItem.handlingFee)
302301
assertEquals(forCalculateItem.fixedShippingRate, calculatedItem.fixedShippingRate)
303302
assertEquals(
304303
null,

src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ val nonUpdatablePropertyRules: List<NonUpdatablePropertyRule<*, *>> = listOf(
240240
ReadOnly(FetchedOrder.OrderItemTax::sourceTaxRateId),
241241
ReadOnly(FetchedOrder.OrderItemTax::sourceTaxRateType),
242242
ReadOnly(FetchedOrder::shippingLabelAvailableForShipment),
243+
ReadOnly(FetchedOrder::withdrawalRequested),
243244

244245
ReadOnly(FetchedProductType::id),
245246
Ignored(FetchedProductType::googleTaxonomy),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,4 +342,5 @@ val fetchedOrderNullablePropertyRules: List<NullablePropertyRule<*, *>> = listOf
342342
AllowNullable(FetchedOrder.StoreCreditRedemption::id),
343343
AllowNullable(FetchedOrder.StoreCreditRedemption::amount),
344344
AllowNullable(FetchedOrder.StoreCreditRedemption::cancelled),
345+
AllowNullable(FetchedOrder::withdrawalRequested),
345346
)

0 commit comments

Comments
 (0)