Skip to content

Commit 4c83f1f

Browse files
authored
Merge pull request #269 from Ecwid/payment_status_as_list
Convert order payment staus field to list
2 parents 98f1eb0 + f5b11ef commit 4c83f1f

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ data class OrdersSearchRequest(
2424
val email: String? = null,
2525
val paymentMethod: String? = null,
2626
val shippingMethod: String? = null,
27-
val paymentStatus: OrderPaymentStatus? = null,
27+
val paymentStatus: List<OrderPaymentStatus>? = null,
2828
val fulfillmentStatus: OrderFulfillmentStatus? = null,
2929
val subscriptionIds: List<Long>? = null,
3030
val pickupTimeFrom: Date? = null,
@@ -59,7 +59,7 @@ data class OrdersSearchRequest(
5959
request.email?.let { put("email", it) }
6060
request.paymentMethod?.let { put("paymentMethod", it) }
6161
request.shippingMethod?.let { put("shippingMethod", it) }
62-
request.paymentStatus?.let { put("paymentStatus", it.name) }
62+
request.paymentStatus?.let { put("paymentStatus", it.joinToString(",")) }
6363
request.fulfillmentStatus?.let { put("fulfillmentStatus", it.name) }
6464
request.subscriptionIds?.let { put("subscriptionId", it.joinToString(",")) }
6565
request.pickupTimeFrom?.let { put("pickupTimeFrom", TimeUnit.MILLISECONDS.toSeconds(it.time).toString()) }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ class OrdersTest : BaseEntityTest() {
312312

313313
assertOrdersSearch(
314314
positiveOrderNumber = orderCreateResult.id,
315-
positiveSearchRequest = OrdersSearchRequest(paymentStatus = OrderPaymentStatus.AWAITING_PAYMENT),
316-
negativeSearchRequest = OrdersSearchRequest(paymentStatus = OrderPaymentStatus.PAID)
315+
positiveSearchRequest = OrdersSearchRequest(paymentStatus = listOf(OrderPaymentStatus.AWAITING_PAYMENT)),
316+
negativeSearchRequest = OrdersSearchRequest(paymentStatus = listOf(OrderPaymentStatus.PAID))
317317
)
318318

319319
assertOrdersSearch(

0 commit comments

Comments
 (0)