Merge with origin

GlobalPayments.Api.sln.GhostDoc.xml

@@ -0,0 +1,60 @@
+<GhostDoc>
+<IgnoreFilePatterns>
+  <IgnoreFilePattern>*.min.js</IgnoreFilePattern>
+  <IgnoreFilePattern>jquery*.js</IgnoreFilePattern>
+</IgnoreFilePatterns>
+  <SpellChecker>
+    <IncludeExtensions>
+    </IncludeExtensions>
+    <IgnoreExtensions>
+    </IgnoreExtensions>
+    <IgnoreFiles>
+    </IgnoreFiles>
+  </SpellChecker>
+<HelpConfigurations selected="HelpFile">
+  <HelpConfiguration name="HelpFile">
+    <OutputPath>.\Help</OutputPath>
+    <CleanupOutputPath>true</CleanupOutputPath>
+    <HelpFileName>BlueBridge</HelpFileName>
+    <HelpFileNamingMethod>MemberName</HelpFileNamingMethod>
+    <ImageFolderPath />
+    <Theme>FlatGray</Theme>
+    <HtmlFormats>
+      <HtmlHelp>true</HtmlHelp>
+      <MSHelpViewer>false</MSHelpViewer>
+      <MSHelp2>false</MSHelp2>
+      <Website>false</Website>
+      <VSIntelliSenseFile>false</VSIntelliSenseFile>
+    </HtmlFormats>
+    <IncludeScopes>
+      <Public>true</Public>
+      <Internal>true</Internal>
+      <Protected>true</Protected>
+      <Private>false</Private>
+      <Inherited>true</Inherited>
+      <InheritedFromReferences>true</InheritedFromReferences>
+      <EnableTags>false</EnableTags>
+      <TagList />
+      <AutoGeneratedDocs />
+      <DocsThatRequireEditing />
+    </IncludeScopes>
+    <SyntaxLanguages>
+      <CSharp>true</CSharp>
+      <VisualBasic>false</VisualBasic>
+      <CPlusPlus>false</CPlusPlus>
+    </SyntaxLanguages>
+    <ResolveCrefLinks>true</ResolveCrefLinks>
+    <HeaderText />
+    <FooterText />
+    <ConceptualContent>
+      <ContentLayout />
+      <MediaContent />
+    </ConceptualContent>
+    <SelectedProjects>
+      <SelectedProject>BlueBridge.CardPresent</SelectedProject>
+    </SelectedProjects>
+  </HelpConfiguration>
+</HelpConfigurations>
+<GeneralProperties>
+</GeneralProperties>
+</GhostDoc>

dir.txt

@@ -0,0 +1,20 @@
+ Volume in drive D is D Drive
+ Volume Serial Number is C6B3-DE8E
+
+ Directory of D:\Source\Repositories\HSS\BlueBear\BlueBridge.CardPresent\dotnet-sdk
+
+11/10/2022  01:53 PM    <DIR>          .
+11/10/2022  01:53 PM    <DIR>          ..
+11/10/2022  11:01 AM             2,289 .gitignore
+11/10/2022  11:01 AM               438 .travis.yml
+11/10/2022  11:01 AM            12,930 CHANGELOG.md
+11/10/2022  01:54 PM                 0 dir.txt
+11/10/2022  11:01 AM           109,984 Doxyfile
+11/10/2022  11:01 AM    <DIR>          examples
+11/10/2022  11:01 AM             2,166 GlobalPayments.Api.sln
+11/10/2022  11:01 AM            15,439 LICENSE.md
+11/10/2022  11:01 AM             5,601 README.md
+11/10/2022  11:01 AM    <DIR>          src
+11/10/2022  11:01 AM    <DIR>          tests
+               8 File(s)        148,847 bytes
+               5 Dir(s)  122,987,163,648 bytes free

src/GlobalPayments.Api/Builders/AuthorizationBuilder.cs

@@ -860,7 +860,7 @@ public AuthorizationBuilder WithMaskedDataResponse(bool value) {
         }
 
         public AuthorizationBuilder WithBlockedCardType(BlockedCardType cardTypesBlocking) {
-            var hasNulls = cardTypesBlocking.GetType().GetTypeInfo().DeclaredFields.All(p => p.GetValue(cardTypesBlocking) == null);            
+            var hasNulls = cardTypesBlocking.GetType().GetProperties().All(p => p.GetValue(cardTypesBlocking) == null);
             if (hasNulls) {            
                 throw new BuilderException("No properties set on the object");
             }

src/GlobalPayments.Api/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("GlobalPayments.Api")]
-[assembly: AssemblyCopyright("Copyright �  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

src/GlobalPayments.Api/Services/HostedService.cs

@@ -103,7 +103,7 @@ private void MapTransactionStatusResponse(ref JsonDoc response)
             .Set("PAYMENT_PURPOSE", response.GetValue<string>("paymentpurpose"))
             .Set("RESULT", response.GetValue<string>("result"))
             .Set($"{_config.ShaHashType}HASH", response.GetValue<string>($"{_config.ShaHashType.ToString().ToLower()}hash"));
-            
+
         }
     }
 }

src/GlobalPayments.Api/Terminals/Builders/TerminalAuthBuilder.cs

@@ -81,6 +81,12 @@ public TerminalAuthBuilder WithEcrId(int ecrId) {
             return this;
         }
 
+        public TerminalAuthBuilder WithEcrId(string ecrId)
+        {
+            EcrId = int.Parse(ecrId);
+            return this;
+        }
+
         public TerminalAuthBuilder WithAllowDuplicates(bool allowDuplicates) {
             AllowDuplicates = allowDuplicates;
             return this;

src/GlobalPayments.Api/Terminals/Builders/TerminalManageBuilder.cs

@@ -41,6 +41,13 @@ public TerminalManageBuilder WithEcrId(int ecrId) {
             EcrId = ecrId;
             return this;
         }
+
+        public TerminalManageBuilder WithEcrId(string ecrId)
+        {
+            EcrId = int.Parse(ecrId);
+            return this;
+        }
+
         public TerminalManageBuilder WithOrigECRRefNumber(string origECRRefNumber)
         {
             OrigECRRefNumber = origECRRefNumber;

src/GlobalPayments.Api/Terminals/DeviceInterface.cs

@@ -113,9 +113,14 @@ public virtual IDeviceResponse StartCard(PaymentMethodType paymentMethodType) {
         public virtual IDeviceResponse SendSaf() {
             throw new UnsupportedTransactionException("This function is not supported by the currently configured device.");
         }
-        public virtual IDeviceResponse StartCardTransaction(UpaParam param, ProcessingIndicator indicator, UpaTransactionData transData) {
-            throw new UnsupportedTransactionException("This function is not supported by the currently configured device.");
+
+        public virtual IDeviceResponse StartCardTransaction(UpaParam param, ProcessingIndicator indicator,
+            UpaTransactionData transData)
+        {
+            throw new UnsupportedTransactionException(
+                "This function is not supported by the currently configured device.");
         }
+
         public virtual IDeviceResponse DeleteResource(string fileName) {
             throw new UnsupportedTransactionException("This function is not supported by the currently configured device.");
         }

src/GlobalPayments.Api/Terminals/TerminalUtilities.cs

@@ -2,6 +2,7 @@
 using GlobalPayments.Api.Terminals.HPA;
 using GlobalPayments.Api.Terminals.UPA;
 using GlobalPayments.Api.Utils;
+using GlobalPayments.Api.Entities.UPA;
 using System;
 using System.Collections.Generic;
 using System.Text;

src/GlobalPayments.Api/Terminals/UPA/Interfaces/MessageEventArgs.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace GlobalPayments.Api.Terminals.UPA
+{
+    public class MessageEventArgs : EventArgs
+    {
+        public MessageEventArgs(string message, Exception exception = null)
+        {
+            Message = message;
+            Exception = exception;
+        }
+
+        public string Message { get; }
+
+        public Exception Exception { get; }
+    }
+}