diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbcd31e..995f61d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
# Changelog
All notable changes to this project will be documented in this file.
+## [3.1.8]
+- Updated `APIResponse.xsd` to include `DeviceId`, replaced `DeviceInfo` and `GeolocationInfo` in `CustomerInfo` with `DeviceId` retrieved from `BrowserData`
+
## [3.1.8]
- Updated `APIResponse.xsd` to include `DeviceInfo` and `GeolocationInfo`
diff --git a/build.gradle b/build.gradle
index e8b6cfb..271e72a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
group = 'com.altapay'
-version = '3.1.8'
+version = '3.1.9'
repositories {
mavenCentral()
diff --git a/readme.md b/readme.md
index 60df22b..09d1647 100644
--- a/readme.md
+++ b/readme.md
@@ -49,12 +49,12 @@ For integrating Java projects with the AltaPay gateway.
com.altapay
sdk-java
- 3.1.8
+ 3.1.9
### Gradle
- implementation 'com.altapay:sdk-java:3.1.8'
+ implementation 'com.altapay:sdk-java:3.1.9'
## Changelog
diff --git a/src/main/java/com/pensio/api/PensioMerchantAPI.java b/src/main/java/com/pensio/api/PensioMerchantAPI.java
index 5555492..b1856ce 100644
--- a/src/main/java/com/pensio/api/PensioMerchantAPI.java
+++ b/src/main/java/com/pensio/api/PensioMerchantAPI.java
@@ -606,30 +606,7 @@ private void setCustomerInfo(HashMap params, CustomerInfo custom
addParam(params, String.format("%s[shipping_postal]",groupTag), customerInfo.getShippingAddress().getPostal());
addParam(params, String.format("%s[shipping_region]",groupTag), customerInfo.getShippingAddress().getRegion());
}
- if(customerInfo.getDeviceInfo() != null)
- {
- DeviceInfo deviceInfo = customerInfo.getDeviceInfo();
- addParam(params, String.format("%s[device_id]", groupTag), deviceInfo.getDeviceId());
- addParam(params, String.format("%s[device_type]", groupTag), deviceInfo.getDeviceType());
- addParam(params, String.format("%s[operating_system]", groupTag), deviceInfo.getOperatingSystem());
- }
- if(customerInfo.getGeolocationInfo() != null)
- {
- GeolocationInfo geoInfo = customerInfo.getGeolocationInfo();
- addParam(params, String.format("%s[country_code]", groupTag), geoInfo.getCountryCode());
- addParam(params, String.format("%s[country_name]", groupTag), geoInfo.getCountryName());
- addParam(params, String.format("%s[state]", groupTag), geoInfo.getState());
- addParam(params, String.format("%s[city]", groupTag), geoInfo.getCity());
- addParam(params, String.format("%s[zip_code]", groupTag), geoInfo.getZipCode());
- if(geoInfo.getLatitude() != null)
- {
- addParam(params, String.format("%s[latitude]", groupTag), String.valueOf(geoInfo.getLatitude()));
- }
- if(geoInfo.getLongitude() != null)
- {
- addParam(params, String.format("%s[longitude]", groupTag), String.valueOf(geoInfo.getLongitude()));
- }
- }
+ addParam(params, String.format("%s[device_id]", groupTag), customerInfo.getDeviceId());
}
private void addOrderLines(String prepend, HashMap params, List orderLines)
diff --git a/src/main/java/com/pensio/api/PensioProcessorAPI.java b/src/main/java/com/pensio/api/PensioProcessorAPI.java
index e05934b..0d5330f 100644
--- a/src/main/java/com/pensio/api/PensioProcessorAPI.java
+++ b/src/main/java/com/pensio/api/PensioProcessorAPI.java
@@ -121,6 +121,8 @@ public void addCustomerInfoParams(PaymentReservationRequest paymentRequest, Hash
addParam(params, "customer_info[billing_postal]", billingAddress.getPostal());
addParam(params, "customer_info[billing_country]", billingAddress.getCountry());
+ addParam(params, "customer_info[device_id]", customerInfo.getDeviceId());
+
BrowserData browserData = customerInfo.getBrowserData();
addParam(params, "customer_info[client_time_zone]", browserData.getTimeZone());
addParam(params, "customer_info[client_javascript_enabled]", browserData.getJavascriptEnabled());
diff --git a/src/main/java/com/pensio/api/request/BrowserData.java b/src/main/java/com/pensio/api/request/BrowserData.java
index dcd4ea6..d52c080 100644
--- a/src/main/java/com/pensio/api/request/BrowserData.java
+++ b/src/main/java/com/pensio/api/request/BrowserData.java
@@ -12,7 +12,6 @@ public class BrowserData {
private String userAgent;
private String accept;
private String acceptLanguage;
-
public String getTimeZone() {
return timeZone;
}
@@ -92,4 +91,5 @@ public String getAcceptLanguage() {
public void setAcceptLanguage(String acceptLanguage) {
this.acceptLanguage = acceptLanguage;
}
+
}
diff --git a/src/main/java/com/pensio/api/request/CustomerInfo.java b/src/main/java/com/pensio/api/request/CustomerInfo.java
index 0edcfaa..0881dc1 100644
--- a/src/main/java/com/pensio/api/request/CustomerInfo.java
+++ b/src/main/java/com/pensio/api/request/CustomerInfo.java
@@ -21,8 +21,7 @@ public class CustomerInfo
private CustomerInfoAddress billingAddress;
private CustomerInfoAddress shippingAddress;
private BrowserData browserData;
- private DeviceInfo deviceInfo;
- private GeolocationInfo geolocationInfo;
+ private String deviceId;
public String getOrganisationNumber()
{
@@ -183,21 +182,12 @@ public void setOrganisationVatId(String organisationVatId) {
this.organisationVatId = organisationVatId;
}
- public DeviceInfo getDeviceInfo() {
- return deviceInfo;
- }
-
- public CustomerInfo setDeviceInfo(DeviceInfo deviceInfo) {
- this.deviceInfo = deviceInfo;
- return this;
- }
-
- public GeolocationInfo getGeolocationInfo() {
- return geolocationInfo;
- }
+ public String getDeviceId() {
+ return deviceId;
+ }
- public CustomerInfo setGeolocationInfo(GeolocationInfo geolocationInfo) {
- this.geolocationInfo = geolocationInfo;
- return this;
- }
+ public CustomerInfo setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ return this;
+ }
}
diff --git a/src/main/java/com/pensio/api/request/DeviceInfo.java b/src/main/java/com/pensio/api/request/DeviceInfo.java
deleted file mode 100644
index 0c2453b..0000000
--- a/src/main/java/com/pensio/api/request/DeviceInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.pensio.api.request;
-
-public class DeviceInfo {
-
- private String deviceId;
- private String deviceType;
- private String operatingSystem;
-
- public String getDeviceId() {
- return deviceId;
- }
-
- public void setDeviceId(String deviceId) {
- this.deviceId = deviceId;
- }
-
- public String getDeviceType() {
- return deviceType;
- }
-
- public void setDeviceType(String deviceType) {
- this.deviceType = deviceType;
- }
-
- public String getOperatingSystem() {
- return operatingSystem;
- }
-
- public void setOperatingSystem(String operatingSystem) {
- this.operatingSystem = operatingSystem;
- }
-}
diff --git a/src/main/java/com/pensio/api/request/GeolocationInfo.java b/src/main/java/com/pensio/api/request/GeolocationInfo.java
deleted file mode 100644
index 8ac9825..0000000
--- a/src/main/java/com/pensio/api/request/GeolocationInfo.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.pensio.api.request;
-
-public class GeolocationInfo {
-
- private String countryCode;
- private String countryName;
- private String state;
- private String city;
- private String zipCode;
- private Double latitude;
- private Double longitude;
-
- public String getCountryCode() {
- return countryCode;
- }
-
- public void setCountryCode(String countryCode) {
- this.countryCode = countryCode;
- }
-
- public String getCountryName() {
- return countryName;
- }
-
- public void setCountryName(String countryName) {
- this.countryName = countryName;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getCity() {
- return city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getZipCode() {
- return zipCode;
- }
-
- public void setZipCode(String zipCode) {
- this.zipCode = zipCode;
- }
-
- public Double getLatitude() {
- return latitude;
- }
-
- public void setLatitude(Double latitude) {
- this.latitude = latitude;
- }
-
- public Double getLongitude() {
- return longitude;
- }
-
- public void setLongitude(Double longitude) {
- this.longitude = longitude;
- }
-}
diff --git a/src/main/resources/xsd/APIResponse.xsd b/src/main/resources/xsd/APIResponse.xsd
index a6e6fda..6a6480f 100644
--- a/src/main/resources/xsd/APIResponse.xsd
+++ b/src/main/resources/xsd/APIResponse.xsd
@@ -721,28 +721,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-