Skip to content

Add product termination message #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gionn merged 3 commits into from
Aug 26, 2020
Merged

Add product termination message #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d35ecfe
Add product termination message
malteo Aug 24, 2020
e25b23e
Localize
malteo Aug 25, 2020
7941077
Merge branch 'master' into termination-message
Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ public class ProductDTO extends NamedEntityDTO implements ProductL10nDTO, Compar
@ApiModelProperty( "Require approvation for customer subscriptions" )
private Boolean subscriptionApproval;

@ApiModelProperty( "Message to display to the user on subscription termination" )
@Size( max = 65536, message = INVALID_SIZE )
private String terminationMessage;

@ApiModelProperty( "URL to call for order validation" )
@Size( max = 2000 )
@URL
Expand Down Expand Up @@ -786,6 +790,18 @@ public void setOrderValidationUrl( String orderValidationUrl )
this.orderValidationUrl = orderValidationUrl;
}

@Override
public String getTerminationMessage()
{
return terminationMessage;
}

@Override
public void setTerminationMessage( String terminationMessage )
{
this.terminationMessage = terminationMessage;
}

@Override
public boolean equals( Object o )
{
Expand Down
15 changes: 15 additions & 0 deletions ...nt-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDraftDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public class ProductDraftDTO extends BaseEntityDTO implements ProductL10nDTO
@JsonInclude( JsonInclude.Include.NON_NULL )
private Map<String, String> faq;

@ApiModelProperty( "Message to display to the user on subscription termination" )
private String terminationMessage;

//region Auto-generated code
public UrlEntityDTO getOriginal()
{
Expand Down Expand Up @@ -137,5 +140,17 @@ public void setFaq( Map<String, String> faq )
{
this.faq = faq;
}

@Override
public String getTerminationMessage()
{
return terminationMessage;
}

@Override
public void setTerminationMessage( String terminationMessage )
{
this.terminationMessage = terminationMessage;
}
//endregion
}
4 changes: 4 additions & 0 deletions ...ent-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductL10nDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@ public interface ProductL10nDTO
Map<String, String> getFaq();

void setFaq( Map<String, String> faq );

String getTerminationMessage();

void setTerminationMessage( String terminationMessage );
}