Skip to content

Commit

Permalink
Merge branch 'develop' into #46-Cannot-list-payments-due-to-geolocation
Browse files Browse the repository at this point in the history
  • Loading branch information
andrederoos authored Jan 2, 2018
2 parents bb02f22 + c4bf2ef commit 8f4d35a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ public class MasterCardAction extends BunqModel {
*/
private static final String OBJECT_TYPE = "MasterCardAction";

/**
* The id of the MastercardAction.
*/
@Expose
@SerializedName("id")
private Integer id;

/**
* The id of the monetary account this action links to.
*/
Expand Down Expand Up @@ -227,6 +234,17 @@ public static BunqResponse<List<MasterCardAction>> list(ApiContext apiContext, I
return fromJsonList(MasterCardAction.class, responseRaw, OBJECT_TYPE);
}

/**
* The id of the MastercardAction.
*/
public Integer getId() {
return this.id;
}

public void setId(Integer id) {
this.id = id;
}

/**
* The id of the monetary account this action links to.
*/
Expand Down Expand Up @@ -484,6 +502,10 @@ public void setEligibleWhitelistId(Integer eligibleWhitelistId) {
/**
*/
public boolean isAllFieldNull() {
if (this.id != null) {
return false;
}

if (this.monetaryAccountId != null) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class ShareInviteBankResponse extends BunqModel {
private String status;

/**
* The share type: STANDARD.
* The share type, either STANDARD or MUTUAL.
*/
@Expose
@SerializedName("share_type")
Expand Down Expand Up @@ -232,7 +232,7 @@ public void setStatus(String status) {
}

/**
* The share type: STANDARD.
* The share type, either STANDARD or MUTUAL.
*/
public String getShareType() {
return this.shareType;
Expand Down

0 comments on commit 8f4d35a

Please sign in to comment.