From 1690b2dbede2cc3a9377c24df53c4e8fbfa380c6 Mon Sep 17 00:00:00 2001 From: gandalf Date: Thu, 18 Jun 2026 17:53:35 +0400 Subject: [PATCH 1/4] ECOM-27390 add isWithdrawalRequested to FetchedOrder --- .../com/ecwid/apiclient/v3/dto/order/result/FetchedOrder.kt | 1 + 1 file changed, 1 insertion(+) 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 index d0764579..3d4d308d 100644 --- 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 @@ -128,6 +128,7 @@ data class FetchedOrder( val commercialRelationshipScheme: CommercialRelationshipScheme? = CommercialRelationshipScheme.b2c, val lang: String? = null, val storeCredit: StoreCredit? = null, + val isWithdrawalRequested: Boolean? = null, ) : ApiFetchedDTO, ApiResultDTO { From 81981b99ed4f3558d507d6721a9c0e34a18b0a4c Mon Sep 17 00:00:00 2001 From: gandalf Date: Thu, 18 Jun 2026 18:19:49 +0400 Subject: [PATCH 2/4] ECOM-27390 add isWithdrawalRequested to AllowNullable fetchedOrderNullablePropertyRules --- .../apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt | 1 + 1 file changed, 1 insertion(+) 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 index d2092e0e..f67b44e0 100644 --- a/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt +++ b/src/test/kotlin/com/ecwid/apiclient/v3/rule/nullablepropertyrules/FetchedOrderRules.kt @@ -342,4 +342,5 @@ val fetchedOrderNullablePropertyRules: List> = listOf AllowNullable(FetchedOrder.StoreCreditRedemption::id), AllowNullable(FetchedOrder.StoreCreditRedemption::amount), AllowNullable(FetchedOrder.StoreCreditRedemption::cancelled), + AllowNullable(FetchedOrder::isWithdrawalRequested), ) From 4aa8c3a376d05d01817d2c56f6114d5ae0750722 Mon Sep 17 00:00:00 2001 From: gandalf Date: Thu, 18 Jun 2026 18:51:34 +0400 Subject: [PATCH 3/4] ECOM-27390 add isWithdrawalRequested as ReadOnly to nonUpdatablePropertyRules --- .../com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt b/src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt index de34a183..6a443bc0 100644 --- a/src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt +++ b/src/test/kotlin/com/ecwid/apiclient/v3/rule/NonUpdatablePropertyRules.kt @@ -240,6 +240,7 @@ val nonUpdatablePropertyRules: List> = listOf( ReadOnly(FetchedOrder.OrderItemTax::sourceTaxRateId), ReadOnly(FetchedOrder.OrderItemTax::sourceTaxRateType), ReadOnly(FetchedOrder::shippingLabelAvailableForShipment), + ReadOnly(FetchedOrder::isWithdrawalRequested), ReadOnly(FetchedProductType::id), Ignored(FetchedProductType::googleTaxonomy), From ba3827b5bc078371ee4e0c3feab26c8fbe9cacb2 Mon Sep 17 00:00:00 2001 From: gandalf Date: Thu, 18 Jun 2026 20:41:18 +0400 Subject: [PATCH 4/4] ECOM-27390 fix CartsTest --- src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt b/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt index e5d5838f..290f884f 100644 --- a/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt +++ b/src/test/kotlin/com/ecwid/apiclient/v3/entity/CartsTest.kt @@ -11,7 +11,6 @@ import com.ecwid.apiclient.v3.dto.order.request.UpdatedOrder import com.ecwid.apiclient.v3.util.* import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull -import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test @@ -298,7 +297,7 @@ class CartsTest : BaseEntityTest() { assertEquals(forCalculateItem.price, calculatedItem.price) assertEquals(forCalculateItem.productPrice, calculatedItem.productPrice) assertEquals(0.0, calculatedItem.shipping) - assertNull(calculatedItem.handlingFee) + assertEquals(0.0, calculatedItem.handlingFee) assertEquals(forCalculateItem.fixedShippingRate, calculatedItem.fixedShippingRate) assertEquals( null,