Merge pull request #43 from wepay/0713Update

updated to 07-13 API version

Author: JacobKessler

CHANGELOG

@@ -1,3 +1,8 @@
+2016-11-14
+* Released v6.1.0, updating API support to 2016-07-13
+* Several changes to the auto_capture and auto_release params, read the API changelog at https://developer.wepay.com/general/change-log
+* Since this is 2016-07-13 or later, this falls under the new api-version restrictions. This will not affect SDK users, but you may wish to be aware of them
+
 2016-08-15
 * Released v6.0.0, updating API support to 2016-06-22
 * Replaced "bank account" with "payment bank"

lib/wepay-2016-06-22.jar

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

lib/wepay.jar

@@ -90,7 +90,7 @@ public static Checkout create(CheckoutData data, String accessToken) throws JSON
         if (data.fee != null) params.put("fee", FeeData.build_fee(data.fee));
 
 		if (data.callbackUri != null) params.put("callback_uri", data.callbackUri);
-		if (data.autoCapture != null) params.put("auto_capture", data.autoCapture);
+		if (data.autoRelease != null) params.put("auto_release", data.autoRelease);
 		if (data.referenceId != null) params.put("reference_id", data.referenceId);
 		if (data.uniqueId != null) params.put("unique_id", data.uniqueId);
 
@@ -186,14 +186,26 @@ public void refund(CheckoutRefundData refundData, String accessToken) throws JSO
 		request("/checkout/refund", params, accessToken);
 		if (this.checkoutData != null) this.checkoutData.refundReason = refundData.refundReason;
 	}
-	
-	public void capture(String accessToken) throws JSONException, IOException, WePayException {
+
+
+	public void manualCapture(String accessToken) throws JSONException, IOException, WePayException {
 		JSONObject params = new JSONObject();
 		params.put("checkout_id", this.checkoutId);
 		Checkout c = gson.fromJson((request("/checkout/capture", params, accessToken)), Checkout.class);
 		this.state = c.state;
 	}
 
+	/*
+	 * checkout/capture was renamed to checkout/release in the 2016-07-13 release
+	 */
+
+	public void release(String accessToken) throws JSONException, IOException, WePayException {
+		JSONObject params = new JSONObject();
+		params.put("checkout_id", this.checkoutId);
+		Checkout c = gson.fromJson((request("/checkout/release", params, accessToken)), Checkout.class);
+		this.state = c.state;
+	}
+
 	public Long getCheckoutId() {
 		return checkoutId;
 	}
@@ -303,8 +315,8 @@ public String getDeliveryType() {
         return checkoutData.deliveryType;
     }
 
-	public Boolean isAutoCapture() {
-		return checkoutData.autoCapture;
+	public Boolean isAutoRelease() {
+		return checkoutData.autoRelease;
 	}
 
 	public Boolean isRequireShipping() {

pom.xml

@@ -13,7 +13,7 @@ public class CheckoutData {
 	public String type;
 	public BigDecimal amount;
 	public FeeData fee;
-    public Boolean autoCapture;
+    public Boolean autoRelease;
     public HostedCheckoutData hostedCheckout;
     public String deliveryType;
     public String cancelReason;

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

@@ -13,6 +13,7 @@ public class HostedCheckoutData {
 	public ThemeObjectData themeObject;
     public String checkoutUri;
     public AddressData shippingAddress;
+	public Boolean autoCapture;
 
 	public static JSONObject build_hosted_checkout(HostedCheckoutData info) throws JSONException {
 		JSONObject o = new JSONObject();
@@ -24,6 +25,7 @@ public static JSONObject build_hosted_checkout(HostedCheckoutData info) throws J
 		if (info.prefillInfo != null) o.put("prefill_info", PrefillInfoData.buildPrefillInfo(info.prefillInfo));
 		if (info.fundingSources != null) o.put("funding_sources", info.fundingSources);
 		if (info.themeObject != null) o.put("theme_object", ThemeObjectData.buildThemeObject(info.themeObject));
+		if (info.autoCapture != null) {o.put("auto_capture", info.autoCapture);}
 		return o;
 	}
 }

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

@@ -4,13 +4,17 @@
 public class PMCreditCardData {
 	public Long id;
 	public CreditCardAdditionalData data;
+	public Boolean autoCapture;
 
 	public JSONObject toJSON() throws JSONException {
 		JSONObject o = new JSONObject();
 		o.put("id", id);
 		if (data != null) {
 			o.put("data", data.toJSON());
 		}
+		if (autoCapture != null) {
+			o.put("auto_capture", autoCapture);
+		}
 		return o;
 	}
 }

src/main/java/com/wepay/model/data/HostedCheckoutData.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", "2016-06-22");
-		connection.setRequestProperty("User-Agent", "WePay Java SDK v6.0.0");
+		connection.setRequestProperty("Api-Version", "2016-07-13");
+		connection.setRequestProperty("User-Agent", "WePay Java SDK v6.1.0");
 		if (accessToken != null) {
             connection.setRequestProperty("Authorization", "Bearer " + accessToken);  
         }