Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions src/Merge.Client.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{19553BD2-51BE-463B-ABEE-237BADF72B8A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{EF167235-17EB-4623-8F0B-669EFF416B01}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{1B8B8673-78F7-4998-B45C-70EC71615B85}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -16,13 +16,13 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{19553BD2-51BE-463B-ABEE-237BADF72B8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19553BD2-51BE-463B-ABEE-237BADF72B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19553BD2-51BE-463B-ABEE-237BADF72B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{19553BD2-51BE-463B-ABEE-237BADF72B8A}.Release|Any CPU.Build.0 = Release|Any CPU
{1B8B8673-78F7-4998-B45C-70EC71615B85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B8B8673-78F7-4998-B45C-70EC71615B85}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B8B8673-78F7-4998-B45C-70EC71615B85}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B8B8673-78F7-4998-B45C-70EC71615B85}.Release|Any CPU.Build.0 = Release|Any CPU
{EF167235-17EB-4623-8F0B-669EFF416B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF167235-17EB-4623-8F0B-669EFF416B01}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF167235-17EB-4623-8F0B-669EFF416B01}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF167235-17EB-4623-8F0B-669EFF416B01}.Release|Any CPU.Build.0 = Release|Any CPU
{DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
3 changes: 0 additions & 3 deletions src/Merge.Client/Accounting/AccountingClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public AccountingClient(RawClient client)
PhoneNumbers = new PhoneNumbersClient(_client);
PurchaseOrders = new PurchaseOrdersClient(_client);
RegenerateKey = new RegenerateKeyClient(_client);
SelectiveSync = new SelectiveSyncClient(_client);
SyncStatus = new SyncStatusClient(_client);
ForceResync = new ForceResyncClient(_client);
TaxRates = new TaxRatesClient(_client);
Expand Down Expand Up @@ -113,8 +112,6 @@ public AccountingClient(RawClient client)

public RegenerateKeyClient RegenerateKey { get; }

public SelectiveSyncClient SelectiveSync { get; }

public SyncStatusClient SyncStatus { get; }

public ForceResyncClient ForceResync { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class AuditTrailListRequest
public string? EndDate { get; init; }

/// <summary>
/// If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`
/// If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`
/// </summary>
public string? EventType { get; init; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ public Dictionary<
/// The language code for the language to localize Merge Link to.
/// </summary>
public string? Language { get; init; }

/// <summary>
/// A JSON object containing integration-specific configuration options.
/// </summary>
public Dictionary<string, object>? IntegrationSpecificConfig { get; init; }
}
98 changes: 0 additions & 98 deletions src/Merge.Client/Accounting/SelectiveSync/SelectiveSyncClient.cs

This file was deleted.

This file was deleted.

This file was deleted.

5 changes: 4 additions & 1 deletion src/Merge.Client/Accounting/Types/Account.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ public class Account
[JsonPropertyName("remote_id")]
public string? RemoteId { get; init; }

/// <summary>
/// The datetime that this object was created by Merge.
/// </summary>
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; init; }

/// <summary>
/// This is the datetime that this object was last updated by Merge
/// The datetime that this object was modified by Merge.
/// </summary>
[JsonPropertyName("modified_at")]
public DateTime? ModifiedAt { get; init; }
Expand Down
5 changes: 4 additions & 1 deletion src/Merge.Client/Accounting/Types/AccountingAttachment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ public class AccountingAttachment
[JsonPropertyName("remote_id")]
public string? RemoteId { get; init; }

/// <summary>
/// The datetime that this object was created by Merge.
/// </summary>
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; init; }

/// <summary>
/// This is the datetime that this object was last updated by Merge
/// The datetime that this object was modified by Merge.
/// </summary>
[JsonPropertyName("modified_at")]
public DateTime? ModifiedAt { get; init; }
Expand Down
5 changes: 4 additions & 1 deletion src/Merge.Client/Accounting/Types/AccountingPeriod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ public class AccountingPeriod
[JsonPropertyName("id")]
public string? Id { get; init; }

/// <summary>
/// The datetime that this object was created by Merge.
/// </summary>
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; init; }

/// <summary>
/// This is the datetime that this object was last updated by Merge
/// The datetime that this object was modified by Merge.
/// </summary>
[JsonPropertyName("modified_at")]
public DateTime? ModifiedAt { get; init; }
Expand Down
5 changes: 4 additions & 1 deletion src/Merge.Client/Accounting/Types/AccountingPhoneNumber.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ namespace Merge.Client.Accounting;

public class AccountingPhoneNumber
{
/// <summary>
/// The datetime that this object was created by Merge.
/// </summary>
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; init; }

/// <summary>
/// This is the datetime that this object was last updated by Merge
/// The datetime that this object was modified by Merge.
/// </summary>
[JsonPropertyName("modified_at")]
public DateTime? ModifiedAt { get; init; }
Expand Down
5 changes: 4 additions & 1 deletion src/Merge.Client/Accounting/Types/Address.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ namespace Merge.Client.Accounting;

public class Address
{
/// <summary>
/// The datetime that this object was created by Merge.
/// </summary>
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; init; }

/// <summary>
/// This is the datetime that this object was last updated by Merge
/// The datetime that this object was modified by Merge.
/// </summary>
[JsonPropertyName("modified_at")]
public DateTime? ModifiedAt { get; init; }
Expand Down
3 changes: 3 additions & 0 deletions src/Merge.Client/Accounting/Types/AuditLogEvent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ public class AuditLogEvent
/// - `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC
/// - `MUTED_ISSUE` - MUTED_ISSUE
/// - `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK
/// - `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK
/// - `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK
/// - `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED
/// </summary>
[JsonPropertyName("event_type")]
public EventTypeEnum EventType { get; init; }
Expand Down
5 changes: 4 additions & 1 deletion src/Merge.Client/Accounting/Types/BalanceSheet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ public class BalanceSheet
[JsonPropertyName("remote_id")]
public string? RemoteId { get; init; }

/// <summary>
/// The datetime that this object was created by Merge.
/// </summary>
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; init; }

/// <summary>
/// This is the datetime that this object was last updated by Merge
/// The datetime that this object was modified by Merge.
/// </summary>
[JsonPropertyName("modified_at")]
public DateTime? ModifiedAt { get; init; }
Expand Down
5 changes: 4 additions & 1 deletion src/Merge.Client/Accounting/Types/CashFlowStatement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ public class CashFlowStatement
[JsonPropertyName("remote_id")]
public string? RemoteId { get; init; }

/// <summary>
/// The datetime that this object was created by Merge.
/// </summary>
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; init; }

/// <summary>
/// This is the datetime that this object was last updated by Merge
/// The datetime that this object was modified by Merge.
/// </summary>
[JsonPropertyName("modified_at")]
public DateTime? ModifiedAt { get; init; }
Expand Down
5 changes: 4 additions & 1 deletion src/Merge.Client/Accounting/Types/CompanyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ public class CompanyInfo
[JsonPropertyName("remote_id")]
public string? RemoteId { get; init; }

/// <summary>
/// The datetime that this object was created by Merge.
/// </summary>
[JsonPropertyName("created_at")]
public DateTime? CreatedAt { get; init; }

/// <summary>
/// This is the datetime that this object was last updated by Merge
/// The datetime that this object was modified by Merge.
/// </summary>
[JsonPropertyName("modified_at")]
public DateTime? ModifiedAt { get; init; }
Expand Down
51 changes: 0 additions & 51 deletions src/Merge.Client/Accounting/Types/ConditionSchema.cs

This file was deleted.

Loading