merge_accounting_client 1.0.1 → 1.0.2

data/lib/merge_accounting_client/api/vendor_credits_api.rb

@@ -26,7 +26,7 @@ module MergeAccountingClient
     # @option opts [Time] :created_before If provided, will only return objects created before this datetime.
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
-    # @option opts [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @option opts [Boolean] :include_deleted_data Whether to include data that was marked as deleted by third party webhooks.
     # @option opts [Boolean] :include_remote_data Whether to include the original data Merge fetched from the third-party to produce these models.
     # @option opts [Time] :modified_after If provided, will only return objects modified after this datetime.
     # @option opts [Time] :modified_before If provided, will only return objects modified before this datetime.
@@ -45,7 +45,7 @@ module MergeAccountingClient
     # @option opts [Time] :created_before If provided, will only return objects created before this datetime.
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
-    # @option opts [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @option opts [Boolean] :include_deleted_data Whether to include data that was marked as deleted by third party webhooks.
     # @option opts [Boolean] :include_remote_data Whether to include the original data Merge fetched from the third-party to produce these models.
     # @option opts [Time] :modified_after If provided, will only return objects modified after this datetime.
     # @option opts [Time] :modified_before If provided, will only return objects modified before this datetime.

data/lib/merge_accounting_client/models/account.rb

@@ -47,7 +47,7 @@ module MergeAccountingClient
     # The account's number.
     attr_accessor :account_number
 
-    # Indicates whether or not this object has been deleted on the third-party.
+    # Indicates whether or not this object has been deleted by third party webhooks.
     attr_accessor :remote_was_deleted
 
     # Attribute mapping from ruby-style variable name to JSON key.

data/lib/merge_accounting_client/models/account_details.rb

@@ -33,6 +33,9 @@ module MergeAccountingClient
 
     attr_accessor :webhook_listener_url
 
+    # Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
+    attr_accessor :is_duplicate
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -44,7 +47,8 @@ module MergeAccountingClient
         :'end_user_organization_name' => :'end_user_organization_name',
         :'end_user_email_address' => :'end_user_email_address',
         :'status' => :'status',
-        :'webhook_listener_url' => :'webhook_listener_url'
+        :'webhook_listener_url' => :'webhook_listener_url',
+        :'is_duplicate' => :'is_duplicate'
       }
     end
 
@@ -64,7 +68,8 @@ module MergeAccountingClient
         :'end_user_organization_name' => :'String',
         :'end_user_email_address' => :'String',
         :'status' => :'String',
-        :'webhook_listener_url' => :'String'
+        :'webhook_listener_url' => :'String',
+        :'is_duplicate' => :'Boolean'
       }
     end
 
@@ -72,6 +77,7 @@ module MergeAccountingClient
     def self.openapi_nullable
       Set.new([
         :'category',
+        :'is_duplicate'
       ])
     end
 
@@ -125,6 +131,10 @@ module MergeAccountingClient
       if attributes.key?(:'webhook_listener_url')
         self.webhook_listener_url = attributes[:'webhook_listener_url']
       end
+
+      if attributes.key?(:'is_duplicate')
+        self.is_duplicate = attributes[:'is_duplicate']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -153,7 +163,8 @@ module MergeAccountingClient
           end_user_organization_name == o.end_user_organization_name &&
           end_user_email_address == o.end_user_email_address &&
           status == o.status &&
-          webhook_listener_url == o.webhook_listener_url
+          webhook_listener_url == o.webhook_listener_url &&
+          is_duplicate == o.is_duplicate
     end
 
     # @see the `==` method
@@ -165,7 +176,7 @@ module MergeAccountingClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, integration, integration_slug, category, end_user_origin_id, end_user_organization_name, end_user_email_address, status, webhook_listener_url].hash
+      [id, integration, integration_slug, category, end_user_origin_id, end_user_organization_name, end_user_email_address, status, webhook_listener_url, is_duplicate].hash
     end
 
     # Builds the object from hash

data/lib/merge_accounting_client/models/account_details_and_actions.rb

@@ -32,6 +32,9 @@ module MergeAccountingClient
 
     attr_accessor :webhook_listener_url
 
+    # Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
+    attr_accessor :is_duplicate
+
     attr_accessor :integration
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -45,6 +48,7 @@ module MergeAccountingClient
         :'end_user_organization_name' => :'end_user_organization_name',
         :'end_user_email_address' => :'end_user_email_address',
         :'webhook_listener_url' => :'webhook_listener_url',
+        :'is_duplicate' => :'is_duplicate',
         :'integration' => :'integration'
       }
     end
@@ -65,6 +69,7 @@ module MergeAccountingClient
         :'end_user_organization_name' => :'String',
         :'end_user_email_address' => :'String',
         :'webhook_listener_url' => :'String',
+        :'is_duplicate' => :'Boolean',
         :'integration' => :'AccountDetailsAndActionsIntegration'
       }
     end
@@ -72,6 +77,7 @@ module MergeAccountingClient
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'is_duplicate',
       ])
     end
 
@@ -122,6 +128,10 @@ module MergeAccountingClient
         self.webhook_listener_url = attributes[:'webhook_listener_url']
       end
 
+      if attributes.key?(:'is_duplicate')
+        self.is_duplicate = attributes[:'is_duplicate']
+      end
+
       if attributes.key?(:'integration')
         self.integration = attributes[:'integration']
       end
@@ -178,6 +188,7 @@ module MergeAccountingClient
           end_user_organization_name == o.end_user_organization_name &&
           end_user_email_address == o.end_user_email_address &&
           webhook_listener_url == o.webhook_listener_url &&
+          is_duplicate == o.is_duplicate &&
           integration == o.integration
     end
 
@@ -190,7 +201,7 @@ module MergeAccountingClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, category, status, status_detail, end_user_origin_id, end_user_organization_name, end_user_email_address, webhook_listener_url, integration].hash
+      [id, category, status, status_detail, end_user_origin_id, end_user_organization_name, end_user_email_address, webhook_listener_url, is_duplicate, integration].hash
     end
 
     # Builds the object from hash

data/lib/merge_accounting_client/models/account_details_and_actions_status_enum.rb

@@ -19,18 +19,28 @@ module MergeAccountingClient
     INCOMPLETE = "INCOMPLETE".freeze
     RELINK_NEEDED = "RELINK_NEEDED".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["COMPLETE", "INCOMPLETE", "RELINK_NEEDED", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      IssueStatusEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_accounting_client/models/account_status_enum.rb

@@ -19,18 +19,28 @@ module MergeAccountingClient
     PENDING = "PENDING".freeze
     INACTIVE = "INACTIVE".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["ACTIVE", "PENDING", "INACTIVE", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      IssueStatusEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_accounting_client/models/accounting_attachment.rb

@@ -29,7 +29,7 @@ module MergeAccountingClient
     # The attachment's url.
     attr_accessor :file_url
 
-    # Indicates whether or not this object has been deleted on the third-party.
+    # Indicates whether or not this object has been deleted by third party webhooks.
     attr_accessor :remote_was_deleted
 
     # Attribute mapping from ruby-style variable name to JSON key.

data/lib/merge_accounting_client/models/address_type_enum.rb

@@ -18,18 +18,28 @@ module MergeAccountingClient
     BILLING = "BILLING".freeze
     SHIPPING = "SHIPPING".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["BILLING", "SHIPPING", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      IssueStatusEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_accounting_client/models/balance_sheet.rb

@@ -41,7 +41,7 @@ module MergeAccountingClient
     # The time that balance sheet was generated by the accounting system.
     attr_accessor :remote_generated_at
 
-    # Indicates whether or not this object has been deleted on the third-party.
+    # Indicates whether or not this object has been deleted by third party webhooks.
     attr_accessor :remote_was_deleted
 
     # Attribute mapping from ruby-style variable name to JSON key.

data/lib/merge_accounting_client/models/cash_flow_statement.rb

@@ -47,7 +47,7 @@ module MergeAccountingClient
     # The time that cash flow statement was generated by the accounting system.
     attr_accessor :remote_generated_at
 
-    # Indicates whether or not this object has been deleted on the third-party.
+    # Indicates whether or not this object has been deleted by third party webhooks.
     attr_accessor :remote_was_deleted
 
     # Attribute mapping from ruby-style variable name to JSON key.

data/lib/merge_accounting_client/models/categories_enum.rb

@@ -21,18 +21,28 @@ module MergeAccountingClient
     TICKETING = "ticketing".freeze
     CRM = "crm".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["hris", "ats", "accounting", "ticketing", "crm", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      IssueStatusEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_accounting_client/models/category_enum.rb

@@ -21,18 +21,28 @@ module MergeAccountingClient
     TICKETING = "ticketing".freeze
     CRM = "crm".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["hris", "ats", "accounting", "ticketing", "crm", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      IssueStatusEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_accounting_client/models/classification_enum.rb

@@ -21,18 +21,28 @@ module MergeAccountingClient
     LIABILITY = "LIABILITY".freeze
     REVENUE = "REVENUE".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["ASSET", "EQUITY", "EXPENSE", "LIABILITY", "REVENUE", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      IssueStatusEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_accounting_client/models/company_info.rb

@@ -51,7 +51,7 @@ module MergeAccountingClient
 
     attr_accessor :phone_numbers
 
-    # Indicates whether or not this object has been deleted on the third-party.
+    # Indicates whether or not this object has been deleted by third party webhooks.
     attr_accessor :remote_was_deleted
 
     # Attribute mapping from ruby-style variable name to JSON key.

data/lib/merge_accounting_client/models/contact.rb

@@ -53,7 +53,7 @@ module MergeAccountingClient
     # `AccountingPhoneNumber` object for the given `Contacts` object.
     attr_accessor :phone_numbers
 
-    # Indicates whether or not this object has been deleted on the third-party.
+    # Indicates whether or not this object has been deleted by third party webhooks.
     attr_accessor :remote_was_deleted
 
     # Attribute mapping from ruby-style variable name to JSON key.

data/lib/merge_accounting_client/models/country_enum.rb

@@ -265,18 +265,28 @@ module MergeAccountingClient
     ZM = "ZM".freeze
     ZW = "ZW".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["AF", "AX", "AL", "DZ", "AS", "AD", "AO", "AI", "AQ", "AG", "AR", "AM", "AW", "AU", "AT", "AZ", "BS", "BH", "BD", "BB", "BY", "BE", "BZ", "BJ", "BM", "BT", "BO", "BQ", "BA", "BW", "BV", "BR", "IO", "BN", "BG", "BF", "BI", "CV", "KH", "CM", "CA", "KY", "CF", "TD", "CL", "CN", "CX", "CC", "CO", "KM", "CG", "CD", "CK", "CR", "CI", "HR", "CU", "CW", "CY", "CZ", "DK", "DJ", "DM", "DO", "EC", "EG", "SV", "GQ", "ER", "EE", "SZ", "ET", "FK", "FO", "FJ", "FI", "FR", "GF", "PF", "TF", "GA", "GM", "GE", "DE", "GH", "GI", "GR", "GL", "GD", "GP", "GU", "GT", "GG", "GN", "GW", "GY", "HT", "HM", "VA", "HN", "HK", "HU", "IS", "IN", "ID", "IR", "IQ", "IE", "IM", "IL", "IT", "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KW", "KG", "LA", "LV", "LB", "LS", "LR", "LY", "LI", "LT", "LU", "MO", "MG", "MW", "MY", "MV", "ML", "MT", "MH", "MQ", "MR", "MU", "YT", "MX", "FM", "MD", "MC", "MN", "ME", "MS", "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "NC", "NZ", "NI", "NE", "NG", "NU", "NF", "KP", "MK", "MP", "NO", "OM", "PK", "PW", "PS", "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA", "RE", "RO", "RU", "RW", "BL", "SH", "KN", "LC", "MF", "PM", "VC", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG", "SX", "SK", "SI", "SB", "SO", "ZA", "GS", "KR", "SS", "ES", "LK", "SD", "SR", "SJ", "SE", "CH", "SY", "TW", "TJ", "TZ", "TH", "TL", "TG", "TK", "TO", "TT", "TN", "TR", "TM", "TC", "TV", "UG", "UA", "AE", "GB", "UM", "US", "UY", "UZ", "VU", "VE", "VN", "VG", "VI", "WF", "EH", "YE", "ZM", "ZW", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      IssueStatusEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_accounting_client/models/credit_note.rb

@@ -29,12 +29,20 @@ module MergeAccountingClient
     # The credit note's status.
     attr_accessor :status
 
+    # The credit note's number.
+    attr_accessor :number
+
+    # The credit note's contact.
+    attr_accessor :contact
+
     # The credit note's total amount.
     attr_accessor :total_amount
 
     # The credit note's remaining credit.
     attr_accessor :remaining_credit
 
+    attr_accessor :line_items
+
     # The credit note's currency.
     attr_accessor :currency
 
@@ -47,7 +55,7 @@ module MergeAccountingClient
     # Array of `Payment` object IDs
     attr_accessor :payments
 
-    # Indicates whether or not this object has been deleted on the third-party.
+    # Indicates whether or not this object has been deleted by third party webhooks.
     attr_accessor :remote_was_deleted
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -58,8 +66,11 @@ module MergeAccountingClient
         :'remote_data' => :'remote_data',
         :'transaction_date' => :'transaction_date',
         :'status' => :'status',
+        :'number' => :'number',
+        :'contact' => :'contact',
         :'total_amount' => :'total_amount',
         :'remaining_credit' => :'remaining_credit',
+        :'line_items' => :'line_items',
         :'currency' => :'currency',
         :'remote_created_at' => :'remote_created_at',
         :'remote_updated_at' => :'remote_updated_at',
@@ -81,8 +92,11 @@ module MergeAccountingClient
         :'remote_data' => :'Array<RemoteData>',
         :'transaction_date' => :'Time',
         :'status' => :'CreditNoteStatusEnum',
+        :'number' => :'String',
+        :'contact' => :'String',
         :'total_amount' => :'Float',
         :'remaining_credit' => :'Float',
+        :'line_items' => :'Array<CreditNoteLineItem>',
         :'currency' => :'CurrencyEnum',
         :'remote_created_at' => :'Time',
         :'remote_updated_at' => :'Time',
@@ -98,6 +112,8 @@ module MergeAccountingClient
         :'remote_data',
         :'transaction_date',
         :'status',
+        :'number',
+        :'contact',
         :'total_amount',
         :'remaining_credit',
         :'currency',
@@ -143,6 +159,14 @@ module MergeAccountingClient
         self.status = attributes[:'status']
       end
 
+      if attributes.key?(:'number')
+        self.number = attributes[:'number']
+      end
+
+      if attributes.key?(:'contact')
+        self.contact = attributes[:'contact']
+      end
+
       if attributes.key?(:'total_amount')
         self.total_amount = attributes[:'total_amount']
       end
@@ -151,6 +175,12 @@ module MergeAccountingClient
         self.remaining_credit = attributes[:'remaining_credit']
       end
 
+      if attributes.key?(:'line_items')
+        if (value = attributes[:'line_items']).is_a?(Array)
+          self.line_items = value
+        end
+      end
+
       if attributes.key?(:'currency')
         self.currency = attributes[:'currency']
       end
@@ -197,8 +227,11 @@ module MergeAccountingClient
           remote_data == o.remote_data &&
           transaction_date == o.transaction_date &&
           status == o.status &&
+          number == o.number &&
+          contact == o.contact &&
           total_amount == o.total_amount &&
           remaining_credit == o.remaining_credit &&
+          line_items == o.line_items &&
           currency == o.currency &&
           remote_created_at == o.remote_created_at &&
           remote_updated_at == o.remote_updated_at &&
@@ -215,7 +248,7 @@ module MergeAccountingClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, remote_id, remote_data, transaction_date, status, total_amount, remaining_credit, currency, remote_created_at, remote_updated_at, payments, remote_was_deleted].hash
+      [id, remote_id, remote_data, transaction_date, status, number, contact, total_amount, remaining_credit, line_items, currency, remote_created_at, remote_updated_at, payments, remote_was_deleted].hash
     end
 
     # Builds the object from hash