diff --git a/README.md b/README.md index b785d0a..0ff21e7 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Add this dependency to your project's POM: com.postfinancecheckout postfinancecheckout-java-sdk - 2.2.24 + 2.2.25 compile ``` @@ -33,7 +33,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "com.postfinancecheckout:postfinancecheckout-java-sdk:2.2.24" +compile "com.postfinancecheckout:postfinancecheckout-java-sdk:2.2.25" ``` ### Others @@ -46,7 +46,7 @@ mvn clean package Then manually install the following JARs: -* `target/postfinancecheckout-java-sdk-2.2.24.jar` +* `target/postfinancecheckout-java-sdk-2.2.25.jar` * `target/lib/*.jar` ## Usage diff --git a/build.gradle b/build.gradle index 79dcd80..e89ebd4 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'idea' apply plugin: 'eclipse' group = 'com.postfinancecheckout' -version = '2.2.24' +version = '2.2.25' buildscript { repositories { diff --git a/build.sbt b/build.sbt index 0cc38e4..862de46 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "com.postfinancecheckout", name := "postfinancecheckout-java-sdk", - version := "2.2.24", + version := "2.2.25", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), javacOptions in compile ++= Seq("-Xlint:deprecation"), diff --git a/pom.xml b/pom.xml index c5222c4..73bb5de 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ postfinancecheckout-java-sdk jar postfinancecheckout-java-sdk - 2.2.24 + 2.2.25 https://www.postfinance.ch/checkout The SDK for simplifying the integration with PostFinance Checkout API. diff --git a/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminal.java b/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminal.java index eef8d0d..f932d19 100644 --- a/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminal.java +++ b/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminal.java @@ -45,6 +45,10 @@ public class PaymentTerminal { protected PaymentTerminalConfigurationVersion configurationVersion = null; + @JsonProperty("defaultCurrency") + protected String defaultCurrency = null; + + @JsonProperty("id") protected Long id = null; @@ -92,6 +96,16 @@ public PaymentTerminalConfigurationVersion getConfigurationVersion() { } + /** + * + * @return defaultCurrency + **/ + @ApiModelProperty(value = "") + public String getDefaultCurrency() { + return defaultCurrency; + } + + /** * The ID is the primary key of the entity. The ID identifies the entity uniquely. * @return id @@ -193,6 +207,7 @@ public boolean equals(java.lang.Object o) { } PaymentTerminal paymentTerminal = (PaymentTerminal) o; return Objects.equals(this.configurationVersion, paymentTerminal.configurationVersion) && + Objects.equals(this.defaultCurrency, paymentTerminal.defaultCurrency) && Objects.equals(this.id, paymentTerminal.id) && Objects.equals(this.identifier, paymentTerminal.identifier) && Objects.equals(this.linkedSpaceId, paymentTerminal.linkedSpaceId) && @@ -206,7 +221,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(configurationVersion, id, identifier, linkedSpaceId, locationVersion, name, plannedPurgeDate, state, type, version); + return Objects.hash(configurationVersion, defaultCurrency, id, identifier, linkedSpaceId, locationVersion, name, plannedPurgeDate, state, type, version); } @@ -216,6 +231,7 @@ public String toString() { sb.append("class PaymentTerminal {\n"); sb.append(" configurationVersion: ").append(toIndentedString(configurationVersion)).append("\n"); + sb.append(" defaultCurrency: ").append(toIndentedString(defaultCurrency)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" identifier: ").append(toIndentedString(identifier)).append("\n"); sb.append(" linkedSpaceId: ").append(toIndentedString(linkedSpaceId)).append("\n"); diff --git a/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminalConfigurationVersion.java b/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminalConfigurationVersion.java index ca7c389..38611e5 100644 --- a/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminalConfigurationVersion.java +++ b/src/main/java/com/postfinancecheckout/sdk/model/PaymentTerminalConfigurationVersion.java @@ -57,6 +57,10 @@ public class PaymentTerminalConfigurationVersion { protected OffsetDateTime createdOn = null; + @JsonProperty("defaultCurrency") + protected String defaultCurrency = null; + + @JsonProperty("id") protected Long id = null; @@ -134,6 +138,16 @@ public OffsetDateTime getCreatedOn() { } + /** + * The currency is derived by default from the terminal location. By setting a specific currency the derived currency is overridden. + * @return defaultCurrency + **/ + @ApiModelProperty(value = "The currency is derived by default from the terminal location. By setting a specific currency the derived currency is overridden.") + public String getDefaultCurrency() { + return defaultCurrency; + } + + /** * The ID is the primary key of the entity. The ID identifies the entity uniquely. * @return id @@ -238,6 +252,7 @@ public boolean equals(java.lang.Object o) { Objects.equals(this.connectorConfigurations, paymentTerminalConfigurationVersion.connectorConfigurations) && Objects.equals(this.createdBy, paymentTerminalConfigurationVersion.createdBy) && Objects.equals(this.createdOn, paymentTerminalConfigurationVersion.createdOn) && + Objects.equals(this.defaultCurrency, paymentTerminalConfigurationVersion.defaultCurrency) && Objects.equals(this.id, paymentTerminalConfigurationVersion.id) && Objects.equals(this.linkedSpaceId, paymentTerminalConfigurationVersion.linkedSpaceId) && Objects.equals(this.maintenanceWindowDuration, paymentTerminalConfigurationVersion.maintenanceWindowDuration) && @@ -251,7 +266,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(_configuration, connectorConfigurations, createdBy, createdOn, id, linkedSpaceId, maintenanceWindowDuration, maintenanceWindowStart, plannedPurgeDate, state, timeZone, version, versionAppliedImmediately); + return Objects.hash(_configuration, connectorConfigurations, createdBy, createdOn, defaultCurrency, id, linkedSpaceId, maintenanceWindowDuration, maintenanceWindowStart, plannedPurgeDate, state, timeZone, version, versionAppliedImmediately); } @@ -264,6 +279,7 @@ public String toString() { sb.append(" connectorConfigurations: ").append(toIndentedString(connectorConfigurations)).append("\n"); sb.append(" createdBy: ").append(toIndentedString(createdBy)).append("\n"); sb.append(" createdOn: ").append(toIndentedString(createdOn)).append("\n"); + sb.append(" defaultCurrency: ").append(toIndentedString(defaultCurrency)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" linkedSpaceId: ").append(toIndentedString(linkedSpaceId)).append("\n"); sb.append(" maintenanceWindowDuration: ").append(toIndentedString(maintenanceWindowDuration)).append("\n");