OctopusDeploy release: 1.7.43

securesubmit-buildmaster · securesubmit-buildmaster · commit 8e5e1825a69f · 2021-09-23T08:03:56.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 ## Latest
 
+#### Bug Fixes:
+
+- Fix issue in v1.7.31 and up for eCheck auths on Portico/Heartland
+
+---
+
+## v1.7.42 (09/09/2021)
+
+#### Enhancements
+
+- Add Entry Mode to GpApi
+
+---
+
+## v1.7.42 (09/09/2021)
+
 #### Enhancements
 
 - Add Dynamic Headers to GpApi
diff --git a/examples/webforms/end-to-end/Properties/AssemblyInfo.cs b/examples/webforms/end-to-end/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.8.2")]
-[assembly: AssemblyFileVersion("1.8.2")]
+[assembly: AssemblyVersion("1.8.4")]
+[assembly: AssemblyFileVersion("1.8.4")]
diff --git a/src/GlobalPayments.Api/Entities/Enums.cs b/src/GlobalPayments.Api/Entities/Enums.cs
@@ -168,7 +168,28 @@ public enum EntryMethod {
         /// <summary>
         /// Indicates proximity/contactless entry.
         /// </summary>
-        Proximity
+        Proximity,
+    }
+
+    /// <summary>
+    /// Indicates how the payment method data was obtained.
+    /// </summary>
+    public enum ManualEntryMethod
+    {
+        /// <summary>
+        /// Indicates manual entry.
+        /// </summary>
+        Moto,
+
+        /// <summary>
+        /// Indicates swipe entry.
+        /// </summary>
+        Mail,
+
+        /// <summary>
+        /// Indicates proximity/contactless entry.
+        /// </summary>
+        Phone
     }
 
     /// <summary>
diff --git a/src/GlobalPayments.Api/Entities/GpApi/GpApiAuthorizationRequestBuilder.cs b/src/GlobalPayments.Api/Entities/GpApi/GpApiAuthorizationRequestBuilder.cs
@@ -9,7 +9,7 @@ namespace GlobalPayments.Api.Entities {
     internal class GpApiAuthorizationRequestBuilder {
         internal static GpApiRequest BuildRequest(AuthorizationBuilder builder, GpApiConnector gateway) {
             var paymentMethod = new JsonDoc()
-                .Set("entry_mode", GetEntryMode(builder)); // [MOTO, ECOM, IN_APP, CHIP, SWIPE, MANUAL, CONTACTLESS_CHIP, CONTACTLESS_SWIPE]
+                .Set("entry_mode", GetEntryMode(builder, gateway.Channel)); // [MOTO, ECOM, IN_APP, CHIP, SWIPE, MANUAL, CONTACTLESS_CHIP, CONTACTLESS_SWIPE]
             if (builder.PaymentMethod is CreditCardData && (builder.TransactionModifier == TransactionModifier.EncryptedMobile || builder.TransactionModifier == TransactionModifier.DecryptedMobile))
             {
                 var digitalWallet = new JsonDoc();
@@ -100,7 +100,7 @@ internal static GpApiRequest BuildRequest(AuthorizationBuilder builder, GpApiCon
                             if (builder.PaymentMethod is ITokenizable && !string.IsNullOrEmpty((builder.PaymentMethod as ITokenizable).Token)) {
                                 verificationData.Remove("payment_method");
                                 verificationData.Set("payment_method", new JsonDoc()
-                                    .Set("entry_mode", GetEntryMode(builder))
+                                    .Set("entry_mode", GetEntryMode(builder, gateway.Channel))
                                     .Set("id", (builder.PaymentMethod as ITokenizable).Token)
                                 );
                             }
@@ -273,6 +273,57 @@ internal static GpApiRequest BuildRequest(AuthorizationBuilder builder, GpApiCon
             };
         }
 
+        private static string GetEntryMode(AuthorizationBuilder builder,Channel channel)
+        {
+            if (channel == Channel.CardPresent)
+            {
+                if (builder.PaymentMethod is ITrackData) {
+                    var paymentMethod = (ITrackData)builder.PaymentMethod;
+                    if (builder.TagData != null)
+                    {
+                        if (paymentMethod.EntryMethod == EntryMethod.Proximity)
+                        {
+                            return "CONTACTLESS_CHIP";
+                        }
+                        return "CHIP";
+                    }
+                    if (paymentMethod.EntryMethod == EntryMethod.Swipe) 
+                    {
+                        return "SWIPE";
+                    }
+                }
+                if (builder.PaymentMethod is ICardData && ((ICardData)builder.PaymentMethod).CardPresent)
+                {
+                    return "MANUAL";
+                }
+                return "SWIPE";
+            } else
+            {
+                if (builder.PaymentMethod is ICardData) 
+                {
+                    var paymentMethod = (ICardData)builder.PaymentMethod;
+                    if (paymentMethod.ReaderPresent) 
+                    {
+                        return "ECOM";
+                    }
+                    else
+                    {
+                        switch (paymentMethod?.EntryMethod) {
+                        case ManualEntryMethod.Phone:
+                            return "PHONE";
+                        case ManualEntryMethod.Moto:
+                            return "MOTO";
+                        case ManualEntryMethod.Mail:
+                            return "MAIL";
+                            default:
+                            break;
+                        }
+                    }
+                }
+                return "ECOM";
+            }
+        }
+
         private static string GetEci(CreditCardData creditCardData)
         {
 
@@ -300,27 +351,6 @@ private static string GetEci(CreditCardData creditCardData)
 
         }
 
-        private static string GetEntryMode(AuthorizationBuilder builder) {
-            if (builder.PaymentMethod is ICardData card) {
-                if (card.ReaderPresent) {
-                    return card.CardPresent ? "MANUAL" : "IN_APP";
-                }
-                else {
-                    return card.CardPresent ? "MANUAL" : "ECOM";
-                }
-            }
-            else if (builder.PaymentMethod is ITrackData track) {
-                if (builder.TagData != null) {
-                    return track.EntryMethod.Equals(EntryMethod.Swipe) ? "CHIP" : "CONTACTLESS_CHIP";
-                }
-                else if (builder.HasEmvFallbackData) {
-                    return "CONTACTLESS_SWIPE";
-                }
-                return "SWIPE";
-            }
-            return "ECOM";
-        }
-
         private static string GetCaptureMode(AuthorizationBuilder builder) {
             if (builder.MultiCapture) {
                 return "MULTIPLE";
diff --git a/src/GlobalPayments.Api/Gateways/PorticoConnector.cs b/src/GlobalPayments.Api/Gateways/PorticoConnector.cs
@@ -294,7 +294,8 @@ public Transaction ProcessAuthorization(AuthorizationBuilder builder) {
             }
 
             // set token flag
-            if (builder.PaymentMethod is ITokenizable) {
+            // eCheck cannot be tokenized w/Portico Gateway
+            if (builder.PaymentMethod is ITokenizable && !(builder.PaymentMethod is eCheck)) {
                 et.SubElement(cardData, "TokenRequest").Text(builder.RequestMultiUseToken ? "Y" : "N");
             }
 
diff --git a/src/GlobalPayments.Api/PaymentMethods/CreditCardData.cs b/src/GlobalPayments.Api/PaymentMethods/CreditCardData.cs
@@ -69,6 +69,8 @@ public string Number {
             }
         }
 
+       public ManualEntryMethod? EntryMethod { get; set; }
+
         /// <summary>
         /// The card's expiration month.
         /// </summary>
diff --git a/src/GlobalPayments.Api/PaymentMethods/EBTCardData.cs b/src/GlobalPayments.Api/PaymentMethods/EBTCardData.cs
@@ -15,6 +15,7 @@ public class EBTCardData : EBT, ICardData {
         public string Number { get; set; }
         public bool ReaderPresent { get; set; }
         public string SerialNumber { get; set; }
+        public ManualEntryMethod? EntryMethod { get; set; }
         public string ShortExpiry {
             get {
                 var month = (ExpMonth.HasValue) ? ExpMonth.ToString().PadLeft(2, '0') : string.Empty;
diff --git a/src/GlobalPayments.Api/PaymentMethods/EwicCardData.cs b/src/GlobalPayments.Api/PaymentMethods/EwicCardData.cs
@@ -15,6 +15,7 @@ public class EwicCardData : Ewic, ICardData
         public int? ExpMonth { get; set ; }
         public int? ExpYear { get; set; }
         public bool ReaderPresent { get; set; }
+        public ManualEntryMethod? EntryMethod { get; set; }
 
         public string ShortExpiry => throw new NotImplementedException();
     }
diff --git a/src/GlobalPayments.Api/PaymentMethods/PaymentInterfaces/ICardData.cs b/src/GlobalPayments.Api/PaymentMethods/PaymentInterfaces/ICardData.cs
@@ -11,5 +11,6 @@ public interface ICardData {
         int? ExpYear { get; set; }
         bool ReaderPresent { get; set; }
         string ShortExpiry { get; }
+        ManualEntryMethod? EntryMethod { get; set; }
     }
 }
diff --git a/src/GlobalPayments.Api/Properties/AssemblyInfo.cs b/src/GlobalPayments.Api/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.2")]
-[assembly: AssemblyFileVersion("1.8.2")]
+[assembly: AssemblyVersion("1.8.4")]
+[assembly: AssemblyFileVersion("1.8.4")]
diff --git a/tests/GlobalPayments.Api.Tests/GpApi/GpApiBatchTests.cs b/tests/GlobalPayments.Api.Tests/GpApi/GpApiBatchTests.cs
@@ -236,6 +236,7 @@ public void CloseBatch_WithCardNumberDetails() {
                 ExpMonth = 05,
                 ExpYear = 2025,
                 Cvn = "123",
+                CardPresent = true
             };
 
             var chargeTransaction = card.Charge(1.99m)
@@ -257,6 +258,7 @@ public void CloseBatch_WithCardNumberDetails_DeclinedTransaction() {
                 ExpMonth = 05,
                 ExpYear = 2025,
                 Cvn = "852",
+                CardPresent = true
             };
 
             var chargeTransaction = card.Charge(1.99m)
diff --git a/tests/GlobalPayments.Api.Tests/GpApi/GpApiCreditTests.cs b/tests/GlobalPayments.Api.Tests/GpApi/GpApiCreditTests.cs
@@ -35,6 +35,7 @@ public void TestInitialize() {
                 ExpMonth = 05,
                 ExpYear = 2025,
                 Cvn = "852",
+                CardPresent = true
             };
         }
 
@@ -647,13 +648,79 @@ public void CreditVerify_CP() {
         }
 
         [TestMethod]
+        public void CreditSaleWithManualEntryMethod()
+        {
+            foreach (Channel channel in Enum.GetValues(typeof(Channel))) 
+            {
+                foreach (ManualEntryMethod entryMethod in Enum.GetValues(typeof(ManualEntryMethod)))
+                {
+                    ServicesContainer.ConfigureService(new GpApiConfig
+                    {
+                        Environment = Entities.Environment.TEST,
+                        AppId = "JF2GQpeCrOivkBGsTRiqkpkdKp67Gxi0",
+                        AppKey = "y7vALnUtFulORlTV",
+                        SecondsToExpire = 60,
+                        Channel = channel,
+                        RequestLogger = new RequestConsoleLogger()
+                    });
+                    card.Cvn = "123";
+                    card.EntryMethod = entryMethod;
+
+                    var response = card.Charge(11m)
+                        .WithCurrency("USD")
+                        .Execute();
+
+                    Assert.IsNotNull(response);
+                    Assert.AreEqual(SUCCESS, response?.ResponseCode);
+                    Assert.AreEqual("CAPTURED", response?.ResponseMessage);
+
+                }
+            }
+        }
+
+        [TestMethod]
+        public void CreditSaleWithEntryMethod()
+        {
+            foreach (EntryMethod entryMethod in Enum.GetValues(typeof(EntryMethod)))
+            {
+                ServicesContainer.ConfigureService(new GpApiConfig
+                {
+                    Environment = Entities.Environment.TEST,
+                    AppId = "JF2GQpeCrOivkBGsTRiqkpkdKp67Gxi0",
+                    AppKey = "y7vALnUtFulORlTV",
+                    SecondsToExpire = 60,
+                    Channel = Channel.CardPresent,
+                    RequestLogger = new RequestConsoleLogger()
+                });
+
+                var creditTrackData = new CreditTrackData
+                {
+                    TrackData =
+                        "%B4012002000060016^VI TEST CREDIT^251210118039000000000396?;4012002000060016=25121011803939600000?",
+                    EntryMethod = entryMethod
+                };
+
+                var response = creditTrackData.Charge(11m)
+                    .WithCurrency("USD")
+                    .Execute();
+
+                Assert.IsNotNull(response);
+                Assert.AreEqual(SUCCESS, response?.ResponseCode);
+                Assert.AreEqual("CAPTURED", response?.ResponseMessage);
+
+            }
+        }
+
+        [TestMethod, Ignore]
+        //To be removed
         public void CreditVerify_CP_CVNNotMatched() {
             ServicesContainer.ConfigureService(new GpApiConfig {
                 Environment = Entities.Environment.TEST,
                 AppId = "JF2GQpeCrOivkBGsTRiqkpkdKp67Gxi0",
                 AppKey = "y7vALnUtFulORlTV",
                 SecondsToExpire = 60,
-                Channel = Channel.CardPresent
+                Channel = Channel.CardPresent,
+                RequestLogger = new RequestConsoleLogger(),
             });
             var response = card.Verify()
                 .WithCurrency("USD")
diff --git a/tests/GlobalPayments.Api.Tests/GpApi/GpApiDebitTests.cs b/tests/GlobalPayments.Api.Tests/GpApi/GpApiDebitTests.cs
@@ -387,7 +387,8 @@ private static CreditCardData InitializeCreditCardData() {
                 ExpMonth = DateTime.Now.Month,
                 ExpYear = DateTime.Now.Year + 1,
                 Cvn = "123",
-                CardHolderName = "John Smith"
+                CardHolderName = "John Smith",
+                CardPresent = true
             };
 
             return card;
diff --git a/tests/GlobalPayments.Api.Tests/GpApi/GpApiDigitalWalletTests.cs b/tests/GlobalPayments.Api.Tests/GpApi/GpApiDigitalWalletTests.cs
@@ -84,7 +84,7 @@ public void PayWithDecryptedFlow()
         [TestMethod]
         public void PayWithGooglePayEncrypted()
         {
-            card.Token = "{\"signature\": \"MEUCIBIVOWdzNCngMnVzt3puh3538CpA66lRPqfEsPMEwVn2AiEAtT3NsjFMcvseKCgtTKZLoVlMYsnlgwgvbZLm9Sm0WK8=\",\"protocolVersion\": \"ECv1\",\"signedMessage\": \"{\\\"encryptedMessage\\\":\\\"jUzgICpwU5OtRSS+nDh9kEGZViqylerkdzIRbmOidf/IQXpKzFeMdCO6QoBAVCX4PLreJ+s8h/l2Czm4VxbiSWHdTOwW03iCnkxohKx00KePanypfI0zg8XO/EOauK3LNHvFFwOnCj9GbL35p21R/lEImXWiiMtXMGwlW2fNJQcB/fiOwkwX4dAVOQspQoYvBwLci/PBIGl91MJfYicTG27MhXHCjNjpwivuzhdPGDps23gLojzhKNBjfsEFwnzreAIhZcBaKsI7lGBBzBJHgR5dkB4fh6odb6Dr4AxUndqg9QgPoKy9m51FWWnycppPPmNPao2rAKndWXWvQ82YEdlyGJUG1bstsWeGmipGowXjiDIhaOdJEzXS1FtA0tSkrPB4Bt9da6ehS0HLOT0129c1Otj8bYsMMMuYczV6Co2QPK3B0+6kkqdoXaxOIc4bxZKh\\\",\\\"ephemeralPublicKey\\\":\\\"BPNqktib5dgo1tX4YWoUVqp/I/wEN5O+1exJjbSRj556mtVR3fkxQjvdIOmlm1+Vmj/cRNkuS2i3246cMTfjWuI\\\\u003d\\\",\\\"tag\\\":\\\"JDMNgNq8BGryVrt5bRMYHXjX+CVcuFYS3w3nmfkIHEA\\\\u003d\\\"}\"}";
+            card.Token = "{\"signature\": \"MEUCIA2qsciCz8TbEip0DQj+MlepsY4c+lPviHZKDGiXjXA7AiEAqT4VMRuBaCbUBg+3VKNsT8wMk4JMH0grQfs+FvUfh7g=\",\"protocolVersion\":\"ECv1\",\"signedMessage\":\"{\\\"encryptedMessage\\\":\\\"W95GDp6cr6EdVF/636k7WwGDE7OnckY8BvDSREcuBknWklR2OQ18m0ep56XvnZ5WE+Fxeux5bYbJ2so0uhg2v831eyZ+JAMPTdtZnYBKaYa6Sb5/yMPXxqgxyxJTDzGf4jK6MCS2ZNd3ixNjAJEJlO2h0IstbMTkosaqLwpBu8ccXiCiX7aKOJlJvocNz6ZdMEvutg6D/NeCTbXPp+rg6CFCdM5WT83QBudKCys9cczVky+UKe482o+BBVcPFkkTXeobp1pfN+6C2W/afLwRev7KMaio5cu1xxnoWZp+NhXqGCGK0CP93cP/KwIx8WcPl9JgwVLbxhRvBuwuMn3HRiJOQtPTMvK7qhlb2D8fjRqucrtbkANUJ5oSvq93KYLeZCVL+q0lEmeTkQT6ijnecw0uZJux3FEWNPr9z7t3CFRPZxKDaBU94J6MCaiA4Ab6LyD8\\\",\\\"ephemeralPublicKey\\\":\\\"BGCfvboHSFYyWBHQGmAe9HU3os4yESDytXEBLDqocF6EFx6P2tqMve+wIgg31dNAv4PMg1S0ccv8JLPQMxsIeLE\\\\u003d\\\",\\\"tag\\\":\\\"lglkIFne4g8KFQep85vO6wSzzw+olmJ3aUTqy98k7HE\\\\u003d\\\"}\"}";
             card.MobileType = EncyptedMobileType.GOOGLE_PAY;
 
             var transaction = card.Charge(10m)
@@ -101,7 +101,7 @@ public void PayWithGooglePayEncrypted()
         [TestMethod]
         public void GooglePayEncrypted_LinkedRefund()
         {
-            card.Token = "{\"signature\": \"MEUCIBIVOWdzNCngMnVzt3puh3538CpA66lRPqfEsPMEwVn2AiEAtT3NsjFMcvseKCgtTKZLoVlMYsnlgwgvbZLm9Sm0WK8=\",\"protocolVersion\": \"ECv1\",\"signedMessage\": \"{\\\"encryptedMessage\\\":\\\"jUzgICpwU5OtRSS+nDh9kEGZViqylerkdzIRbmOidf/IQXpKzFeMdCO6QoBAVCX4PLreJ+s8h/l2Czm4VxbiSWHdTOwW03iCnkxohKx00KePanypfI0zg8XO/EOauK3LNHvFFwOnCj9GbL35p21R/lEImXWiiMtXMGwlW2fNJQcB/fiOwkwX4dAVOQspQoYvBwLci/PBIGl91MJfYicTG27MhXHCjNjpwivuzhdPGDps23gLojzhKNBjfsEFwnzreAIhZcBaKsI7lGBBzBJHgR5dkB4fh6odb6Dr4AxUndqg9QgPoKy9m51FWWnycppPPmNPao2rAKndWXWvQ82YEdlyGJUG1bstsWeGmipGowXjiDIhaOdJEzXS1FtA0tSkrPB4Bt9da6ehS0HLOT0129c1Otj8bYsMMMuYczV6Co2QPK3B0+6kkqdoXaxOIc4bxZKh\\\",\\\"ephemeralPublicKey\\\":\\\"BPNqktib5dgo1tX4YWoUVqp/I/wEN5O+1exJjbSRj556mtVR3fkxQjvdIOmlm1+Vmj/cRNkuS2i3246cMTfjWuI\\\\u003d\\\",\\\"tag\\\":\\\"JDMNgNq8BGryVrt5bRMYHXjX+CVcuFYS3w3nmfkIHEA\\\\u003d\\\"}\"}";
+            card.Token = "{\"signature\": \"MEUCIA2qsciCz8TbEip0DQj+MlepsY4c+lPviHZKDGiXjXA7AiEAqT4VMRuBaCbUBg+3VKNsT8wMk4JMH0grQfs+FvUfh7g=\",\"protocolVersion\":\"ECv1\",\"signedMessage\":\"{\\\"encryptedMessage\\\":\\\"W95GDp6cr6EdVF/636k7WwGDE7OnckY8BvDSREcuBknWklR2OQ18m0ep56XvnZ5WE+Fxeux5bYbJ2so0uhg2v831eyZ+JAMPTdtZnYBKaYa6Sb5/yMPXxqgxyxJTDzGf4jK6MCS2ZNd3ixNjAJEJlO2h0IstbMTkosaqLwpBu8ccXiCiX7aKOJlJvocNz6ZdMEvutg6D/NeCTbXPp+rg6CFCdM5WT83QBudKCys9cczVky+UKe482o+BBVcPFkkTXeobp1pfN+6C2W/afLwRev7KMaio5cu1xxnoWZp+NhXqGCGK0CP93cP/KwIx8WcPl9JgwVLbxhRvBuwuMn3HRiJOQtPTMvK7qhlb2D8fjRqucrtbkANUJ5oSvq93KYLeZCVL+q0lEmeTkQT6ijnecw0uZJux3FEWNPr9z7t3CFRPZxKDaBU94J6MCaiA4Ab6LyD8\\\",\\\"ephemeralPublicKey\\\":\\\"BGCfvboHSFYyWBHQGmAe9HU3os4yESDytXEBLDqocF6EFx6P2tqMve+wIgg31dNAv4PMg1S0ccv8JLPQMxsIeLE\\\\u003d\\\",\\\"tag\\\":\\\"lglkIFne4g8KFQep85vO6wSzzw+olmJ3aUTqy98k7HE\\\\u003d\\\"}\"}";
             card.MobileType = EncyptedMobileType.GOOGLE_PAY;
 
             var transaction = card.Charge(10m)
@@ -124,10 +124,10 @@ public void GooglePayEncrypted_LinkedRefund()
         [TestMethod]
         public void GooglePayEncrypted_Reverse()
         {
-            card.Token = "{\"signature\": \"MEUCIBIVOWdzNCngMnVzt3puh3538CpA66lRPqfEsPMEwVn2AiEAtT3NsjFMcvseKCgtTKZLoVlMYsnlgwgvbZLm9Sm0WK8=\",\"protocolVersion\": \"ECv1\",\"signedMessage\": \"{\\\"encryptedMessage\\\":\\\"jUzgICpwU5OtRSS+nDh9kEGZViqylerkdzIRbmOidf/IQXpKzFeMdCO6QoBAVCX4PLreJ+s8h/l2Czm4VxbiSWHdTOwW03iCnkxohKx00KePanypfI0zg8XO/EOauK3LNHvFFwOnCj9GbL35p21R/lEImXWiiMtXMGwlW2fNJQcB/fiOwkwX4dAVOQspQoYvBwLci/PBIGl91MJfYicTG27MhXHCjNjpwivuzhdPGDps23gLojzhKNBjfsEFwnzreAIhZcBaKsI7lGBBzBJHgR5dkB4fh6odb6Dr4AxUndqg9QgPoKy9m51FWWnycppPPmNPao2rAKndWXWvQ82YEdlyGJUG1bstsWeGmipGowXjiDIhaOdJEzXS1FtA0tSkrPB4Bt9da6ehS0HLOT0129c1Otj8bYsMMMuYczV6Co2QPK3B0+6kkqdoXaxOIc4bxZKh\\\",\\\"ephemeralPublicKey\\\":\\\"BPNqktib5dgo1tX4YWoUVqp/I/wEN5O+1exJjbSRj556mtVR3fkxQjvdIOmlm1+Vmj/cRNkuS2i3246cMTfjWuI\\\\u003d\\\",\\\"tag\\\":\\\"JDMNgNq8BGryVrt5bRMYHXjX+CVcuFYS3w3nmfkIHEA\\\\u003d\\\"}\"}";
+            card.Token = "{\"signature\": \"MEUCIA2qsciCz8TbEip0DQj+MlepsY4c+lPviHZKDGiXjXA7AiEAqT4VMRuBaCbUBg+3VKNsT8wMk4JMH0grQfs+FvUfh7g=\",\"protocolVersion\":\"ECv1\",\"signedMessage\":\"{\\\"encryptedMessage\\\":\\\"W95GDp6cr6EdVF/636k7WwGDE7OnckY8BvDSREcuBknWklR2OQ18m0ep56XvnZ5WE+Fxeux5bYbJ2so0uhg2v831eyZ+JAMPTdtZnYBKaYa6Sb5/yMPXxqgxyxJTDzGf4jK6MCS2ZNd3ixNjAJEJlO2h0IstbMTkosaqLwpBu8ccXiCiX7aKOJlJvocNz6ZdMEvutg6D/NeCTbXPp+rg6CFCdM5WT83QBudKCys9cczVky+UKe482o+BBVcPFkkTXeobp1pfN+6C2W/afLwRev7KMaio5cu1xxnoWZp+NhXqGCGK0CP93cP/KwIx8WcPl9JgwVLbxhRvBuwuMn3HRiJOQtPTMvK7qhlb2D8fjRqucrtbkANUJ5oSvq93KYLeZCVL+q0lEmeTkQT6ijnecw0uZJux3FEWNPr9z7t3CFRPZxKDaBU94J6MCaiA4Ab6LyD8\\\",\\\"ephemeralPublicKey\\\":\\\"BGCfvboHSFYyWBHQGmAe9HU3os4yESDytXEBLDqocF6EFx6P2tqMve+wIgg31dNAv4PMg1S0ccv8JLPQMxsIeLE\\\\u003d\\\",\\\"tag\\\":\\\"lglkIFne4g8KFQep85vO6wSzzw+olmJ3aUTqy98k7HE\\\\u003d\\\"}\"}";
             card.MobileType = EncyptedMobileType.GOOGLE_PAY;
 
-                var transaction = card.Charge(10m)
+            var transaction = card.Charge(10m)
                     .WithCurrency("EUR")
                     .WithModifier(TransactionModifier.EncryptedMobile)
                     .Execute();
diff --git a/tests/GlobalPayments.Api.Tests/GpApi/GpApiEbtTests.cs b/tests/GlobalPayments.Api.Tests/GpApi/GpApiEbtTests.cs
@@ -27,7 +27,8 @@ public void TestInitialize() {
                 ExpMonth = 12,
                 ExpYear = 2025,
                 PinBlock = "32539F50C245A6A93D123412324000AA",
-                CardHolderName = "Jane Doe"
+                CardHolderName = "Jane Doe",
+                CardPresent = true
             };
 
             ebtTrackData = new EBTTrackData {

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,8 @@ public Transaction ProcessAuthorization(AuthorizationBuilder builder) {`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`// set token flag`
`297`		`- if (builder.PaymentMethod is ITokenizable) {`
	`297`	`+ // eCheck cannot be tokenized w/Portico Gateway`
	`298`	`+ if (builder.PaymentMethod is ITokenizable && !(builder.PaymentMethod is eCheck)) {`
`298`	`299`	`et.SubElement(cardData, "TokenRequest").Text(builder.RequestMultiUseToken ? "Y" : "N");`
`299`	`300`	`}`
`300`	`301`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ public string Number {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ public ManualEntryMethod? EntryMethod { get; set; }`
	`73`	`+`
`72`	`74`	`/// <summary>`
`73`	`75`	`/// The card's expiration month.`
`74`	`76`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public class EwicCardData : Ewic, ICardData`
`15`	`15`	`public int? ExpMonth { get; set ; }`
`16`	`16`	`public int? ExpYear { get; set; }`
`17`	`17`	`public bool ReaderPresent { get; set; }`
	`18`	`+ public ManualEntryMethod? EntryMethod { get; set; }`
`18`	`19`
`19`	`20`	`public string ShortExpiry => throw new NotImplementedException();`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,6 @@ public interface ICardData {`
`11`	`11`	`int? ExpYear { get; set; }`
`12`	`12`	`bool ReaderPresent { get; set; }`
`13`	`13`	`string ShortExpiry { get; }`
	`14`	`+ ManualEntryMethod? EntryMethod { get; set; }`
`14`	`15`	`}`
`15`	`16`	`}`