Merging in checkout-ach-support branch

Author: Jacob Kessler

.gitignore

@@ -11,3 +11,8 @@ build.xml
 sources.txt
 test
 /target/
+
+# IDE files #
+#############
+.idea/
+*.iml

CHANGELOG

@@ -1,3 +1,7 @@
+2016-04-15
+* Released v5.1.0, updating API support to 2016-03-30
+* Added support for several new data fields in /checkout: payment_error, non-profit org data, and bank information for ACH payments
+
 2016-01-25
 * Released v5.0.0 (includes changes from v4.0.4 that was never released)
 * Removed transactionAmount and transactionCurrency from EmvReceiptData

README.md

@@ -3,7 +3,7 @@ WePay-Java-SDK
 
 Note
 ================================
-This WePay-Java-SDK is for <a href = "https://www.wepay.com/developer/version/2015-11-18">WePay Api Version 2015-11-18</a>. The jar for the previous API versions can be found in the lib folder.
+This WePay-Java-SDK is for <a href = "https://www.wepay.com/developer/version/2015-03-30">WePay Api Version 2015-03-30</a>. The jar for the previous API versions can be found in the lib folder.
 
 Building
 ================================

lib/wepay-2015-11-18.jar

@@ -8,7 +8,7 @@
 
 	<groupId>com.wepay</groupId>
 	<artifactId>wepay-java-sdk</artifactId>
-	<version>5.0.0</version>
+	<version>5.1.0</version>
 
 	<name>wepay-java-sdk</name>
 	<description>WePay Java SDK</description>

lib/wepay.jar

@@ -3,6 +3,9 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 
+import com.wepay.model.data.BankAccountPaymentErrorData;
+import com.wepay.model.data.NPOInformationData;
+import com.wepay.model.data.PaymentErrorData;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -92,7 +95,7 @@ public static Checkout create(CheckoutData data, String accessToken) throws JSON
 
         if (data.hostedCheckout != null) params.put("hosted_checkout", HostedCheckoutData.build_hosted_checkout(data.hostedCheckout));
 
-		if (data.paymentMethod != null) params.put("payment_method", PaymentMethodData.build_payment_method(data.paymentMethod));
+		if (data.paymentMethod != null) params.put("payment_method", data.paymentMethod.toJSON());
 
         if (data.deliveryType != null) params.put("delivery_type", data.deliveryType);
 
@@ -346,4 +349,22 @@ public Long[] getPayerRbitIds() {
 	public Long[] getTransactionRbitIds() {
 		return transactionRbitIds;
 	}
+
+	public PaymentErrorData getPaymentErrorData() {
+		return checkoutData.paymentError;
+	}
+
+	public PaymentMethodData getPaymentMethodData() {
+		return checkoutData.paymentMethod;
+	}
+
+	public NPOInformationData getNPOInformation() {
+		return checkoutData.npoInformation;
+	}
+
+	public CheckoutData getAllCheckoutData() {
+		return checkoutData;
+	}
+
+
 }

pom.xml

@@ -0,0 +1,10 @@
+package com.wepay.model.data;
+
+public class BankAccountPaymentErrorData {
+
+    public String code;
+    public String description;
+
+    // This object may be present in the response, but should never be in the request.
+
+}

src/main/java/com/wepay/model/Checkout.java

@@ -29,4 +29,7 @@ public class CheckoutData {
 	public String callbackUri;
     public EmailMessageData emailMessage;
     public PaymentMethodData paymentMethod;
+    public PaymentErrorData paymentError;
+    public NPOInformationData npoInformation;
+
 }

src/main/java/com/wepay/model/data/BankAccountPaymentErrorData.java

@@ -13,9 +13,9 @@ public class CreditCardAdditionalData {
 	public String signatureUrl;
 	public EmvReceiptData emvReceipt;
 
-	public static JSONObject buildCreditCardAdditionalData(CreditCardAdditionalData info) throws JSONException {
+	public JSONObject toJSON() throws JSONException {
 		JSONObject o = new JSONObject();
-		o.put("transaction_token", info.transactionToken);
+		o.put("transaction_token", transactionToken);
 		return o;
 	}
 }

src/main/java/com/wepay/model/data/CheckoutData.java

@@ -0,0 +1,16 @@
+package com.wepay.model.data;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class NPOInformationData {
+    public String legalName;
+    public String ein;
+
+    public JSONObject toJSON() throws JSONException {
+        JSONObject o = new JSONObject();
+        if (legalName != null) o.put("legal_name", legalName);
+        if (ein != null) o.put("ein", ein);
+        return o;
+    }
+}

src/main/java/com/wepay/model/data/CreditCardAdditionalData.java

@@ -0,0 +1,17 @@
+package com.wepay.model.data;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class PMBankAccountData {
+    public Long id;
+    public String bankName;
+    public String type;
+
+    public JSONObject toJSON() throws JSONException{
+        JSONObject o = new JSONObject(); // Responses may contain the bank name and account type, but requests never should
+        if (id != null) o.put("id", id);
+        return o;
+    }
+
+}

src/main/java/com/wepay/model/data/NPOInformationData.java

@@ -5,11 +5,11 @@ public class PMCreditCardData {
 	public Long id;
 	public CreditCardAdditionalData data;
 
-	public static JSONObject buildCreditCard(PMCreditCardData info) throws JSONException {
+	public JSONObject toJSON() throws JSONException {
 		JSONObject o = new JSONObject();
-		o.put("id", info.id);
-		if (info.data != null) {
-			o.put("data", CreditCardAdditionalData.buildCreditCardAdditionalData(info.data));
+		o.put("id", id);
+		if (data != null) {
+			o.put("data", data.toJSON());
 		}
 		return o;
 	}

src/main/java/com/wepay/model/data/PMBankAccountData.java

@@ -4,9 +4,9 @@
 public class PMPreapprovalData {
 	public Long id;
 
-	public static JSONObject buildPreapproval(PMPreapprovalData info) throws JSONException {
+	public JSONObject toJSON() throws JSONException {
 		JSONObject o = new JSONObject();
-		o.put("id", info.id);
+		o.put("id", id);
 		return o;
 	}
 }

src/main/java/com/wepay/model/data/PMCreditCardData.java

@@ -0,0 +1,12 @@
+package com.wepay.model.data;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class PaymentErrorData {
+
+    public String type;
+    public BankAccountPaymentErrorData bankAccount;
+
+    // This object may be present in the response, but should never be passed in as part of the request
+}

src/main/java/com/wepay/model/data/PMPreapprovalData.java

@@ -6,12 +6,15 @@ public class PaymentMethodData {
 	public String type;
 	public PMCreditCardData creditCard;
 	public PMPreapprovalData preapproval;
+	public PMBankAccountData bankAccount;
 
-	public static JSONObject build_payment_method(PaymentMethodData info) throws JSONException {
+
+	public JSONObject toJSON() throws JSONException {
 		JSONObject o = new JSONObject();
-		o.put("type", info.type);
-		if (info.creditCard != null) o.put("credit_card", PMCreditCardData.buildCreditCard(info.creditCard));
-		if (info.preapproval != null) o.put("preapproval",  PMPreapprovalData.buildPreapproval(info.preapproval));
+		o.put("type", type);
+		if (creditCard != null) o.put("credit_card", creditCard.toJSON()); // Only one of credit card, preapproval, or bank account can be present
+		else if (preapproval != null) o.put("preapproval",  preapproval.toJSON());
+		else if (bankAccount != null) o.put("bank_account", bankAccount.toJSON());
 		return o;
 	}
 }

src/main/java/com/wepay/model/data/PaymentErrorData.java

@@ -54,8 +54,8 @@ protected static javax.net.ssl.HttpsURLConnection httpsConnect(String call, Stri
 		connection.setDoInput(true);
 		connection.setRequestMethod("POST");
 		connection.setRequestProperty("Content-Type", "application/json");
-		connection.setRequestProperty("Api-Version", "2015-11-18");
-		connection.setRequestProperty("User-Agent", "WePay Java SDK v5.0.0");
+		connection.setRequestProperty("Api-Version", "2016-03-30");
+		connection.setRequestProperty("User-Agent", "WePay Java SDK v5.1.0");
 		if (accessToken != null) {
             connection.setRequestProperty("Authorization", "Bearer " + accessToken);  
         }