From aab8c00c67083e00f446f5fd3163560749528fd2 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Tue, 7 Jul 2020 14:42:12 +0200 Subject: [PATCH 1/2] Expose invoice with expired payment --- .../apiclient/dto/model/dto/InvoiceDTO.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/InvoiceDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/InvoiceDTO.java index 68ccb17fa..b3450c7d2 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/InvoiceDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/InvoiceDTO.java @@ -82,6 +82,9 @@ public class InvoiceDTO extends BaseInvoiceDTO @ApiModelProperty( "Currency conversion factors at the invoice's issue" ) private Map currencyConversion; + @ApiModelProperty( "Whether the subscription of the invoice is expired" ) + private Boolean paymentExpired; + /** * @deprecated use {@link #getTotal()} */ @@ -388,6 +391,16 @@ public void setCurrencyConversion( Map currencyConversion ) this.currencyConversion = currencyConversion; } + public Boolean isPaymentExpired() + { + return paymentExpired; + } + + public void setPaymentExpired( Boolean paymentExpired ) + { + this.paymentExpired = paymentExpired; + } + /** * @deprecated by {@code getStatus()} */ From 1f9d3e209f376496cd7406e63fc207ff2809e8b3 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Tue, 7 Jul 2020 16:03:36 +0200 Subject: [PATCH 2/2] Just use a status --- .../apiclient/dto/model/dto/InvoiceDTO.java | 13 ------------- .../apiclient/dto/model/enums/InvoiceStatus.java | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/InvoiceDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/InvoiceDTO.java index b3450c7d2..68ccb17fa 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/InvoiceDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/InvoiceDTO.java @@ -82,9 +82,6 @@ public class InvoiceDTO extends BaseInvoiceDTO @ApiModelProperty( "Currency conversion factors at the invoice's issue" ) private Map currencyConversion; - @ApiModelProperty( "Whether the subscription of the invoice is expired" ) - private Boolean paymentExpired; - /** * @deprecated use {@link #getTotal()} */ @@ -391,16 +388,6 @@ public void setCurrencyConversion( Map currencyConversion ) this.currencyConversion = currencyConversion; } - public Boolean isPaymentExpired() - { - return paymentExpired; - } - - public void setPaymentExpired( Boolean paymentExpired ) - { - this.paymentExpired = paymentExpired; - } - /** * @deprecated by {@code getStatus()} */ diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/InvoiceStatus.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/InvoiceStatus.java index 8b6e9b28c..f00faca37 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/InvoiceStatus.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/InvoiceStatus.java @@ -11,10 +11,11 @@ public enum InvoiceStatus @ApiModelProperty( "Payment will be executed later" ) DELAYED, @ApiModelProperty( "Payment is waiting for user authentication" ) REQUIRES_ACTION, @ApiModelProperty( "Payment is authorized" ) REQUIRES_CAPTURE, + @ApiModelProperty( "Payment expired" ) EXPIRED, @ApiModelProperty( "Payment received" ) PAID; public static InvoiceStatus[] unpaid() { - return new InvoiceStatus[] { PENDING, REQUIRES_ACTION, REQUIRES_CAPTURE, UNPAID }; + return new InvoiceStatus[] { PENDING, REQUIRES_ACTION, REQUIRES_CAPTURE, UNPAID, EXPIRED }; } }