Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion mozu-android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if (hasProperty("teamcity")) {
println "TeamCity build number passed into gradle is " + version
} else {
// Manually insert the version numbers here when building outside of TeamCity
version = '1.9.0-SNAPSHOT'
version = '1.11.0-SNAPSHOT'
}

ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
Expand Down
7 changes: 3 additions & 4 deletions mozu-java-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ archivesBaseName='mozu-api-core'
if (hasProperty("teamcity")) {
version = teamcity["build.number"]
println "TeamCity build number passed into gradle is " + version
}
else {
// Manually insert the version numbers here when building outside of TeamCity
version = '1.9.0-SNAPSHOT'
} else {
// Manually insert the version numbers here when building outside of TeamCity
version = '1.11.0-SNAPSHOT'
}

group='com.mozu'
Expand Down
2 changes: 1 addition & 1 deletion mozu-java-core/src/main/java/com/mozu/api/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

public class Version
{
public final static String API_VERSION = "1.9.14238.0";
public final static String API_VERSION = "1.11.14239.0";
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,19 @@ public class Order implements Serializable
// Default Serial Version UID
private static final long serialVersionUID = 1L;

/**
* If true, the order is exempt from applied sales tax.
*/
protected Boolean isTaxExempt;

public Boolean getIsTaxExempt() {
return this.isTaxExempt;
}

public void setIsTaxExempt(Boolean isTaxExempt) {
this.isTaxExempt = isTaxExempt;
}

protected DateTime acceptedDate;

public DateTime getAcceptedDate() {
Expand Down Expand Up @@ -423,19 +436,6 @@ public void setIsImport(Boolean isImport) {
this.isImport = isImport;
}

/**
* If true, the order is exempt from applied sales tax.
*/
protected Boolean isTaxExempt;

public Boolean getIsTaxExempt() {
return this.isTaxExempt;
}

public void setIsTaxExempt(Boolean isTaxExempt) {
this.isTaxExempt = isTaxExempt;
}

/**
* The total amount of tax applied to items in the order.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,29 @@ public class PaymentGatewayInteraction implements Serializable
// Default Serial Version UID
private static final long serialVersionUID = 1L;

protected String gatewayResponseText;

public String getGatewayResponseText() {
return this.gatewayResponseText;
}

public void setGatewayResponseText(String gatewayResponseText) {
this.gatewayResponseText = gatewayResponseText;
}

/**
* Unique identifier of the gateway transaction associated with the payment interaction.
*/
protected String gatewayTransactionId;

public String getGatewayTransactionId() {
return this.gatewayTransactionId;
}

public void setGatewayTransactionId(String gatewayTransactionId) {
this.gatewayTransactionId = gatewayTransactionId;
}

/**
* If required by the payment gateway, the authorization code of the transaction.
*/
Expand Down Expand Up @@ -84,27 +107,4 @@ public void setGatewayResponseCode(String gatewayResponseCode) {
this.gatewayResponseCode = gatewayResponseCode;
}

protected String gatewayResponseText;

public String getGatewayResponseText() {
return this.gatewayResponseText;
}

public void setGatewayResponseText(String gatewayResponseText) {
this.gatewayResponseText = gatewayResponseText;
}

/**
* Unique identifier of the gateway transaction associated with the payment interaction.
*/
protected String gatewayTransactionId;

public String getGatewayTransactionId() {
return this.gatewayTransactionId;
}

public void setGatewayTransactionId(String gatewayTransactionId) {
this.gatewayTransactionId = gatewayTransactionId;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@ public void setUsages(List<String> usages) {
this.usages = usages;
}

protected List<ViewFields> fields;
public List<ViewFields> getFields() {
return this.fields;
}
public void setFields(List<ViewFields> fields) {
this.fields = fields;
}

protected com.fasterxml.jackson.databind.JsonNode metadata;

public com.fasterxml.jackson.databind.JsonNode getMetadata() {
Expand All @@ -84,4 +76,12 @@ public void setMetadata(com.fasterxml.jackson.databind.JsonNode metadata) {
this.metadata = metadata;
}

protected List<ViewFields> fields;
public List<ViewFields> getFields() {
return this.fields;
}
public void setFields(List<ViewFields> fields) {
this.fields = fields;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,6 @@ public class UserSystemData implements Serializable
// Default Serial Version UID
private static final long serialVersionUID = 1L;

/**
* Date and time when the entity was created, represented in UTC Date/Time.
*/
protected DateTime createdOn;

public DateTime getCreatedOn() {
return this.createdOn;
}

public void setCreatedOn(DateTime createdOn) {
this.createdOn = createdOn;
}

/**
* The number of failed authentication attempts associated with the user.
*/
Expand Down Expand Up @@ -149,4 +136,17 @@ public void setUpdatedOn(DateTime updatedOn) {
this.updatedOn = updatedOn;
}

/**
* Date and time when the entity was created, represented in UTC Date/Time.
*/
protected DateTime createdOn;

public DateTime getCreatedOn() {
return this.createdOn;
}

public void setCreatedOn(DateTime createdOn) {
this.createdOn = createdOn;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,69 +25,6 @@ public class Attribute implements Serializable
// Default Serial Version UID
private static final long serialVersionUID = 1L;

protected Boolean isMultiValued;

public Boolean getIsMultiValued() {
return this.isMultiValued;
}

public void setIsMultiValued(Boolean isMultiValued) {
this.isMultiValued = isMultiValued;
}

protected Boolean isRequired;

public Boolean getIsRequired() {
return this.isRequired;
}

public void setIsRequired(Boolean isRequired) {
this.isRequired = isRequired;
}

protected Boolean isVisible;

public Boolean getIsVisible() {
return this.isVisible;
}

public void setIsVisible(Boolean isVisible) {
this.isVisible = isVisible;
}

/**
* Namespace associated with this extensible attribute.
*/
protected String namespace;

public String getNamespace() {
return this.namespace;
}

public void setNamespace(String namespace) {
this.namespace = namespace;
}

protected Integer order;

public Integer getOrder() {
return this.order;
}

public void setOrder(Integer order) {
this.order = order;
}

protected String valueType;

public String getValueType() {
return this.valueType;
}

public void setValueType(String valueType) {
this.valueType = valueType;
}

/**
* Name of this extensible attribute defined in Mozu Admin.
*/
Expand Down Expand Up @@ -183,6 +120,69 @@ public void setIsActive(Boolean isActive) {
this.isActive = isActive;
}

protected Boolean isMultiValued;

public Boolean getIsMultiValued() {
return this.isMultiValued;
}

public void setIsMultiValued(Boolean isMultiValued) {
this.isMultiValued = isMultiValued;
}

protected Boolean isRequired;

public Boolean getIsRequired() {
return this.isRequired;
}

public void setIsRequired(Boolean isRequired) {
this.isRequired = isRequired;
}

protected Boolean isVisible;

public Boolean getIsVisible() {
return this.isVisible;
}

public void setIsVisible(Boolean isVisible) {
this.isVisible = isVisible;
}

/**
* Namespace associated with this extensible attribute.
*/
protected String namespace;

public String getNamespace() {
return this.namespace;
}

public void setNamespace(String namespace) {
this.namespace = namespace;
}

protected Integer order;

public Integer getOrder() {
return this.order;
}

public void setOrder(Integer order) {
this.order = order;
}

protected String valueType;

public String getValueType() {
return this.valueType;
}

public void setValueType(String valueType) {
this.valueType = valueType;
}

/**
* List of metadata key-value pairs defined for an extensible attribute.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.joda.time.DateTime;
import com.mozu.api.contracts.customer.ContactType;
import com.mozu.api.contracts.core.Address;
import com.mozu.api.contracts.core.AuditInfo;
import com.mozu.api.contracts.core.Phone;
import com.mozu.api.contracts.customer.ContactType;

/**
* Contact information, including the contact's name, address, phone numbers, email addresses, and company (if supplied). Also indicates whether this is a billing, shipping, or billing and shipping contact.
Expand Down Expand Up @@ -135,6 +135,14 @@ public void setMiddleNameOrInitial(String middleNameOrInitial) {
this.middleNameOrInitial = middleNameOrInitial;
}

protected List<ContactType> types;
public List<ContactType> getTypes() {
return this.types;
}
public void setTypes(List<ContactType> types) {
this.types = types;
}

/**
* Address associated with the customer account contact.
*/
Expand Down Expand Up @@ -174,12 +182,4 @@ public void setPhoneNumbers(Phone phoneNumbers) {
this.phoneNumbers = phoneNumbers;
}

protected List<ContactType> types;
public List<ContactType> getTypes() {
return this.types;
}
public void setTypes(List<ContactType> types) {
this.types = types;
}

}
Loading