diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index dbe9a78..4be156a
--- a/README.md
+++ b/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.
\ No newline at end of file
+- To test credit card transactions via the IDE, simply fill out the details on the page and submit.
diff --git a/worldpay-lib-dotnet-2-0/.gitignore b/worldpay-lib-dotnet-2-0/.gitignore
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/HtmlColorConverter.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/HtmlColorConverter.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/IsoDateTimeConverter.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/IsoDateTimeConverter.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/JavaScriptDateTimeConverter.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/JavaScriptDateTimeConverter.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/JsonDateTimeSerializationMode.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/JsonDateTimeSerializationMode.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/XmlNodeConverter.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Converters/XmlNodeConverter.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Identifier.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Identifier.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JavaScriptConvert.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JavaScriptConvert.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonConverter.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonConverter.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonConverterCollection.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonConverterCollection.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonHandler.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonHandler.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonIgnoreAttribute.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonIgnoreAttribute.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonObjectAttribute.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonObjectAttribute.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonPropertyAttribute.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonPropertyAttribute.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonReader.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonReader.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonReaderException.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonReaderException.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonSerializationException.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonSerializationException.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonSerializer.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonSerializer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonTextReader.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonTextReader.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonTextWriter.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonTextWriter.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonToken.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonToken.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonWriter.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonWriter.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonWriterException.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/JsonWriterException.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/Extensions.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/Extensions.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JArray.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JArray.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JConstructor.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JConstructor.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JContainer.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JContainer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JEnumerable.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JEnumerable.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JObject.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JObject.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JProperty.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JProperty.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JToken.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JToken.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JValue.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JValue.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JsonTokenReader.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JsonTokenReader.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JsonTokenType.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JsonTokenType.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JsonTokenWriter.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Linq/JsonTokenWriter.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/LinqBridge.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/LinqBridge.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/MemberMapping.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/MemberMapping.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/MemberMappingCollection.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/MemberMappingCollection.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/MemberSerialization.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/MemberSerialization.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/MissingMemberHandling.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/MissingMemberHandling.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Newtonsoft.Json.csproj b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Newtonsoft.Json.csproj
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/NullValueHandling.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/NullValueHandling.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/ObjectCreationHandling.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/ObjectCreationHandling.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Properties/AssemblyInfo.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Properties/AssemblyInfo.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/ReferenceLoopHandling.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/ReferenceLoopHandling.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/StringBuffer.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/StringBuffer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/CollectionUtils.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/CollectionUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/DateTimeUtils.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/DateTimeUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/DictionaryWrapper.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/DictionaryWrapper.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/JavaScriptUtils.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/JavaScriptUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/ListWrapper.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/ListWrapper.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/MathUtils.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/MathUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/MiscellaneousUtils.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/MiscellaneousUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/ReflectionUtils.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/ReflectionUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/StringUtils.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/StringUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/ValidationUtils.cs b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/Utilities/ValidationUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.XML b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.XML
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.dll b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.dll
old mode 100644
new mode 100755
index 9cb147b..c31f72f
Binary files a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.dll and b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.dll.CodeAnalysisLog.xml b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.dll.CodeAnalysisLog.xml
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.dll.lastcodeanalysissucceeded b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.dll.lastcodeanalysissucceeded
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.pdb b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.pdb
old mode 100644
new mode 100755
index eefa36e..80af873
Binary files a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.pdb and b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Debug/Newtonsoft.Json.pdb differ
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.XML b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.XML
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.dll b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.dll
old mode 100644
new mode 100755
index f3fee54..b5c7bb5
Binary files a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.dll and b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.pdb b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.pdb
old mode 100644
new mode 100755
index 1832df3..2a04869
Binary files a/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.pdb and b/worldpay-lib-dotnet-2-0/Newtonsoft.Json/bin/Release/Newtonsoft.Json.pdb differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/App.config b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/App.config
old mode 100644
new mode 100755
index 72aeba6..d48219c
--- a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/App.config
+++ b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/App.config
@@ -3,10 +3,10 @@
-
-
-
-
+
+
+
+
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/OrderServiceTest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/OrderServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/Properties/AssemblyInfo.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/Properties/AssemblyInfo.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/SettingsServiceTest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/SettingsServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/TestHelpers.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/TestHelpers.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/TokenServiceTest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/TokenServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/TransferServiceTest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/TransferServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/WebhookServiceTest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/WebhookServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/Worldpay.Sdk.Test.csproj b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/Worldpay.Sdk.Test.csproj
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.dll b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.dll
old mode 100644
new mode 100755
index 9cb147b..c31f72f
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.dll and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.pdb b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.pdb
old mode 100644
new mode 100755
index eefa36e..80af873
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.pdb and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.pdb differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.xml b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/Newtonsoft.Json.xml
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll
old mode 100644
new mode 100755
index 33a960f..d718044
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll.config b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll.config
old mode 100644
new mode 100755
index 72aeba6..89d0546
--- a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll.config
+++ b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.dll.config
@@ -1,12 +1,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.pdb b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.pdb
old mode 100644
new mode 100755
index 74f6937..2fba2dc
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.pdb and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.Test.pdb differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.dll b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.dll
old mode 100644
new mode 100755
index bd7486c..d2e1164
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.dll and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.pdb b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.pdb
old mode 100644
new mode 100755
index a8c4ea6..e6c02b0
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.pdb and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.Test/bin/Debug/WorldPay.Sdk.pdb differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk.sln b/worldpay-lib-dotnet-2-0/Worldpay.Sdk.sln
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/AbstractService.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/AbstractService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/App.config b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/App.config
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/AuthService.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/AuthService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Configuration.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Configuration.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/CountryCode.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/CountryCode.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/CurrencyCode.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/CurrencyCode.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/Environment.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/Environment.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/OrderStatus.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/OrderStatus.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/OrderType.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/OrderType.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/RequestMethod.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/RequestMethod.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/WarningCode.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Enums/WarningCode.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Http.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Http.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/MerchantService.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/MerchantService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/APMRequest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/APMRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractCard.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractCard.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractOrder.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractOrder.cs
old mode 100644
new mode 100755
index 9da6e9c..1594328
--- a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractOrder.cs
+++ b/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; }
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractPaymentMethod.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractPaymentMethod.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractPerson.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractPerson.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractTokenRequest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/AbstractTokenRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Account.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Account.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Address.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Address.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/ApiError.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/ApiError.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/BaseMerchant.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/BaseMerchant.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/BusinessProfile.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/BusinessProfile.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/CaptureRequest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/CaptureRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/CardRequest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/CardRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Company.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Company.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/DeliveryAddress.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/DeliveryAddress.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Entry.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Entry.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Merchant.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Merchant.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/MerchantOrderSetting.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/MerchantOrderSetting.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Name.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Name.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderAuthorizationRequest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderAuthorizationRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderChangeNotification.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderChangeNotification.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderHistory.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderHistory.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderRequest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderRequest.cs
old mode 100644
new mode 100755
index 7a80845..21dda00
--- a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderRequest.cs
+++ b/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; }
+
}
}
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderResponse.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderResponse.cs
old mode 100644
new mode 100755
index b4decbc..ce47030
--- a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/OrderResponse.cs
+++ b/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; }
+
}
}
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/PartialRefundRequest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/PartialRefundRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/PaymentResponse.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/PaymentResponse.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/PersonContact.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/PersonContact.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/PersonRecord.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/PersonRecord.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/RiskSetting.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/RiskSetting.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Setting.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Setting.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/SettingsResponse.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/SettingsResponse.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/ThreeDSecureInfo.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/ThreeDSecureInfo.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TokenRequest.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TokenRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TokenResponse.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TokenResponse.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TransferDetail.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TransferDetail.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TransferOrder.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TransferOrder.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TransferResponse.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TransferResponse.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TransferSummary.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/TransferSummary.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Warning.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/Warning.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/WebhookSetting.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Models/WebhookSetting.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/OrderService.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/OrderService.cs
old mode 100644
new mode 100755
index ac1d5d7..2298d9e
--- a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/OrderService.cs
+++ b/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(String.Format("{0}/orders/{1}/capture", _baseUrl, orderCode), null);
+ return CaptureAuthorizedOrder(orderCode);
}
else
{
@@ -111,8 +111,15 @@ public void Refund(String orderCode)
/// The amount of the order to be partially refunded
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);
+ }
}
}
}
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Properties/AssemblyInfo.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Properties/AssemblyInfo.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/SettingsService.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/SettingsService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/TokenService.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/TokenService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/TransferService.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/TransferService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/WebhookHandler.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/WebhookHandler.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/WebhookService.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/WebhookService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/WorldPayException.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/WorldPayException.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/WorldPayRestClient.cs b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/WorldPayRestClient.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Worldpay.Sdk.csproj b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/Worldpay.Sdk.csproj
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.dll b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.dll
old mode 100644
new mode 100755
index 9cb147b..c31f72f
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.dll and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.pdb b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.pdb
old mode 100644
new mode 100755
index eefa36e..80af873
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.pdb and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.pdb differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.xml b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/Newtonsoft.Json.xml
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.dll b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.dll
old mode 100644
new mode 100755
index bd7486c..d2e1164
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.dll and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.dll.config b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.dll.config
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.pdb b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.pdb
old mode 100644
new mode 100755
index a8c4ea6..e6c02b0
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.pdb and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Debug/WorldPay.Sdk.pdb differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.dll b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.dll
old mode 100644
new mode 100755
index f3fee54..b5c7bb5
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.dll and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.pdb b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.pdb
old mode 100644
new mode 100755
index 1832df3..2a04869
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.pdb and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.pdb differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.xml b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/Newtonsoft.Json.xml
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.dll b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.dll
old mode 100644
new mode 100755
index 028baeb..1317955
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.dll and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.dll differ
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.dll.config b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.dll.config
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.pdb b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.pdb
old mode 100644
new mode 100755
index 38cdf5c..9b582ea
Binary files a/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.pdb and b/worldpay-lib-dotnet-2-0/Worldpay.Sdk/bin/Release/WorldPay.Sdk.pdb differ
diff --git a/worldpay-lib-dotnet-3-5/.gitignore b/worldpay-lib-dotnet-3-5/.gitignore
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/App.config b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/App.config
old mode 100644
new mode 100755
index badadb0..951b682
--- a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/App.config
+++ b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/App.config
@@ -3,10 +3,10 @@
-
-
-
-
+
+
+
+
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/OrderServiceTest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/OrderServiceTest.cs
old mode 100644
new mode 100755
index bddc43f..2fcd3ad
--- a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/OrderServiceTest.cs
+++ b/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;
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/Properties/AssemblyInfo.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/Properties/AssemblyInfo.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/SettingsServiceTest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/SettingsServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/TestHelpers.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/TestHelpers.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/TokenServiceTest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/TokenServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/TransferServiceTest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/TransferServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/WebhookServiceTest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/WebhookServiceTest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/Worldpay.Sdk.Test.csproj b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.Test/Worldpay.Sdk.Test.csproj
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk.sln b/worldpay-lib-dotnet-3-5/Worldpay.Sdk.sln
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/AbstractService.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/AbstractService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/AuthService.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/AuthService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Configuration.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Configuration.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/CountryCode.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/CountryCode.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/CurrencyCode.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/CurrencyCode.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/Environment.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/Environment.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/OrderStatus.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/OrderStatus.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/OrderType.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/OrderType.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/RequestMethod.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/RequestMethod.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/WarningCode.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Enums/WarningCode.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Http.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Http.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Json/EntryConvertcs.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Json/EntryConvertcs.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/MerchantService.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/MerchantService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/APMRequest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/APMRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractCard.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractCard.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractOrder.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractOrder.cs
old mode 100644
new mode 100755
index f31d5fc..f53fbc4
--- a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractOrder.cs
+++ b/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; }
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractPaymentMethod.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractPaymentMethod.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractPerson.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractPerson.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractTokenRequest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/AbstractTokenRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Account.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Account.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Address.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Address.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/ApiError.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/ApiError.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/BaseMerchant.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/BaseMerchant.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/BusinessProfile.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/BusinessProfile.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/CaptureRequest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/CaptureRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/CardRequest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/CardRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Company.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Company.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/DeliveryAddress.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/DeliveryAddress.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Entry.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Entry.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Merchant.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Merchant.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/MerchantOrderSetting.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/MerchantOrderSetting.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Name.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Name.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderAuthorizationRequest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderAuthorizationRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderChangeNotification.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderChangeNotification.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderHistory.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderHistory.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderRequest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderRequest.cs
old mode 100644
new mode 100755
index b2369f1..8fadd5f
--- a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderRequest.cs
+++ b/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; }
+
}
}
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderResponse.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderResponse.cs
old mode 100644
new mode 100755
index 7bee9d2..5d5bf10
--- a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/OrderResponse.cs
+++ b/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; }
+
}
}
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/PartialRefundRequest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/PartialRefundRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/PaymentResponse.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/PaymentResponse.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/PersonContact.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/PersonContact.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/PersonRecord.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/PersonRecord.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/RiskSetting.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/RiskSetting.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Setting.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Setting.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/SettingsResponse.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/SettingsResponse.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/ThreeDSecureInfo.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/ThreeDSecureInfo.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TokenRequest.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TokenRequest.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TokenResponse.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TokenResponse.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TransferDetail.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TransferDetail.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TransferOrder.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TransferOrder.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TransferResponse.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TransferResponse.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TransferSummary.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/TransferSummary.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Warning.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/Warning.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/WebhookSetting.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Models/WebhookSetting.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/OrderService.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/OrderService.cs
old mode 100644
new mode 100755
index 9ad9bc0..eff549e
--- a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/OrderService.cs
+++ b/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(String.Format("{0}/orders/{1}/capture", _baseUrl, orderCode), null);
+ return CaptureAuthorizedOrder(orderCode);
}
else
{
@@ -111,8 +111,15 @@ public void Refund(String orderCode)
/// The amount of the order to be partially refunded
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);
+ }
}
}
}
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Properties/AssemblyInfo.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Properties/AssemblyInfo.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/SettingsService.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/SettingsService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/TokenService.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/TokenService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/TransferService.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/TransferService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/WebhookHandler.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/WebhookHandler.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/WebhookService.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/WebhookService.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/WorldPayException.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/WorldPayException.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/WorldPayRestClient.cs b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/WorldPayRestClient.cs
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Worldpay.Sdk.csproj b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/Worldpay.Sdk.csproj
old mode 100644
new mode 100755
diff --git a/worldpay-lib-dotnet-3-5/Worldpay.Sdk/lib/Newtonsoft.Json.dll b/worldpay-lib-dotnet-3-5/Worldpay.Sdk/lib/Newtonsoft.Json.dll
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/.gitignore b/worldpay-sample-dotnet-2-0/.gitignore
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMCancel.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMCancel.aspx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMCancel.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMCancel.aspx.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMCancel.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMCancel.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMFailure.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMFailure.aspx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMFailure.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMFailure.aspx.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMFailure.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMFailure.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMPending.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMPending.aspx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMPending.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMPending.aspx.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMPending.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMPending.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMSuccess.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMSuccess.aspx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMSuccess.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMSuccess.aspx.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMSuccess.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/APMSuccess.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/AuthorizeOrder.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/AuthorizeOrder.aspx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/AuthorizeOrder.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/AuthorizeOrder.aspx.cs
old mode 100644
new mode 100755
index 2d09a83..d374156
--- a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/AuthorizeOrder.aspx.cs
+++ b/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"];
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/AuthorizeOrder.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/AuthorizeOrder.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CancelAuthorizedOrder.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CancelAuthorizedOrder.aspx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CancelAuthorizedOrder.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CancelAuthorizedOrder.aspx.cs
old mode 100644
new mode 100755
index f8bc579..8c4853b
--- a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CancelAuthorizedOrder.aspx.cs
+++ b/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"];
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CancelAuthorizedOrder.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CancelAuthorizedOrder.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CaptureAuthorizedOrder.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CaptureAuthorizedOrder.aspx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CaptureAuthorizedOrder.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CaptureAuthorizedOrder.aspx.cs
old mode 100644
new mode 100755
index 4b57005..94ccdf4
--- a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CaptureAuthorizedOrder.aspx.cs
+++ b/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;
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CaptureAuthorizedOrder.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CaptureAuthorizedOrder.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ConfigurationService.asmx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ConfigurationService.asmx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ConfigurationService.asmx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ConfigurationService.asmx.cs
old mode 100644
new mode 100755
index c06b53e..9b0678b
--- a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ConfigurationService.asmx.cs
+++ b/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;
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx
old mode 100644
new mode 100755
index a5d3ce5..5b2cec4
--- a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx
+++ b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx
@@ -15,7 +15,6 @@
@@ -111,6 +110,21 @@
+
+
+
+
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx.cs
old mode 100644
new mode 100755
index a4921a5..75a90f1
--- a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx.cs
+++ b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx.cs
@@ -42,7 +42,7 @@ protected void OnCreateOrder(object sender, CommandEventArgs e)
private void createOrder()
{
var form = HttpContext.Current.Request.Form;
- var client = new WorldpayRestClient((string)Session["service_key"]);
+ var client = new WorldpayRestClient((string)Session["apiEndpoint"], (string)Session["service_key"]);
var orderType = (OrderType)Enum.Parse(typeof(OrderType), form["orderType"]);
var cardRequest = new CardRequest();
@@ -52,8 +52,10 @@ private void createOrder()
cardRequest.expiryMonth = Convert.ToInt32(form["exp-month"]);
cardRequest.expiryYear = Convert.ToInt32(form["exp-year"]);
cardRequest.type = form["cardType"];
-
+ int? _amount = null;
+ var _currencyCode = "";
Dictionary custIdentifiers = new Dictionary();
+
try
{
custIdentifiers = JavaScriptConvert.DeserializeObject>(form["customer-identifiers"]);
@@ -61,6 +63,18 @@ private void createOrder()
}
catch (Exception exc) { }
+ try
+ {
+ _amount = (int)(Convert.ToDecimal(form["amount"]) * 100);
+ }
+ catch (Exception excAmount) { }
+
+ try
+ {
+ _currencyCode = Enum.Parse(typeof(CurrencyCode), form["currency"]).ToString();
+ }
+ catch (Exception excCurrency) { }
+
var billingAddress = new Address()
{
address1 = form["address1"],
@@ -103,10 +117,11 @@ private void createOrder()
{
token = form["token"],
orderDescription = form["description"],
- amount = (int)(Convert.ToDecimal(form["amount"]) * 100),
- currencyCode = Enum.Parse(typeof(CurrencyCode), form["currency"]).ToString(),
+ amount = _amount,
+ currencyCode = _currencyCode,
name = is3DS ? "3D" : form["name"],
shopperEmailAddress = form["shopper-email"],
+ statementNarrative = form["statement-narrative"],
billingAddress = billingAddress,
deliveryAddress = deliveryAddress,
threeDSecureInfo = is3DS ? threeDSInfo : new ThreeDSecureInfo(),
@@ -117,6 +132,11 @@ private void createOrder()
customerOrderCode = "A123"
};
+ if (!string.IsNullOrEmpty(form["settlement-currency"]))
+ {
+ request.settlementCurrency = form["settlement-currency"];
+ }
+
try
{
var response = client.GetOrderService().Create(request);
@@ -138,7 +158,9 @@ private void createOrder()
private void createAPMOrder()
{
var form = HttpContext.Current.Request.Form;
- var client = new WorldpayRestClient((string)Session["service_key"]);
+ var client = new WorldpayRestClient((string)Session["apiEndpoint"], (string)Session["service_key"]);
+ int? _amount = null;
+ var _currencyCode = "";
Dictionary custIdentifiers = new Dictionary();
try
@@ -148,6 +170,18 @@ private void createAPMOrder()
}
catch (Exception exc) { }
+ try
+ {
+ _amount = (int)(Convert.ToDecimal(form["amount"]) * 100);
+ }
+ catch (Exception excAmount) { }
+
+ try
+ {
+ _currencyCode = Enum.Parse(typeof(CurrencyCode), form["currency"]).ToString();
+ }
+ catch (Exception excCurrency) { }
+
var billingAddress = new Address()
{
address1 = form["address1"],
@@ -177,12 +211,13 @@ private void createAPMOrder()
token = form["token"],
name = form["name"],
shopperEmailAddress = form["shopper-email"],
+ statementNarrative = form["statement-narrative"],
orderDescription = form["description"],
- amount = (int)(Convert.ToDecimal(form["amount"]) * 100),
- currencyCode = Enum.Parse(typeof(CurrencyCode), form["currency"]).ToString(),
+ amount = _amount,
+ currencyCode = _currencyCode,
billingAddress = billingAddress,
deliveryAddress = deliveryAddress,
- customerIdentifiers = JavaScriptConvert.DeserializeObject>(form["customer-identifiers"]),
+ customerIdentifiers = custIdentifiers,
customerOrderCode = "A123",
successUrl = form["success-url"],
failureUrl = form["failure-url"],
@@ -190,6 +225,11 @@ private void createAPMOrder()
cancelUrl = form["cancel-url"]
};
+ if (!string.IsNullOrEmpty(form["settlement-currency"]))
+ {
+ request.settlementCurrency = form["settlement-currency"];
+ }
+
try
{
var response = client.GetOrderService().Create(request);
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/CreateOrder.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ErrorControl.ascx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ErrorControl.ascx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ErrorControl.ascx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ErrorControl.ascx.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ErrorControl.ascx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/ErrorControl.ascx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/GetOrder.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/GetOrder.aspx
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/GetOrder.aspx.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/GetOrder.aspx.cs
old mode 100644
new mode 100755
index 5bedf05..14bf2c9
--- a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/GetOrder.aspx.cs
+++ b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/GetOrder.aspx.cs
@@ -23,7 +23,7 @@ protected void OnGetOrder(object sender, CommandEventArgs e)
throw new WorldpayException("Order code must be specified");
}
- var client = new WorldpayRestClient(Configuration.ServiceKey);
+ var client = new WorldpayRestClient((string)Session["apiEndpoint"], (string)Session["service_key"]);
try
{
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/GetOrder.aspx.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/GetOrder.aspx.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Global.asax b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Global.asax
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Global.asax.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Global.asax.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/JsonUtils.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/JsonUtils.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Master.Master b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Master.Master
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Master.Master.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Master.Master.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Master.Master.designer.cs b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Master.Master.designer.cs
old mode 100644
new mode 100755
diff --git a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Navbar.aspx b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Navbar.aspx
old mode 100644
new mode 100755
index 0ebe3e7..d3bc012
--- a/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Navbar.aspx
+++ b/worldpay-sample-dotnet-2-0/Worldpay.Sdk.Examples/Navbar.aspx
@@ -12,7 +12,7 @@
formData += '&serviceKey=' + obj.service_key;
formData += '&clientKey=' + obj.client_key;
$.ajax({
- url: '/ConfigurationService.asmx/Test',
+ url: '<%Response.Write(Request.Url.Scheme + "://" + Request.Url.Authority + Request.ApplicationPath.TrimEnd('/') + "/ConfigurationService.asmx/Test");%>',
type: 'POST',
dataType: 'text',
data: formData,
@@ -88,12 +88,12 @@