Skip to content
This repository was archived by the owner on Apr 23, 2021. It is now read-only.

JSON Error #114

Open
jmawebtech wants to merge 2 commits into
base: master
Choose a base branch
from
Open

JSON Error #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9475c86
JSON Error
Apr 18, 2019
00d902c
Added new color
Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
49 changes: 26 additions & 23 deletions Square.Connect.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
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
8 changes: 7 additions & 1 deletion src/Square.Connect/Model/V1Item.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,13 @@ public enum ColorEnum
/// </summary>
[EnumMember(Value = "4ab200")]
_4ab200,


/// <summary>
/// Enum _13B1BF for 13B1BF
/// </summary>
[EnumMember(Value = "13B1BF")]
_13B1BF,

/// <summary>
/// Enum _0b8000 for "0b8000"
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Square.Connect/Model/V1Tender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public enum CardBrandEnum
/// <summary>
/// Enum MASTERCARD for "MASTERCARD"
/// </summary>
[EnumMember(Value = "MASTERCARD")]
[EnumMember(Value = "MASTER_CARD")]
MASTERCARD,

/// <summary>
Expand Down