merged PR conflicts

brianmc · brianmc · commit ac8462d5dec6 · 2015-10-14T23:21:34.000-07:00
diff --git a/src/main/java/net/authorize/sample/PaypalExpressCheckout/AuthorizationOnly.java b/src/main/java/net/authorize/sample/PaypalExpressCheckout/AuthorizationOnly.java
@@ -58,4 +58,4 @@ public static void run(String apiLoginId, String transactionKey) {
             }
         }
     }
-}
+}
diff --git a/src/main/java/net/authorize/sample/PaypalExpressCheckout/PriorAuthorizationCapture.java b/src/main/java/net/authorize/sample/PaypalExpressCheckout/PriorAuthorizationCapture.java
@@ -0,0 +1,69 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.authorize.sample.PaypalExpressCheckout;
+
+import java.math.BigDecimal;
+import net.authorize.api.controller.base.ApiOperationBase;
+import net.authorize.api.contract.v1.*;
+import net.authorize.api.controller.CreateTransactionController;
+import net.authorize.Environment;
+
+/**
+ *
+ * @author gnongsie
+ */
+public class PriorAuthorizationCapture {
+    public static void run(String apiLoginId, String apiTransactionKey, String transactionId){
+        System.out.println("Paypal Prior Authorization Transaction");
+        
+        //Common code to set for all requests
+        ApiOperationBase.setEnvironment(Environment.SANDBOX);
+        
+        // Define the merchant information (Authentication / Transaction ID)
+        MerchantAuthenticationType merchantAuthenticationType  = new MerchantAuthenticationType() ;
+            merchantAuthenticationType.setName(apiLoginId);
+            merchantAuthenticationType.setTransactionKey(apiTransactionKey);
+        ApiOperationBase.setMerchantAuthentication(merchantAuthenticationType);
+
+        // Populate the payment data
+        PayPalType payPalType = new PayPalType();
+            payPalType.setCancelUrl("http://www.merchanteCommerceSite.com/Success/TC25262");
+            payPalType.setSuccessUrl("http://www.merchanteCommerceSite.com/Success/TC25262");
+
+        // Standard api call to retrieve response
+        PaymentType paymentType = new PaymentType();
+            paymentType.setPayPal(payPalType);
+        
+        // Create the payment transaction request
+        TransactionRequestType transactionRequest = new TransactionRequestType();
+            transactionRequest.setTransactionType(TransactionTypeEnum.PRIOR_AUTH_CAPTURE_TRANSACTION.value());
+            transactionRequest.setPayment(paymentType);
+            transactionRequest.setAmount(BigDecimal.valueOf(19.99));
+            transactionRequest.setRefTransId(transactionId);
+
+        // Make the API Request
+        CreateTransactionRequest request = new CreateTransactionRequest();
+            request.setTransactionRequest(transactionRequest);
+        
+        // Instantiate the contoller that will call the service
+        CreateTransactionController controller = new CreateTransactionController(request);
+            controller.execute();
+            
+        CreateTransactionResponse response = controller.getApiResponse();
+        
+        // If API Response is ok, go ahead and check the transaction response
+        if (response.getMessages().getResultCode() == MessageTypeEnum.OK){
+            if (response.getTransactionResponse() != null){
+                System.out.println("Success, Auth Code: " + response.getTransactionResponse().getAuthCode());
+            }
+        }
+        else{
+            System.out.println("Error: " + response.getMessages().getMessage().get(0).getCode() + 
+                                    " " + response.getMessages().getMessage().get(0).getText());
+        }
+    }
+}
diff --git a/src/main/java/net/authorize/sample/SampleCode.java b/src/main/java/net/authorize/sample/SampleCode.java
@@ -114,6 +114,7 @@ private static void ShowMethods()
         System.out.println("    PayPalAuthorizationOnly");
         System.out.println("    PayPalAuthorizeCaptureContinue");
         System.out.println("    PayPalGetDetails");
+		System.out.println("    PayPalPriorAuthorizationCapture");		
     }
 
     private static void RunMethod(String methodName)
@@ -247,6 +248,9 @@ private static void RunMethod(String methodName)
             	break;
             case "PayPalGetDetails":
             	GetDetails.run(apiLoginId, transactionKey);
+			case "PaypalPriorAuthorizationCapture":
+                String transactionId = "2241801682"; // Use a valid transaction ID here        
+                PriorAuthorizationCapture.run(apiLoginId, transactionKey, transactionId);
                 break;
             default:
                 ShowUsage();

Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,4 @@ public static void run(String apiLoginId, String transactionKey) {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`-}`
	`61`	`+}`