Updating settlementCurrency

README.md

@@ -16,6 +16,8 @@ DotNet Library for Worldpay REST API (.NET 3.5+, .NET 2.0)
 Initialize the REST client with the default URL and the specified service key and then use the required service:
 ```c#
 
+WorldpayRestClient restClient = new WorldpayRestClient("https://api.worldpay.com/v1", "YOUR_SERVICE_KEY");
+
 var orderRequest = new OrderRequest()
 {
     amount = 1999,
@@ -45,11 +47,6 @@ try {
 }
 ```
 
-Alternatively, the client can also be initialized with the REST service URL as well as the service key e.g.
-```c#
-WorldpayRestClient restClient = new WorldpayRestClient("https://api.worldpay.com/v1", "YOUR_SERVICE_KEY");
-```
-
 worldpay-sample-dotnet-3-5 & 2-0
 -------------------
 
@@ -67,4 +64,4 @@ C# ASP .NET sample application which demonstrates integration with Worldpay API.
 - In your account dashboard, navigate to Settings and API Keys and update the Web.config file in your solutions route folder with the corresponding value.
 - Also in Web.config, set OrderLog to a location on your server which has read/write access permissions for your web server. In IIS on Windows, this usually means granting access to IUSR and IIS_IUSRS via the Windows Explorer folder properties dialog.
 - Visual Studio users can now be able to run the application simply by opening the page 'CreateOrder.aspx' and clicking the 'run' button from the toolbar.
-- To test credit card transactions via the IDE, simply fill out the details on the page and submit.
+- To test credit card transactions via the IDE, simply fill out the details on the page and submit.

worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/App.config

@@ -3,10 +3,10 @@
   <appSettings>
     <add key="TokenUrl" value="https://api.worldpay.com/v1/tokens"/>
     <add key="BaseUrl" value="https://api.worldpay.com/v1"/>
-    <add key="ServiceKey" value="T_S_cc7fa6da-2c00-4567-90f6-5da1d40618d1"/>
-    <add key="ClientKey" value="T_C_c7424f48-2b89-4736-b687-7751ab88927a"/>
-    <add key="MerchantId" value="6406251b-f8f9-4355-91d9-085283e86ddd"/>
-    <add key="WebhookUrl" value="[WebhookUrl]"/>
+    <add key="ServiceKey" value="T_S_4023fc55-903b-47c5-8d2c-ff73a4cd1cce"/>
+    <add key="ClientKey" value="T_C_564f850f-1f04-4211-afe7-0f792fd3d2dd"/>
+    <add key="MerchantId" value="01346fe3-86b7-40d4-9406-a4646e9fa520"/>
+    <add key="WebhookUrl" value="[PathToWebhookUrl]"/>
     <add key="OrderLog" value="[PathToWebhookLogfile]"/>
   </appSettings>
 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll.config

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <configuration>
   <appSettings>
-    <add key="TokenUrl" value="https://api.worldpay.com/v1/tokens"/>
-    <add key="BaseUrl" value="https://api.worldpay.com/v1"/>
-    <add key="ServiceKey" value="T_S_cc7fa6da-2c00-4567-90f6-5da1d40618d1"/>
-    <add key="ClientKey" value="T_C_c7424f48-2b89-4736-b687-7751ab88927a"/>
-    <add key="MerchantId" value="6406251b-f8f9-4355-91d9-085283e86ddd"/>
-    <add key="WebhookUrl" value="[WebhookUrl]"/>
+    <add key="TokenUrl" value="https://qa02-api.worldpay.io/v1/tokens"/>
+    <add key="BaseUrl" value="https://qa02-api.worldpay.io/v1"/>
+    <add key="ServiceKey" value="T_S_4023fc55-903b-47c5-8d2c-ff73a4cd1cce"/>
+    <add key="ClientKey" value="T_C_564f850f-1f04-4211-afe7-0f792fd3d2dd"/>
+    <add key="MerchantId" value="01346fe3-86b7-40d4-9406-a4646e9fa520"/>
+    <add key="WebhookUrl" value="https://logger2.worldpaydemo.com/logger/log?server=qa&amp;statusCode=200"/>
     <add key="OrderLog" value="[PathToWebhookLogfile]"/>
   </appSettings>
 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractOrder.cs

@@ -6,10 +6,12 @@ public class AbstractOrder
 
         public string orderDescription { get; set; }
 
-        public int amount { get; set; }
+        public int? amount { get; set; }
 
         public string currencyCode { get; set; }
 
+        public string settlementCurrency { get; set; }
+
         public bool authorizeOnly { get; set; }
 
         public int? authorizedAmount { get; set; }

worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderRequest.cs

@@ -62,5 +62,7 @@ public string shopperAcceptHeader
 
         public string shopperEmailAddress { get; set; }
 
+        public string statementNarrative { get; set; }
+
     }
 }

worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderResponse.cs

@@ -28,5 +28,8 @@ public class OrderResponse : AbstractOrder
         public string shopperEmailAddress { get; set; }
 
         public DeliveryAddress deliveryAddress { get; set; }
+
+        public string statementNarrative { get; set; }
+
     }
 }

worldpay-lib-dotnet-2-0/Worldpay.Sdk/OrderService.cs

@@ -61,7 +61,7 @@ public OrderResponse CaptureAuthorizedOrder(string orderCode, int amount)
         {
             if (amount == 0)
             {
-                return Http.Post<CaptureRequest, OrderResponse>(String.Format("{0}/orders/{1}/capture", _baseUrl, orderCode), null);
+                return CaptureAuthorizedOrder(orderCode);
             }
             else
             {
@@ -111,8 +111,15 @@ public void Refund(String orderCode)
         /// <param name="amount">The amount of the order to be partially refunded</param>
         public void Refund(String orderCode, int amount)
         {
-            PartialRefundRequest partialRefundRequest = new PartialRefundRequest { refundAmount = amount };
-            Http.Post(String.Format("{0}/orders/{1}/refund", _baseUrl, orderCode), partialRefundRequest);
+            if (amount == 0)
+            {
+                Refund(orderCode);
+            }
+            else
+            {
+                PartialRefundRequest partialRefundRequest = new PartialRefundRequest { refundAmount = amount };
+                Http.Post(String.Format("{0}/orders/{1}/refund", _baseUrl, orderCode), partialRefundRequest);
+            }
         }
     }
 }

worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/App.config

@@ -3,10 +3,10 @@
   <appSettings>
     <add key="TokenUrl" value="https://api.worldpay.com/v1/tokens"/>
     <add key="BaseUrl" value="https://api.worldpay.com/v1"/>
-    <add key="ServiceKey" value="T_S_cc7fa6da-2c00-4567-90f6-5da1d40618d1"/>
-    <add key="ClientKey" value="T_C_c7424f48-2b89-4736-b687-7751ab88927a"/>
-    <add key="MerchantId" value="6406251b-f8f9-4355-91d9-085283e86ddd"/>
-    <add key="WebhookUrl" value="[WebhookUrl]"/>
+    <add key="ServiceKey" value="T_S_4023fc55-903b-47c5-8d2c-ff73a4cd1cce"/>
+    <add key="ClientKey" value="T_C_564f850f-1f04-4211-afe7-0f792fd3d2dd"/>
+    <add key="MerchantId" value="01346fe3-86b7-40d4-9406-a4646e9fa520"/>
+    <add key="WebhookUrl" value="[PathToWebhookUrl]"/>
     <add key="OrderLog" value="[PathToWebhookLogfile]"/>
   </appSettings>
   <startup>

worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/OrderServiceTest.cs

@@ -271,7 +271,7 @@ private OrderRequest createOrderRequest()
         {
             var orderRequest = new OrderRequest();
             orderRequest.amount = 1999;
-            orderRequest.currencyCode = CurrencyCode.GBP;
+            orderRequest.currencyCode = "GBP";
             orderRequest.name = "test name";
             orderRequest.orderDescription = "test description";
 
@@ -297,7 +297,7 @@ private OrderRequest create3DSOrderRequest()
         {
             var orderRequest = new OrderRequest();
             orderRequest.amount = 1999;
-            orderRequest.currencyCode = CurrencyCode.GBP;
+            orderRequest.currencyCode = "GBP";
             orderRequest.name = "3D";
             orderRequest.orderDescription = "test description";
 
@@ -336,7 +336,7 @@ private OrderRequest createAPMOrderRequest()
             orderRequest.failureUrl = "http://www.testurl.com/failure";
             orderRequest.pendingUrl = "http://www.testurl.com/pending";
 
-            orderRequest.currencyCode = CurrencyCode.GBP;
+            orderRequest.currencyCode = "GBP";
             orderRequest.name = "Test";
             orderRequest.orderDescription = "test description";
             orderRequest.is3DSOrder = false;

worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractOrder.cs

@@ -15,10 +15,13 @@ public class AbstractOrder
         public string orderDescription { get; set; }
 
         [DataMember]
-        public int amount { get; set; }
+        public int? amount { get; set; }
 
-        [DataMember, JsonConverter(typeof(StringEnumConverter))]
-        public CurrencyCode currencyCode { get; set; }
+        [DataMember]
+        public string currencyCode { get; set; }
+
+        [DataMember]
+        public string settlementCurrency { get; set; }
 
         [DataMember]
         public bool authorizeOnly { get; set; }

worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderRequest.cs

@@ -70,5 +70,8 @@ public OrderRequest()
         [DataMember]
         public string shopperEmailAddress { get; set; }
 
+        [DataMember]
+        public string statementNarrative { get; set; }
+
     }
 }

worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderResponse.cs

@@ -45,5 +45,8 @@ public class OrderResponse : AbstractOrder
         [DataMember]
         public DeliveryAddress deliveryAddress { get; set; }
 
+        [DataMember]
+        public string statementNarrative { get; set; }
+
     }
 }

worldpay-lib-dotnet-3-5/Worldpay.Sdk/OrderService.cs

@@ -62,7 +62,7 @@ public OrderResponse CaptureAuthorizedOrder(string orderCode, int amount)
         {
             if (amount == 0)
             {
-                return Http.Post<CaptureRequest, OrderResponse>(String.Format("{0}/orders/{1}/capture", _baseUrl, orderCode), null);
+                return CaptureAuthorizedOrder(orderCode);
             }
             else
             {
@@ -111,8 +111,15 @@ public void Refund(String orderCode)
         /// <param name="amount">The amount of the order to be partially refunded</param>
         public void Refund(String orderCode, int amount)
         {
-            PartialRefundRequest partialRefundRequest = new PartialRefundRequest { refundAmount = amount };
-            Http.Post(String.Format("{0}/orders/{1}/refund", _baseUrl, orderCode), partialRefundRequest);
+            if (amount == 0)
+            {
+                Refund(orderCode);
+            }
+            else
+            {
+                PartialRefundRequest partialRefundRequest = new PartialRefundRequest { refundAmount = amount };
+                Http.Post(String.Format("{0}/orders/{1}/refund", _baseUrl, orderCode), partialRefundRequest);
+            }
         }
     }
 }

worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/AuthorizeOrder.aspx.cs

@@ -19,7 +19,7 @@ protected void Page_Load(object sender, EventArgs e)
 
         protected void onAuthorizeOrder(object sender, CommandEventArgs e)
         {
-            var client = new WorldpayRestClient(Configuration.ServiceKey);
+            var client = new WorldpayRestClient((string)Session["apiEndpoint"], (string)Session["service_key"]);
 
             string orderCode = (string)Session["orderCode"];
             var responseCode = HttpContext.Current.Request.Form["PaRes"];

worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CancelAuthorizedOrder.aspx.cs

@@ -15,7 +15,7 @@ protected override void OnLoad(EventArgs e)
         protected void OnCancelOrder(object sender, CommandEventArgs e)
         {
             var form = HttpContext.Current.Request.Form;
-            var client = new WorldpayRestClient(Configuration.ServiceKey);
+            var client = new WorldpayRestClient((string)Session["apiEndpoint"], (string)Session["service_key"]);
 
             var orderCode = form["orderCode"];
 

worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CaptureAuthorizedOrder.aspx.cs

@@ -15,7 +15,7 @@ protected override void OnLoad(EventArgs e)
         protected void OnCaptureOrder(object sender, CommandEventArgs e)
         {
             var form = HttpContext.Current.Request.Form;
-            var client = new WorldpayRestClient(Configuration.ServiceKey);
+            var client = new WorldpayRestClient((string)Session["apiEndpoint"], (string)Session["service_key"]);
 
             var orderCode = form["orderCode"];
             var amount = 0;

worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ConfigurationService.asmx.cs

@@ -10,7 +10,7 @@ public class ConfigurationService : WebService
         [WebMethod(EnableSession = true)]
         public string Test(string apiEndpoint, string jsEndpoint, string serviceKey, string clientKey)
         {
-            Session["apiendpoint"] = apiEndpoint;
+            Session["apiEndpoint"] = apiEndpoint;
             Session["js_endpoint"] = jsEndpoint;
             Session["service_key"] = serviceKey;
             Session["client_key"] = clientKey;

worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx

@@ -15,7 +15,6 @@
                 <label>Order Type</label>
                 <select id="orderType" name="orderType">
                     <option value="ECOM" selected="selected">ECOM</option>
-                    <option value="RECURRING">RECURRING</option>
                     <option value="MOTO">MOTO</option>
                     <option value="APM">APM</option>
                 </select>
@@ -111,6 +110,21 @@
                 <input type="text" id="currency" name="currency" value="GBP" />
             </div>
 
+            <div class="form-row">
+                <label>Settlement Currency</label>
+                 <select id="settlement-currency" name="settlement-currency">
+                    <option value="" selected></option>
+                    <option value="USD">USD</option>
+                    <option value="GBP">GBP</option>
+                    <option value="EUR">EUR</option>
+                    <option value="CAD">CAD</option>
+                    <option value="NOK">NOK</option>
+                    <option value="SEK">SEK</option>
+                    <option value="SGD">SGD</option>
+                    <option value="HKD">HKD</option>
+                    <option value="DKK">DKK</option>
+                </select>
+            </div>
 
             <div class="form-row reusable-token-row">
                 <label>Reusable Token</label>