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
14 changes: 14 additions & 0 deletions src/main/java/co/omise/models/Charge.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ public class Charge extends Model {
private List<String> webhookEndpoints;
@JsonProperty("merchant_advice")
private String merchantAdvice;
@JsonProperty("merchant_advice_code")
private String merchantAdviceCode;
@JsonProperty("missing_3ds_fields")
private List<String> missing3DSFields;

public long getAmount() {
return this.amount;
Expand Down Expand Up @@ -238,6 +242,10 @@ public void setFailureMessage(String failureMessage) {
this.failureMessage = failureMessage;
}

public String getMerchantAdviceCode() { return merchantAdviceCode; }

public void setMerchantAdviceCode(String merchantAdviceCode) { this.merchantAdviceCode = merchantAdviceCode; }

public long getFee() {
return this.fee;
}
Expand Down Expand Up @@ -510,6 +518,12 @@ public void setMerchantAdvice(String merchantAdvice) {
this.merchantAdvice = merchantAdvice;
}

public List<String> getMissing3DSFields() { return missing3DSFields; }

public void setMissing3DSFields(List<String> missing3DSFields) {
this.missing3DSFields = missing3DSFields;
}

public static class ListRequestBuilder extends RequestBuilder<ScopedList<Charge>> {
private ScopedList.Options options;

Expand Down
2 changes: 2 additions & 0 deletions src/test/java/co/omise/requests/ChargeRequestTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public void testGet() throws IOException, OmiseException {
assertEquals("thb", charge.getCurrency());
assertEquals("trxn_test_4yq7duwb9jts1vxgqua", charge.getTransaction());
assertEquals("Test advice", charge.getMerchantAdvice());
assertEquals("Test advice code", charge.getMerchantAdviceCode());
assertEquals(Collections.singletonList("email"), charge.getMissing3DSFields());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/co/omise/requests/TokenRequestTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void testCreate() throws IOException, OmiseException {

assertRequested("POST", "/tokens", 200);
assertVaultRequest();
assertRequestBody("{\"card\":{\"city\":\"Bangkok\",\"country\":null,\"name\":\"JOHN DOE\",\"number\":\"4242424242424242\",\"state\":null,\"street1\":null,\"street2\":null,\"email\":\"email@opn.ooo\",\"expiration_month\":9,\"expiration_year\":2025,\"phone_number\":null,\"postal_code\":\"10240\",\"security_code\":\"123\"}}");
assertRequestBody("{\"card\":{\"city\":\"Bangkok\",\"country\":null,\"name\":\"JOHN DOE\",\"number\":\"4242424242424242\",\"state\":null,\"street1\":null,\"street2\":null,\"email\":\"email@opn.ooo\",\"expiration_month\":3,\"expiration_year\":2026,\"phone_number\":null,\"postal_code\":\"10240\",\"security_code\":\"123\"}}");

assertEquals(TOKEN_ID, token.getId());
assertFalse(token.isLiveMode());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,7 @@
"capturable": false,
"reversible": false,
"refundable": false,
"merchant_advice": "Test advice"
"merchant_advice": "Test advice",
"merchant_advice_code": "Test advice code",
"missing_3ds_fields": ["email"]
}