Merge pull request #40 from d685shvarts/12.17

VantivSDK · web-flow · commit e514c757ebb1 · 2020-10-27T14:01:04.000-04:00
12.17
diff --git a/.gitignore b/.gitignore
@@ -313,4 +313,8 @@ ASALocalRun/
 *.nvuser
 
 # MFractors (Xamarin productivity tool) working folder 
-.mfractor/
+.mfractor/
+
+#DS_Store from MACOS
+.DS_Store
+CnpSdkForNet/.DS_Store
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 
 = Worldpay CNP CHANGELOG
 
+==Version 12.17.0 (October 21, 2020)
+* Feature: Added businessIndicator in authorization, forceCapture, captureGivenAuth, sale, credit
+* Feature: Added businessApplicationIdentifier
+
 
 ==Version 12.16.0 (October 14, 2020)
 * Feature: Added new transaction type: transactionReversal
diff --git a/CnpSdkForNet/CnpSdkForNet/CnpSdkForNet.csproj b/CnpSdkForNet/CnpSdkForNet/CnpSdkForNet.csproj
@@ -3,7 +3,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>dotNetSDKKey.snk</AssemblyOriginatorKeyFile>
-        <PackageVersion>12.16.0</PackageVersion>
+        <PackageVersion>12.17.0</PackageVersion>
         <Title>Vantiv.CnpSdkForNet</Title>
         <Authors>Worldpay</Authors>
         <Copyright>Copyright © Worldpay 2020</Copyright>
diff --git a/CnpSdkForNet/CnpSdkForNet/CnpVersion.cs b/CnpSdkForNet/CnpSdkForNet/CnpVersion.cs
@@ -8,7 +8,7 @@ namespace Cnp.Sdk
      */
     public class CnpVersion
     {
-        public const String CurrentCNPXMLVersion = "12.16";
-        public const String CurrentCNPSDKVersion = "12.16.0";
+        public const String CurrentCNPXMLVersion = "12.17";
+        public const String CurrentCNPSDKVersion = "12.17.0";
     }
 }
diff --git a/CnpSdkForNet/CnpSdkForNet/XmlRequestFields.cs b/CnpSdkForNet/CnpSdkForNet/XmlRequestFields.cs
@@ -299,6 +299,18 @@ public govtTaxTypeEnum taxType
             get { return taxTypeField; }
             set { taxTypeField = value; taxTypeSet = true; }
         }
+        
+        
+        private businessIndicatorEnum businessIndicatorField;
+        private bool businessIndicatorSet;
+        public businessIndicatorEnum businessIndicator
+        {
+            get { return businessIndicatorField; }
+            set { businessIndicatorField = value; businessIndicatorSet = true; }
+        }
+        
+        
+        
         private processingType processingTypeField;
         private bool processingTypeSet;
         public processingType processingType
@@ -467,10 +479,12 @@ public override string Serialize()
                 {
                     xml += "\r\n<customBilling>" + customBilling.Serialize() + "\r\n</customBilling>";
                 }
+
                 if (taxTypeSet)
                 {
                     xml += "\r\n<taxType>" + taxTypeField + "</taxType>";
                 }
+
                 if (enhancedData != null)
                 {
                     xml += "\r\n<enhancedData>" + enhancedData.Serialize() + "\r\n</enhancedData>";
@@ -537,6 +551,12 @@ public override string Serialize()
                 {
                     xml += "\r\n<merchantCategoryCode>" + merchantCategoryCode + "</merchantCategoryCode>";
                 }
+                
+
+                if (businessIndicatorSet)
+                {
+                    xml += "\r\n<businessIndicator>" + businessIndicatorField + "</businessIndicator>";
+                }
             }
 
             xml += "\r\n</authorization>";
@@ -862,6 +882,18 @@ public govtTaxTypeEnum taxType
             get { return taxTypeField; }
             set { taxTypeField = value; taxTypeSet = true; }
         }
+        
+        
+        private businessIndicatorEnum businessIndicatorField;
+        private bool businessIndicatorSet;
+        public businessIndicatorEnum businessIndicator
+        {
+            get { return businessIndicatorField; }
+            set { businessIndicatorField = value; businessIndicatorSet = true; }
+        }
+
+        
+        
         public billMeLaterRequest billMeLaterRequest;
         public enhancedData enhancedData;
         public lodgingInfo lodgingInfo;
@@ -968,6 +1000,7 @@ public override string Serialize()
             {
                 xml += "\r\n<taxType>" + taxTypeField + "</taxType>";
             }
+
             if (billMeLaterRequest != null)
             {
                 xml += "\r\n<billMeLaterRequest>" + billMeLaterRequest.Serialize() + "\r\n</billMeLaterRequest>";
@@ -1016,6 +1049,10 @@ public override string Serialize()
             {
                 xml += "\r\n<merchantCategoryCode>" + merchantCategoryCode + "</merchantCategoryCode>";
             }
+            if (businessIndicatorSet)
+            {
+                xml += "\r\n<businessIndicator>" + businessIndicatorField + "</businessIndicator>";
+            }
             xml += "\r\n</captureGivenAuth>";
             return xml;
         }
@@ -1137,6 +1174,17 @@ public taxTypeIdentifierEnum taxType
             get { return taxTypeField; }
             set { taxTypeField = value; taxTypeSet = true; }
         }
+        
+        private businessIndicatorEnum businessIndicatorField;
+        private bool businessIndicatorSet;
+        public businessIndicatorEnum businessIndicator
+        {
+            get { return businessIndicatorField; }
+            set { businessIndicatorField = value; businessIndicatorSet = true; }
+        }
+
+        
+        
         public billMeLaterRequest billMeLaterRequest;
         public pos pos;
         private string pinField;
@@ -1211,6 +1259,8 @@ public override string Serialize()
             }
             if (payPalNotes != null) xml += "\r\n<payPalNotes>" + SecurityElement.Escape(payPalNotes) + "</payPalNotes>";
             if (actionReason != null) xml += "\r\n<actionReason>" + SecurityElement.Escape(actionReason) + "</actionReason>";
+            if (businessIndicatorSet) xml += "\r\n<businessIndicator>" + businessIndicatorField + "</businessIndicator>";
+
             xml += "\r\n</credit>";
             return xml;
         }
@@ -1618,6 +1668,18 @@ public govtTaxTypeEnum taxType
             get { return taxTypeField; }
             set { taxTypeField = value; taxTypeSet = true; }
         }
+        
+        private businessIndicatorEnum businessIndicatorField;
+        private bool businessIndicatorSet;
+        public businessIndicatorEnum businessIndicator
+        {
+            get { return businessIndicatorField; }
+            set { businessIndicatorField = value; businessIndicatorSet = true; }
+        }
+        
+        
+        
+        
         public enhancedData enhancedData;
         public lodgingInfo lodgingInfo;
         public processingInstructions processingInstructions;
@@ -1727,6 +1789,11 @@ public override string Serialize()
             {
                 xml += "\r\n<merchantCategoryCode>" + merchantCategoryCode + "</merchantCategoryCode>";
             }
+
+            if (businessIndicatorSet)
+            {
+                xml += "\r\n<businessIndicator>" + businessIndicatorField + "</businessIndicator>";
+            }
             
             xml += "\r\n</forceCapture>";
             return xml;
@@ -2169,6 +2236,17 @@ public govtTaxTypeEnum taxType
             get { return taxTypeField; }
             set { taxTypeField = value; taxTypeSet = true; }
         }
+        
+        private businessIndicatorEnum businessIndicatorField;
+        private bool businessIndicatorSet;
+        public businessIndicatorEnum businessIndicator
+        {
+            get { return businessIndicatorField; }
+            set { businessIndicatorField = value; businessIndicatorSet = true; }
+        }
+        
+        
+        
         public enhancedData enhancedData;
         public processingInstructions processingInstructions;
         public pos pos;
@@ -2447,6 +2525,10 @@ public override string Serialize()
             {
                 xml += "\r\n<merchantCategoryCode>" + merchantCategoryCode + "</merchantCategoryCode>";
             }
+            if (businessIndicatorSet)
+            {
+                xml += "\r\n<businessIndicator>" + businessIndicatorField + "</businessIndicator>";
+            }
 
             //if (routingPreferenceSet)
             //{
diff --git a/CnpSdkForNet/CnpSdkForNet/XmlResponseFields.cs b/CnpSdkForNet/CnpSdkForNet/XmlResponseFields.cs
@@ -381,6 +381,14 @@ public enum govtTaxTypeEnum
         /// <remarks/>
         fee,
     }
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.vantivcnp.com/schema")]
+    public enum businessIndicatorEnum
+    {
+        /// <remarks/>
+        consumerBillPayment,
+    }
 
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
@@ -2977,6 +2985,17 @@ public enum affluenceTypeEnum
         [System.Xml.Serialization.XmlEnumAttribute("MASS AFFLUENT")]
         MASSAFFLUENT,
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://www.vantivcnp.com/schema")]
+    public enum businessApplicationIdentifierEnum
+    {
+
+        /// <remarks/>
+        CB,
+    }
 
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
diff --git a/CnpSdkForNet/CnpSdkForNetTest/Functional/TestAuth.cs b/CnpSdkForNet/CnpSdkForNetTest/Functional/TestAuth.cs
@@ -811,5 +811,32 @@ public void SimpleAuthWithLocation()
             Assert.AreEqual(checkDate, response.postDate);
             Assert.AreEqual("sandbox", response.location);
         }
+        
+        [Test]
+        public void SimpleAuthWithBusinessIndicator()
+        {
+            var authorization = new authorization
+            {
+                id = "1",
+                reportGroup = "Planets",
+                orderId = "12344",
+                amount = 106,
+                orderSource = orderSourceType.ecommerce,
+                businessIndicator = businessIndicatorEnum.consumerBillPayment,
+                card = new cardType
+                {
+                    type = methodOfPaymentTypeEnum.VI,
+                    number = "414100000000000000",
+                    expDate = "1210"
+                },
+                customBilling = new customBilling { phone = "1112223333" }
+            };
+            var response = _cnp.Authorize(authorization);
+
+            DateTime checkDate = new DateTime(0001, 1, 1, 00, 00, 00);
+
+            Assert.AreEqual("000", response.response);
+            Assert.AreEqual(checkDate, response.postDate);
+        }
     }
 }
diff --git a/CnpSdkForNet/CnpSdkForNetTest/Functional/TestCaptureGivenAuth.cs b/CnpSdkForNet/CnpSdkForNetTest/Functional/TestCaptureGivenAuth.cs
@@ -306,5 +306,36 @@ public void SimpleCaptureGivenAuthWithCardWithLocation()
             Assert.AreEqual("sandbox", response.location);
             Assert.AreEqual("Approved", response.message);
         }
+        
+        [Test]
+        public void SimpleCaptureGivenAuthWithBusinessIndicator()
+        {
+            var capturegivenauth = new captureGivenAuth
+            {
+                id = "1",
+                amount = 106,
+                orderId = "12344",
+                authInformation = new authInformation
+                {
+                    authDate = new DateTime(2002, 10, 9),
+                    authCode = "543216",
+                    authAmount = 12345,
+                },
+                orderSource = orderSourceType.ecommerce,
+                card = new cardType
+                {
+                    type = methodOfPaymentTypeEnum.VI,
+                    number = "4100000000000000",
+                    expDate = "1210",
+                },
+                processingType = processingType.accountFunding,
+                businessIndicator = businessIndicatorEnum.consumerBillPayment,
+                originalNetworkTransactionId = "abc123",
+                originalTransactionAmount = 123456789
+            };
+
+            var response = _cnp.CaptureGivenAuth(capturegivenauth);
+            Assert.AreEqual("Approved", response.message);
+        }
     }
 }
diff --git a/CnpSdkForNet/CnpSdkForNetTest/Functional/TestCredit.cs b/CnpSdkForNet/CnpSdkForNetTest/Functional/TestCredit.cs
@@ -237,6 +237,27 @@ public void TestCreditWithCardAsync_newMerchantId()
             var response = _cnp.CreditAsync(creditObj, cancellationToken);
             Assert.AreEqual("000", response.Result.response);
         }
+        [Test]
+        public void SimpleCreditWithBusinessIndicator()
+        {
+            var creditObj = new credit
+            {
+                id = "1",
+                reportGroup = "planets",
+                amount = 106,
+                orderId = "2111",
+                orderSource = orderSourceType.ecommerce,
+                businessIndicator = businessIndicatorEnum.consumerBillPayment,
+                card = new cardType
+                {
+                    type = methodOfPaymentTypeEnum.VI,
+                    number = "4100000000000001",
+                    expDate = "1210"
+                }
+            };
 
+            var response = _cnp.Credit(creditObj);
+            Assert.AreEqual("Approved", response.message);
+        }
     }
 }
diff --git a/CnpSdkForNet/CnpSdkForNetTest/Functional/TestForceCapture.cs b/CnpSdkForNet/CnpSdkForNetTest/Functional/TestForceCapture.cs
@@ -172,6 +172,30 @@ public void TestForceCaptureWithCardAsync()
             var response = _cnp.ForceCaptureAsync(forcecapture, cancellationToken);
             Assert.AreEqual("000", response.Result.response);
         }
+        [Test]
+        public void SimpleForceCaptureBusinessIndicator()
+        {
+            var forcecapture = new forceCapture
+            {
+                id = "1",
+                amount = 106,
+                orderId = "12344",
+                orderSource = orderSourceType.ecommerce,
+                processingType = processingType.accountFunding,
+                businessIndicator = businessIndicatorEnum.consumerBillPayment,
+                card = new cardType
+                {
+                    type = methodOfPaymentTypeEnum.VI,
+                    number = "4100000000000001",
+                    expDate = "1210"
+                },
+                merchantCategoryCode = "1111"
+            };
+            
+
+            var response = _cnp.ForceCapture(forcecapture);
+            Assert.AreEqual("Approved", response.message);
+        }
 
     }
 }
diff --git a/CnpSdkForNet/CnpSdkForNetTest/Functional/TestSale.cs b/CnpSdkForNet/CnpSdkForNetTest/Functional/TestSale.cs
diff --git a/CnpSdkForNet/CnpSdkForNetTest/Unit/TestCredit.cs b/CnpSdkForNet/CnpSdkForNetTest/Unit/TestCredit.cs
diff --git a/CnpSdkForNet/CnpSdkForNetTest/Unit/TestForceCapture.cs b/CnpSdkForNet/CnpSdkForNetTest/Unit/TestForceCapture.cs

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Cnp.Sdk`
`8`	`8`	`*/`
`9`	`9`	`public class CnpVersion`
`10`	`10`	`{`
`11`		`- public const String CurrentCNPXMLVersion = "12.16";`
`12`		`- public const String CurrentCNPSDKVersion = "12.16.0";`
	`11`	`+ public const String CurrentCNPXMLVersion = "12.17";`
	`12`	`+ public const String CurrentCNPSDKVersion = "12.17.0";`
`13`	`13`	`}`
`14`	`14`	`}`