merge_accounting_client 1.0.8 → 1.1.0

data/lib/merge_accounting_client/models/payment_request.rb

@@ -37,6 +37,14 @@ module MergeAccountingClient
     # The total amount of money being paid to the supplier, or customer, after taxes.
     attr_accessor :total_amount
 
+    attr_accessor :tracking_categories
+
+    # The accounting period that the Payment was generated in.
+    attr_accessor :accounting_period
+
+    # A list of “Payment Applied to Lines” objects.
+    attr_accessor :applied_to_lines
+
     attr_accessor :integration_params
 
     attr_accessor :linked_account_params
@@ -51,6 +59,9 @@ module MergeAccountingClient
         :'exchange_rate' => :'exchange_rate',
         :'company' => :'company',
         :'total_amount' => :'total_amount',
+        :'tracking_categories' => :'tracking_categories',
+        :'accounting_period' => :'accounting_period',
+        :'applied_to_lines' => :'applied_to_lines',
         :'integration_params' => :'integration_params',
         :'linked_account_params' => :'linked_account_params'
       }
@@ -71,6 +82,9 @@ module MergeAccountingClient
         :'exchange_rate' => :'String',
         :'company' => :'String',
         :'total_amount' => :'Float',
+        :'tracking_categories' => :'Array<String>',
+        :'accounting_period' => :'String',
+        :'applied_to_lines' => :'Array<PaymentLineItemRequest>',
         :'integration_params' => :'Hash<String, Object>',
         :'linked_account_params' => :'Hash<String, Object>'
       }
@@ -86,6 +100,7 @@ module MergeAccountingClient
         :'exchange_rate',
         :'company',
         :'total_amount',
+        :'accounting_period',
         :'integration_params',
         :'linked_account_params'
       ])
@@ -134,6 +149,22 @@ module MergeAccountingClient
         self.total_amount = attributes[:'total_amount']
       end
 
+      if attributes.key?(:'tracking_categories')
+        if (value = attributes[:'tracking_categories']).is_a?(Array)
+          self.tracking_categories = value
+        end
+      end
+
+      if attributes.key?(:'accounting_period')
+        self.accounting_period = attributes[:'accounting_period']
+      end
+
+      if attributes.key?(:'applied_to_lines')
+        if (value = attributes[:'applied_to_lines']).is_a?(Array)
+          self.applied_to_lines = value
+        end
+      end
+
       if attributes.key?(:'integration_params')
         if (value = attributes[:'integration_params']).is_a?(Hash)
           self.integration_params = value
@@ -189,6 +220,9 @@ module MergeAccountingClient
           exchange_rate == o.exchange_rate &&
           company == o.company &&
           total_amount == o.total_amount &&
+          tracking_categories == o.tracking_categories &&
+          accounting_period == o.accounting_period &&
+          applied_to_lines == o.applied_to_lines &&
           integration_params == o.integration_params &&
           linked_account_params == o.linked_account_params
     end
@@ -202,7 +236,7 @@ module MergeAccountingClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [transaction_date, contact, account, currency, exchange_rate, company, total_amount, integration_params, linked_account_params].hash
+      [transaction_date, contact, account, currency, exchange_rate, company, total_amount, tracking_categories, accounting_period, applied_to_lines, integration_params, linked_account_params].hash
     end
 
     # Builds the object from hash

data/lib/merge_accounting_client/models/purchase_order.rb

@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 module MergeAccountingClient
-  # # The PurchaseOrder Object ### Description The `PurchaseOrder` object is a record of request for a product or service between a buyer and seller.  ### Usage Example Fetch from the `LIST PurchaseOrders` endpoint and view a company's purchase orders.
+  # # The PurchaseOrder Object ### Description A `PurchaseOrder` represents a request to purchase goods or services from a vendor. It outlines the details of the purchase, such as the items or services requested, quantities, prices, and delivery details.  A `PurchaseOrder` is a crucial component of the procurement process, but does not typically result in any impact on the company’s general ledger. The general ledger is typically only affected when the `PurchaseOrder` is fulfilled as an *Accounts Payable* Invoice object.  ### Usage Example Fetch from the `LIST PurchaseOrders` endpoint and view a company's purchase orders.
   class PurchaseOrder
     # The purchase order's status.  * `DRAFT` - DRAFT * `SUBMITTED` - SUBMITTED * `AUTHORIZED` - AUTHORIZED * `BILLED` - BILLED * `DELETED` - DELETED
     attr_accessor :status
@@ -22,6 +22,9 @@ module MergeAccountingClient
     # The purchase order's issue date.
     attr_accessor :issue_date
 
+    # The human-readable number of the purchase order.
+    attr_accessor :purchase_order_number
+
     # The purchase order's delivery date.
     attr_accessor :delivery_date
 
@@ -51,20 +54,30 @@ module MergeAccountingClient
 
     attr_accessor :line_items
 
+    attr_accessor :tracking_categories
+
     # When the third party's purchase order note was created.
     attr_accessor :remote_created_at
 
     # When the third party's purchase order note was updated.
     attr_accessor :remote_updated_at
 
-    # Indicates whether or not this object has been deleted by third party webhooks.
+    # Indicates whether or not this object has been deleted in the third party platform.
     attr_accessor :remote_was_deleted
 
+    # The accounting period that the PurchaseOrder was generated in.
+    attr_accessor :accounting_period
+
     attr_accessor :id
 
     # The third-party API ID of the matching object.
     attr_accessor :remote_id
 
+    attr_accessor :created_at
+
+    # This is the datetime that this object was last updated by Merge
+    attr_accessor :modified_at
+
     attr_accessor :field_mappings
 
     attr_accessor :remote_data
@@ -74,6 +87,7 @@ module MergeAccountingClient
       {
         :'status' => :'status',
         :'issue_date' => :'issue_date',
+        :'purchase_order_number' => :'purchase_order_number',
         :'delivery_date' => :'delivery_date',
         :'delivery_address' => :'delivery_address',
         :'customer' => :'customer',
@@ -84,11 +98,15 @@ module MergeAccountingClient
         :'currency' => :'currency',
         :'exchange_rate' => :'exchange_rate',
         :'line_items' => :'line_items',
+        :'tracking_categories' => :'tracking_categories',
         :'remote_created_at' => :'remote_created_at',
         :'remote_updated_at' => :'remote_updated_at',
         :'remote_was_deleted' => :'remote_was_deleted',
+        :'accounting_period' => :'accounting_period',
         :'id' => :'id',
         :'remote_id' => :'remote_id',
+        :'created_at' => :'created_at',
+        :'modified_at' => :'modified_at',
         :'field_mappings' => :'field_mappings',
         :'remote_data' => :'remote_data'
       }
@@ -104,6 +122,7 @@ module MergeAccountingClient
       {
         :'status' => :'PurchaseOrderStatusEnum',
         :'issue_date' => :'Time',
+        :'purchase_order_number' => :'String',
         :'delivery_date' => :'Time',
         :'delivery_address' => :'String',
         :'customer' => :'String',
@@ -114,11 +133,15 @@ module MergeAccountingClient
         :'currency' => :'CurrencyEnum',
         :'exchange_rate' => :'String',
         :'line_items' => :'Array<PurchaseOrderLineItem>',
+        :'tracking_categories' => :'Array<String>',
         :'remote_created_at' => :'Time',
         :'remote_updated_at' => :'Time',
         :'remote_was_deleted' => :'Boolean',
+        :'accounting_period' => :'String',
         :'id' => :'String',
         :'remote_id' => :'String',
+        :'created_at' => :'Time',
+        :'modified_at' => :'Time',
         :'field_mappings' => :'Hash<String, Object>',
         :'remote_data' => :'Array<RemoteData>'
       }
@@ -129,6 +152,7 @@ module MergeAccountingClient
       Set.new([
         :'status',
         :'issue_date',
+        :'purchase_order_number',
         :'delivery_date',
         :'delivery_address',
         :'customer',
@@ -140,6 +164,7 @@ module MergeAccountingClient
         :'exchange_rate',
         :'remote_created_at',
         :'remote_updated_at',
+        :'accounting_period',
         :'remote_id',
         :'field_mappings',
         :'remote_data'
@@ -169,6 +194,10 @@ module MergeAccountingClient
         self.issue_date = attributes[:'issue_date']
       end
 
+      if attributes.key?(:'purchase_order_number')
+        self.purchase_order_number = attributes[:'purchase_order_number']
+      end
+
       if attributes.key?(:'delivery_date')
         self.delivery_date = attributes[:'delivery_date']
       end
@@ -211,6 +240,12 @@ module MergeAccountingClient
         end
       end
 
+      if attributes.key?(:'tracking_categories')
+        if (value = attributes[:'tracking_categories']).is_a?(Array)
+          self.tracking_categories = value
+        end
+      end
+
       if attributes.key?(:'remote_created_at')
         self.remote_created_at = attributes[:'remote_created_at']
       end
@@ -223,6 +258,10 @@ module MergeAccountingClient
         self.remote_was_deleted = attributes[:'remote_was_deleted']
       end
 
+      if attributes.key?(:'accounting_period')
+        self.accounting_period = attributes[:'accounting_period']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -231,6 +270,14 @@ module MergeAccountingClient
         self.remote_id = attributes[:'remote_id']
       end
 
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
+
+      if attributes.key?(:'modified_at')
+        self.modified_at = attributes[:'modified_at']
+      end
+
       if attributes.key?(:'field_mappings')
         if (value = attributes[:'field_mappings']).is_a?(Hash)
           self.field_mappings = value
@@ -248,6 +295,10 @@ module MergeAccountingClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if !@purchase_order_number.nil? && @purchase_order_number.to_s.length > 100
+        invalid_properties.push('invalid value for "purchase_order_number", the character length must be smaller than or equal to 100.')
+      end
+
       pattern = Regexp.new(/^-?\d{0,32}(?:\.\d{0,16})?$/)
       if !@exchange_rate.nil? && @exchange_rate.to_s !~ pattern
         invalid_properties.push("invalid value for \"exchange_rate\", must conform to the pattern #{pattern}.")
@@ -259,10 +310,21 @@ module MergeAccountingClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if !@purchase_order_number.nil? && @purchase_order_number.to_s.length > 100
       return false if !@exchange_rate.nil? && @exchange_rate.to_s !~ Regexp.new(/^-?\d{0,32}(?:\.\d{0,16})?$/)
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] purchase_order_number Value to be assigned
+    def purchase_order_number=(purchase_order_number)
+      if !purchase_order_number.nil? && purchase_order_number.to_s.length > 100
+        fail ArgumentError, 'invalid value for "purchase_order_number", the character length must be smaller than or equal to 100.'
+      end
+
+      @purchase_order_number = purchase_order_number
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] exchange_rate Value to be assigned
     def exchange_rate=(exchange_rate)
@@ -281,6 +343,7 @@ module MergeAccountingClient
       self.class == o.class &&
           status == o.status &&
           issue_date == o.issue_date &&
+          purchase_order_number == o.purchase_order_number &&
           delivery_date == o.delivery_date &&
           delivery_address == o.delivery_address &&
           customer == o.customer &&
@@ -291,11 +354,15 @@ module MergeAccountingClient
           currency == o.currency &&
           exchange_rate == o.exchange_rate &&
           line_items == o.line_items &&
+          tracking_categories == o.tracking_categories &&
           remote_created_at == o.remote_created_at &&
           remote_updated_at == o.remote_updated_at &&
           remote_was_deleted == o.remote_was_deleted &&
+          accounting_period == o.accounting_period &&
           id == o.id &&
           remote_id == o.remote_id &&
+          created_at == o.created_at &&
+          modified_at == o.modified_at &&
           field_mappings == o.field_mappings &&
           remote_data == o.remote_data
     end
@@ -309,7 +376,7 @@ module MergeAccountingClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [status, issue_date, delivery_date, delivery_address, customer, vendor, memo, company, total_amount, currency, exchange_rate, line_items, remote_created_at, remote_updated_at, remote_was_deleted, id, remote_id, field_mappings, remote_data].hash
+      [status, issue_date, purchase_order_number, delivery_date, delivery_address, customer, vendor, memo, company, total_amount, currency, exchange_rate, line_items, tracking_categories, remote_created_at, remote_updated_at, remote_was_deleted, accounting_period, id, remote_id, created_at, modified_at, field_mappings, remote_data].hash
     end
 
     # Builds the object from hash

data/lib/merge_accounting_client/models/purchase_order_line_item.rb

@@ -54,6 +54,16 @@ module MergeAccountingClient
     # The company the purchase order line item belongs to.
     attr_accessor :company
 
+    # Indicates whether or not this object has been deleted in the third party platform.
+    attr_accessor :remote_was_deleted
+
+    attr_accessor :id
+
+    attr_accessor :created_at
+
+    # This is the datetime that this object was last updated by Merge
+    attr_accessor :modified_at
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -69,7 +79,11 @@ module MergeAccountingClient
         :'total_line_amount' => :'total_line_amount',
         :'currency' => :'currency',
         :'exchange_rate' => :'exchange_rate',
-        :'company' => :'company'
+        :'company' => :'company',
+        :'remote_was_deleted' => :'remote_was_deleted',
+        :'id' => :'id',
+        :'created_at' => :'created_at',
+        :'modified_at' => :'modified_at'
       }
     end
 
@@ -93,7 +107,11 @@ module MergeAccountingClient
         :'total_line_amount' => :'String',
         :'currency' => :'CurrencyEnum',
         :'exchange_rate' => :'String',
-        :'company' => :'String'
+        :'company' => :'String',
+        :'remote_was_deleted' => :'Boolean',
+        :'id' => :'String',
+        :'created_at' => :'Time',
+        :'modified_at' => :'Time'
       }
     end
 
@@ -111,7 +129,7 @@ module MergeAccountingClient
         :'total_line_amount',
         :'currency',
         :'exchange_rate',
-        :'company'
+        :'company',
       ])
     end
 
@@ -183,6 +201,22 @@ module MergeAccountingClient
       if attributes.key?(:'company')
         self.company = attributes[:'company']
       end
+
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
+
+      if attributes.key?(:'id')
+        self.id = attributes[:'id']
+      end
+
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
+
+      if attributes.key?(:'modified_at')
+        self.modified_at = attributes[:'modified_at']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -271,7 +305,11 @@ module MergeAccountingClient
           total_line_amount == o.total_line_amount &&
           currency == o.currency &&
           exchange_rate == o.exchange_rate &&
-          company == o.company
+          company == o.company &&
+          remote_was_deleted == o.remote_was_deleted &&
+          id == o.id &&
+          created_at == o.created_at &&
+          modified_at == o.modified_at
     end
 
     # @see the `==` method
@@ -283,7 +321,7 @@ module MergeAccountingClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [remote_id, description, unit_price, quantity, item, account, tracking_category, tracking_categories, tax_amount, total_line_amount, currency, exchange_rate, company].hash
+      [remote_id, description, unit_price, quantity, item, account, tracking_category, tracking_categories, tax_amount, total_line_amount, currency, exchange_rate, company, remote_was_deleted, id, created_at, modified_at].hash
     end
 
     # Builds the object from hash

data/lib/merge_accounting_client/models/purchase_order_request.rb

@@ -49,6 +49,8 @@ module MergeAccountingClient
     # The purchase order's exchange rate.
     attr_accessor :exchange_rate
 
+    attr_accessor :tracking_categories
+
     attr_accessor :line_items
 
     attr_accessor :integration_params
@@ -69,6 +71,7 @@ module MergeAccountingClient
         :'total_amount' => :'total_amount',
         :'currency' => :'currency',
         :'exchange_rate' => :'exchange_rate',
+        :'tracking_categories' => :'tracking_categories',
         :'line_items' => :'line_items',
         :'integration_params' => :'integration_params',
         :'linked_account_params' => :'linked_account_params'
@@ -94,6 +97,7 @@ module MergeAccountingClient
         :'total_amount' => :'Float',
         :'currency' => :'CurrencyEnum',
         :'exchange_rate' => :'String',
+        :'tracking_categories' => :'Array<String>',
         :'line_items' => :'Array<PurchaseOrderLineItemRequest>',
         :'integration_params' => :'Hash<String, Object>',
         :'linked_account_params' => :'Hash<String, Object>'
@@ -178,6 +182,12 @@ module MergeAccountingClient
         self.exchange_rate = attributes[:'exchange_rate']
       end
 
+      if attributes.key?(:'tracking_categories')
+        if (value = attributes[:'tracking_categories']).is_a?(Array)
+          self.tracking_categories = value
+        end
+      end
+
       if attributes.key?(:'line_items')
         if (value = attributes[:'line_items']).is_a?(Array)
           self.line_items = value
@@ -243,6 +253,7 @@ module MergeAccountingClient
           total_amount == o.total_amount &&
           currency == o.currency &&
           exchange_rate == o.exchange_rate &&
+          tracking_categories == o.tracking_categories &&
           line_items == o.line_items &&
           integration_params == o.integration_params &&
           linked_account_params == o.linked_account_params
@@ -257,7 +268,7 @@ module MergeAccountingClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [status, issue_date, delivery_date, delivery_address, customer, vendor, memo, company, total_amount, currency, exchange_rate, line_items, integration_params, linked_account_params].hash
+      [status, issue_date, delivery_date, delivery_address, customer, vendor, memo, company, total_amount, currency, exchange_rate, tracking_categories, line_items, integration_params, linked_account_params].hash
     end
 
     # Builds the object from hash

data/lib/merge_accounting_client/models/remote_data.rb

@@ -36,13 +36,14 @@ module MergeAccountingClient
     def self.openapi_types
       {
         :'path' => :'String',
-        :'data' => :'Hash<String, Object>'
+        :'data' => :'Object'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'data'
       ])
     end
 
@@ -66,9 +67,7 @@ module MergeAccountingClient
       end
 
       if attributes.key?(:'data')
-        if (value = attributes[:'data']).is_a?(Hash)
-          self.data = value
-        end
+        self.data = attributes[:'data']
       end
     end
 

data/lib/merge_accounting_client/models/report_item.rb

@@ -30,6 +30,11 @@ module MergeAccountingClient
     # The company the report item belongs to.
     attr_accessor :company
 
+    attr_accessor :created_at
+
+    # This is the datetime that this object was last updated by Merge
+    attr_accessor :modified_at
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -37,7 +42,9 @@ module MergeAccountingClient
         :'name' => :'name',
         :'value' => :'value',
         :'sub_items' => :'sub_items',
-        :'company' => :'company'
+        :'company' => :'company',
+        :'created_at' => :'created_at',
+        :'modified_at' => :'modified_at'
       }
     end
 
@@ -53,7 +60,9 @@ module MergeAccountingClient
         :'name' => :'String',
         :'value' => :'Float',
         :'sub_items' => :'Hash<String, Object>',
-        :'company' => :'String'
+        :'company' => :'String',
+        :'created_at' => :'Time',
+        :'modified_at' => :'Time'
       }
     end
 
@@ -63,7 +72,7 @@ module MergeAccountingClient
         :'remote_id',
         :'name',
         :'value',
-        :'company'
+        :'company',
       ])
     end
 
@@ -103,6 +112,14 @@ module MergeAccountingClient
       if attributes.key?(:'company')
         self.company = attributes[:'company']
       end
+
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
+
+      if attributes.key?(:'modified_at')
+        self.modified_at = attributes[:'modified_at']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -127,7 +144,9 @@ module MergeAccountingClient
           name == o.name &&
           value == o.value &&
           sub_items == o.sub_items &&
-          company == o.company
+          company == o.company &&
+          created_at == o.created_at &&
+          modified_at == o.modified_at
     end
 
     # @see the `==` method
@@ -139,7 +158,7 @@ module MergeAccountingClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [remote_id, name, value, sub_items, company].hash
+      [remote_id, name, value, sub_items, company, created_at, modified_at].hash
     end
 
     # Builds the object from hash

data/lib/merge_accounting_client/models/role_enum.rb

@@ -0,0 +1,49 @@
+=begin
+#Merge Accounting API
+
+#The unified API for building rich integrations with multiple Accounting & Finance platforms.
+
+The version of the OpenAPI document: 1.0
+Contact: hello@merge.dev
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.1.1
+
+=end
+
+require 'date'
+require 'time'
+
+module MergeAccountingClient
+  class RoleEnum
+    ADMIN = "ADMIN".freeze
+    DEVELOPER = "DEVELOPER".freeze
+    MEMBER = "MEMBER".freeze
+    API = "API".freeze
+    SYSTEM = "SYSTEM".freeze
+    MERGE_TEAM = "MERGE_TEAM".freeze
+
+    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)
+      @raw_value = value
+      if ["ADMIN", "DEVELOPER", "MEMBER", "API", "SYSTEM", "MERGE_TEAM", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      RoleEnum.new.build_from_hash(value)
+    end
+  end
+
+end

data/lib/merge_accounting_client/models/sync_status_status_enum.rb

@@ -32,7 +32,7 @@ module MergeAccountingClient
     # @return [String] The enum value
     def build_from_hash(value)
       @raw_value = value
-      if ["SYNCING", "DONE", "FAILED", "DISABLED", "PAUSED", "PARTIALLY_SYNCED"].include? value
+      if ["SYNCING", "DONE", "FAILED", "DISABLED", "PAUSED", "PARTIALLY_SYNCED", ].include? value
         @value = value
       else
         @value = MERGE_NONSTANDARD_VALUE