From 9475c865ec3f9b58353af5f979139ba5e7591b7f Mon Sep 17 00:00:00 2001 From: Joseph Anderson Date: Thu, 18 Apr 2019 10:46:47 -0400 Subject: [PATCH 1/2] JSON Error Fixed Error converting value "MASTER_CARD" to type 'System.Nullable`1[Square.Connect.Model.V1Tender+CardBrandEnum]'. Path '[3].tender[0].card_brand', line 1, position 10491. --- .gitignore | 4 +++ Square.Connect.sln | 49 +++++++++++++++------------- src/Square.Connect/Model/V1Tender.cs | 2 +- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index cb1f821..79db54f 100644 --- a/.gitignore +++ b/.gitignore @@ -185,3 +185,7 @@ $RECYCLE.BIN/ **/*.sln.ide travis-ci/accounts.json +.vs/Square.Connect/v15/Server/sqlite3/db.lock +.vs/Square.Connect/v15/Server/sqlite3/storage.ide +.vs/Square.Connect/v15/Server/sqlite3/storage.ide-shm +.vs/Square.Connect/v15/Server/sqlite3/storage.ide-wal diff --git a/Square.Connect.sln b/Square.Connect.sln index d8c7825..d424f0b 100644 --- a/Square.Connect.sln +++ b/Square.Connect.sln @@ -1,27 +1,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -VisualStudioVersion = 12.0.0.0 -MinimumVisualStudioVersion = 10.0.0.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.Connect", "src\Square.Connect\Square.Connect.csproj", "{4A65C772-5862-4E64-B742-0C6997700CD8}" +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2009 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Square.Connect", "src\Square.Connect\Square.Connect.csproj", "{4A65C772-5862-4E64-B742-0C6997700CD8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Square.Connect.Test", "src\Square.Connect.Test\Square.Connect.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Square.Connect.Test", "src\Square.Connect.Test\Square.Connect.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" EndProject Global -GlobalSection(SolutionConfigurationPlatforms) = preSolution -Debug|Any CPU = Debug|Any CPU -Release|Any CPU = Release|Any CPU -EndGlobalSection -GlobalSection(ProjectConfigurationPlatforms) = postSolution -{4A65C772-5862-4E64-B742-0C6997700CD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -{4A65C772-5862-4E64-B742-0C6997700CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU -{4A65C772-5862-4E64-B742-0C6997700CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU -{4A65C772-5862-4E64-B742-0C6997700CD8}.Release|Any CPU.Build.0 = Release|Any CPU -{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU -{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU -{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU -EndGlobalSection -GlobalSection(SolutionProperties) = preSolution -HideSolutionNode = FALSE -EndGlobalSection -EndGlobal \ No newline at end of file + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4A65C772-5862-4E64-B742-0C6997700CD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A65C772-5862-4E64-B742-0C6997700CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A65C772-5862-4E64-B742-0C6997700CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A65C772-5862-4E64-B742-0C6997700CD8}.Release|Any CPU.Build.0 = Release|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU + {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {23F077E7-F353-4F5F-8B8B-2531C8E8F226} + EndGlobalSection +EndGlobal diff --git a/src/Square.Connect/Model/V1Tender.cs b/src/Square.Connect/Model/V1Tender.cs index dbd9cb8..6c3775e 100644 --- a/src/Square.Connect/Model/V1Tender.cs +++ b/src/Square.Connect/Model/V1Tender.cs @@ -109,7 +109,7 @@ public enum CardBrandEnum /// /// Enum MASTERCARD for "MASTERCARD" /// - [EnumMember(Value = "MASTERCARD")] + [EnumMember(Value = "MASTER_CARD")] MASTERCARD, /// From 00d902cc5494805d096202b4d5399d35a1da3dcf Mon Sep 17 00:00:00 2001 From: Joseph Anderson Date: Thu, 18 Apr 2019 20:38:20 -0400 Subject: [PATCH 2/2] Added new color --- src/Square.Connect/Model/V1Item.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Square.Connect/Model/V1Item.cs b/src/Square.Connect/Model/V1Item.cs index a51e448..d4bee3f 100644 --- a/src/Square.Connect/Model/V1Item.cs +++ b/src/Square.Connect/Model/V1Item.cs @@ -75,7 +75,13 @@ public enum ColorEnum /// [EnumMember(Value = "4ab200")] _4ab200, - + + /// + /// Enum _13B1BF for 13B1BF + /// + [EnumMember(Value = "13B1BF")] + _13B1BF, + /// /// Enum _0b8000 for "0b8000" ///