xero-ruby 1.1.0 → 5.0.0

data/lib/xero-ruby/models/accounting/organisation.rb

@@ -1,12 +1,11 @@
 =begin
-#Accounting API
+#Xero Accounting API
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.1.3
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0
+OpenAPI Generator version: 4.3.1
 
 =end
 
@@ -14,99 +13,182 @@ require 'time'
 require 'date'
 
 module XeroRuby::Accounting
+  require 'bigdecimal'
+
   class Organisation
     # Unique Xero identifier
     attr_accessor :organisation_id
-
+    
     # Display a unique key used for Xero-to-Xero transactions
     attr_accessor :api_key
-
+    
     # Display name of organisation shown in Xero
     attr_accessor :name
-
+    
     # Organisation name shown on Reports
     attr_accessor :legal_name
-
+    
     # Boolean to describe if organisation is registered with a local tax authority i.e. true, false
     attr_accessor :pays_tax
-
+    
     # See Version Types
     attr_accessor :version
-
+    AU ||= "AU".freeze
+    NZ ||= "NZ".freeze
+    GLOBAL ||= "GLOBAL".freeze
+    UK ||= "UK".freeze
+    US ||= "US".freeze
+    AUONRAMP ||= "AUONRAMP".freeze
+    NZONRAMP ||= "NZONRAMP".freeze
+    GLOBALONRAMP ||= "GLOBALONRAMP".freeze
+    UKONRAMP ||= "UKONRAMP".freeze
+    USONRAMP ||= "USONRAMP".freeze
+    
     # Organisation Type
     attr_accessor :organisation_type
+    ACCOUNTING_PRACTICE ||= "ACCOUNTING_PRACTICE".freeze
+    COMPANY ||= "COMPANY".freeze
+    CHARITY ||= "CHARITY".freeze
+    CLUB_OR_SOCIETY ||= "CLUB_OR_SOCIETY".freeze
+    INDIVIDUAL ||= "INDIVIDUAL".freeze
+    LOOK_THROUGH_COMPANY ||= "LOOK_THROUGH_COMPANY".freeze
+    NOT_FOR_PROFIT ||= "NOT_FOR_PROFIT".freeze
+    PARTNERSHIP ||= "PARTNERSHIP".freeze
+    S_CORPORATION ||= "S_CORPORATION".freeze
+    SELF_MANAGED_SUPERANNUATION_FUND ||= "SELF_MANAGED_SUPERANNUATION_FUND".freeze
+    SOLE_TRADER ||= "SOLE_TRADER".freeze
+    SUPERANNUATION_FUND ||= "SUPERANNUATION_FUND".freeze
+    TRUST ||= "TRUST".freeze
+    
 
     attr_accessor :base_currency
+    
 
     attr_accessor :country_code
-
+    
     # Boolean to describe if organisation is a demo company.
     attr_accessor :is_demo_company
-
+    
     # Will be set to ACTIVE if you can connect to organisation via the Xero API
     attr_accessor :organisation_status
-
+    
     # Shows for New Zealand, Australian and UK organisations
     attr_accessor :registration_number
-
+    
+    # Shown if set. US Only.
+    attr_accessor :employer_identification_number
+    
     # Shown if set. Displays in the Xero UI as Tax File Number (AU), GST Number (NZ), VAT Number (UK) and Tax ID Number (US & Global).
     attr_accessor :tax_number
-
+    
     # Calendar day e.g. 0-31
     attr_accessor :financial_year_end_day
-
+    
     # Calendar Month e.g. 1-12
     attr_accessor :financial_year_end_month
-
+    
     # The accounting basis used for tax returns. See Sales Tax Basis
     attr_accessor :sales_tax_basis
-
+    PAYMENTS ||= "PAYMENTS".freeze
+    INVOICE ||= "INVOICE".freeze
+    NONE ||= "NONE".freeze
+    CASH ||= "CASH".freeze
+    ACCRUAL ||= "ACCRUAL".freeze
+    FLATRATECASH ||= "FLATRATECASH".freeze
+    FLATRATEACCRUAL ||= "FLATRATEACCRUAL".freeze
+    ACCRUALS ||= "ACCRUALS".freeze
+    
     # The frequency with which tax returns are processed. See Sales Tax Period
     attr_accessor :sales_tax_period
-
+    MONTHLY ||= "MONTHLY".freeze
+    QUARTERLY1 ||= "QUARTERLY1".freeze
+    QUARTERLY2 ||= "QUARTERLY2".freeze
+    QUARTERLY3 ||= "QUARTERLY3".freeze
+    ANNUALLY ||= "ANNUALLY".freeze
+    ONEMONTHS ||= "ONEMONTHS".freeze
+    TWOMONTHS ||= "TWOMONTHS".freeze
+    SIXMONTHS ||= "SIXMONTHS".freeze
+    N1_MONTHLY ||= "1MONTHLY".freeze
+    N2_MONTHLY ||= "2MONTHLY".freeze
+    N3_MONTHLY ||= "3MONTHLY".freeze
+    N6_MONTHLY ||= "6MONTHLY".freeze
+    QUARTERLY ||= "QUARTERLY".freeze
+    YEARLY ||= "YEARLY".freeze
+    NONE ||= "NONE".freeze
+    
     # The default for LineAmountTypes on sales transactions
     attr_accessor :default_sales_tax
-
+    
     # The default for LineAmountTypes on purchase transactions
     attr_accessor :default_purchases_tax
-
+    
     # Shown if set. See lock dates
     attr_accessor :period_lock_date
-
+    
     # Shown if set. See lock dates
     attr_accessor :end_of_year_lock_date
-
+    
     # Timestamp when the organisation was created in Xero
     attr_accessor :created_date_utc
+    
 
     attr_accessor :timezone
-
-    # Organisation Type
+    
+    # Organisation Entity Type
     attr_accessor :organisation_entity_type
-
+    ACCOUNTING_PRACTICE ||= "ACCOUNTING_PRACTICE".freeze
+    COMPANY ||= "COMPANY".freeze
+    CHARITY ||= "CHARITY".freeze
+    CLUB_OR_SOCIETY ||= "CLUB_OR_SOCIETY".freeze
+    INDIVIDUAL ||= "INDIVIDUAL".freeze
+    LOOK_THROUGH_COMPANY ||= "LOOK_THROUGH_COMPANY".freeze
+    NOT_FOR_PROFIT ||= "NOT_FOR_PROFIT".freeze
+    PARTNERSHIP ||= "PARTNERSHIP".freeze
+    S_CORPORATION ||= "S_CORPORATION".freeze
+    SELF_MANAGED_SUPERANNUATION_FUND ||= "SELF_MANAGED_SUPERANNUATION_FUND".freeze
+    SOLE_TRADER ||= "SOLE_TRADER".freeze
+    SUPERANNUATION_FUND ||= "SUPERANNUATION_FUND".freeze
+    TRUST ||= "TRUST".freeze
+    
     # A unique identifier for the organisation. Potential uses.
     attr_accessor :short_code
-
+    
     # Organisation Classes describe which plan the Xero organisation is on (e.g. DEMO, TRIAL, PREMIUM)
     attr_accessor :_class
-
+    DEMO ||= "DEMO".freeze
+    TRIAL ||= "TRIAL".freeze
+    STARTER ||= "STARTER".freeze
+    STANDARD ||= "STANDARD".freeze
+    PREMIUM ||= "PREMIUM".freeze
+    PREMIUM_20 ||= "PREMIUM_20".freeze
+    PREMIUM_50 ||= "PREMIUM_50".freeze
+    PREMIUM_100 ||= "PREMIUM_100".freeze
+    LEDGER ||= "LEDGER".freeze
+    GST_CASHBOOK ||= "GST_CASHBOOK".freeze
+    NON_GST_CASHBOOK ||= "NON_GST_CASHBOOK".freeze
+    ULTIMATE ||= "ULTIMATE".freeze
+    LITE ||= "LITE".freeze
+    
     # BUSINESS or PARTNER. Partner edition organisations are sold exclusively through accounting partners and have restricted functionality (e.g. no access to invoicing)
     attr_accessor :edition
-
+    BUSINESS ||= "BUSINESS".freeze
+    PARTNER ||= "PARTNER".freeze
+    
     # Description of business type as defined in Organisation settings
     attr_accessor :line_of_business
-
+    
     # Address details for organisation – see Addresses
     attr_accessor :addresses
-
+    
     # Phones details for organisation – see Phones
     attr_accessor :phones
-
+    
     # Organisation profile links for popular services such as Facebook,Twitter, GooglePlus and LinkedIn. You can also add link to your website here. Shown if Organisation settings  is updated in Xero. See ExternalLinks below
     attr_accessor :external_links
+    
 
     attr_accessor :payment_terms
-
+    
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -144,6 +226,7 @@ module XeroRuby::Accounting
         :'is_demo_company' => :'IsDemoCompany',
         :'organisation_status' => :'OrganisationStatus',
         :'registration_number' => :'RegistrationNumber',
+        :'employer_identification_number' => :'EmployerIdentificationNumber',
         :'tax_number' => :'TaxNumber',
         :'financial_year_end_day' => :'FinancialYearEndDay',
         :'financial_year_end_month' => :'FinancialYearEndMonth',
@@ -182,6 +265,7 @@ module XeroRuby::Accounting
         :'is_demo_company' => :'Boolean',
         :'organisation_status' => :'String',
         :'registration_number' => :'String',
+        :'employer_identification_number' => :'String',
         :'tax_number' => :'String',
         :'financial_year_end_day' => :'Integer',
         :'financial_year_end_month' => :'Integer',
@@ -198,7 +282,7 @@ module XeroRuby::Accounting
         :'_class' => :'String',
         :'edition' => :'String',
         :'line_of_business' => :'String',
-        :'addresses' => :'Array<Address>',
+        :'addresses' => :'Array<AddressForOrganisation>',
         :'phones' => :'Array<Phone>',
         :'external_links' => :'Array<ExternalLink>',
         :'payment_terms' => :'PaymentTerm'
@@ -268,6 +352,10 @@ module XeroRuby::Accounting
         self.registration_number = attributes[:'registration_number']
       end
 
+      if attributes.key?(:'employer_identification_number')
+        self.employer_identification_number = attributes[:'employer_identification_number']
+      end
+
       if attributes.key?(:'tax_number')
         self.tax_number = attributes[:'tax_number']
       end
@@ -367,15 +455,15 @@ module XeroRuby::Accounting
     def valid?
       version_validator = EnumAttributeValidator.new('String', ["AU", "NZ", "GLOBAL", "UK", "US", "AUONRAMP", "NZONRAMP", "GLOBALONRAMP", "UKONRAMP", "USONRAMP"])
       return false unless version_validator.valid?(@version)
-      organisation_type_validator = EnumAttributeValidator.new('String', ["ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST"])
+      organisation_type_validator = EnumAttributeValidator.new('String', ["ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "INDIVIDUAL", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST"])
       return false unless organisation_type_validator.valid?(@organisation_type)
       sales_tax_basis_validator = EnumAttributeValidator.new('String', ["PAYMENTS", "INVOICE", "NONE", "CASH", "ACCRUAL", "FLATRATECASH", "FLATRATEACCRUAL", "ACCRUALS"])
       return false unless sales_tax_basis_validator.valid?(@sales_tax_basis)
       sales_tax_period_validator = EnumAttributeValidator.new('String', ["MONTHLY", "QUARTERLY1", "QUARTERLY2", "QUARTERLY3", "ANNUALLY", "ONEMONTHS", "TWOMONTHS", "SIXMONTHS", "1MONTHLY", "2MONTHLY", "3MONTHLY", "6MONTHLY", "QUARTERLY", "YEARLY", "NONE"])
       return false unless sales_tax_period_validator.valid?(@sales_tax_period)
-      organisation_entity_type_validator = EnumAttributeValidator.new('String', ["ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST"])
+      organisation_entity_type_validator = EnumAttributeValidator.new('String', ["ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "INDIVIDUAL", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST"])
       return false unless organisation_entity_type_validator.valid?(@organisation_entity_type)
-      _class_validator = EnumAttributeValidator.new('String', ["DEMO", "TRIAL", "STARTER", "STANDARD", "PREMIUM", "PREMIUM_20", "PREMIUM_50", "PREMIUM_100", "LEDGER", "GST_CASHBOOK", "NON_GST_CASHBOOK"])
+      _class_validator = EnumAttributeValidator.new('String', ["DEMO", "TRIAL", "STARTER", "STANDARD", "PREMIUM", "PREMIUM_20", "PREMIUM_50", "PREMIUM_100", "LEDGER", "GST_CASHBOOK", "NON_GST_CASHBOOK", "ULTIMATE", "LITE"])
       return false unless _class_validator.valid?(@_class)
       edition_validator = EnumAttributeValidator.new('String', ["BUSINESS", "PARTNER"])
       return false unless edition_validator.valid?(@edition)
@@ -395,7 +483,7 @@ module XeroRuby::Accounting
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] organisation_type Object to be assigned
     def organisation_type=(organisation_type)
-      validator = EnumAttributeValidator.new('String', ["ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST"])
+      validator = EnumAttributeValidator.new('String', ["ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "INDIVIDUAL", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST"])
       unless validator.valid?(organisation_type)
         fail ArgumentError, "invalid value for \"organisation_type\", must be one of #{validator.allowable_values}."
       end
@@ -425,7 +513,7 @@ module XeroRuby::Accounting
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] organisation_entity_type Object to be assigned
     def organisation_entity_type=(organisation_entity_type)
-      validator = EnumAttributeValidator.new('String', ["ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST"])
+      validator = EnumAttributeValidator.new('String', ["ACCOUNTING_PRACTICE", "COMPANY", "CHARITY", "CLUB_OR_SOCIETY", "INDIVIDUAL", "LOOK_THROUGH_COMPANY", "NOT_FOR_PROFIT", "PARTNERSHIP", "S_CORPORATION", "SELF_MANAGED_SUPERANNUATION_FUND", "SOLE_TRADER", "SUPERANNUATION_FUND", "TRUST"])
       unless validator.valid?(organisation_entity_type)
         fail ArgumentError, "invalid value for \"organisation_entity_type\", must be one of #{validator.allowable_values}."
       end
@@ -435,7 +523,7 @@ module XeroRuby::Accounting
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] _class Object to be assigned
     def _class=(_class)
-      validator = EnumAttributeValidator.new('String', ["DEMO", "TRIAL", "STARTER", "STANDARD", "PREMIUM", "PREMIUM_20", "PREMIUM_50", "PREMIUM_100", "LEDGER", "GST_CASHBOOK", "NON_GST_CASHBOOK"])
+      validator = EnumAttributeValidator.new('String', ["DEMO", "TRIAL", "STARTER", "STANDARD", "PREMIUM", "PREMIUM_20", "PREMIUM_50", "PREMIUM_100", "LEDGER", "GST_CASHBOOK", "NON_GST_CASHBOOK", "ULTIMATE", "LITE"])
       unless validator.valid?(_class)
         fail ArgumentError, "invalid value for \"_class\", must be one of #{validator.allowable_values}."
       end
@@ -469,6 +557,7 @@ module XeroRuby::Accounting
           is_demo_company == o.is_demo_company &&
           organisation_status == o.organisation_status &&
           registration_number == o.registration_number &&
+          employer_identification_number == o.employer_identification_number &&
           tax_number == o.tax_number &&
           financial_year_end_day == o.financial_year_end_day &&
           financial_year_end_month == o.financial_year_end_month &&
@@ -500,7 +589,7 @@ module XeroRuby::Accounting
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [organisation_id, api_key, name, legal_name, pays_tax, version, organisation_type, base_currency, country_code, is_demo_company, organisation_status, registration_number, tax_number, financial_year_end_day, financial_year_end_month, sales_tax_basis, sales_tax_period, default_sales_tax, default_purchases_tax, period_lock_date, end_of_year_lock_date, created_date_utc, timezone, organisation_entity_type, short_code, _class, edition, line_of_business, addresses, phones, external_links, payment_terms].hash
+      [organisation_id, api_key, name, legal_name, pays_tax, version, organisation_type, base_currency, country_code, is_demo_company, organisation_status, registration_number, employer_identification_number, tax_number, financial_year_end_day, financial_year_end_month, sales_tax_basis, sales_tax_period, default_sales_tax, default_purchases_tax, period_lock_date, end_of_year_lock_date, created_date_utc, timezone, organisation_entity_type, short_code, _class, edition, line_of_business, addresses, phones, external_links, payment_terms].hash
     end
 
     # Builds the object from hash
@@ -546,6 +635,8 @@ module XeroRuby::Accounting
         value.to_i
       when :Float
         value.to_f
+      when :BigDecimal
+        BigDecimal(value.to_s)
       when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
@@ -585,38 +676,53 @@ module XeroRuby::Accounting
 
     # Returns the object in the form of hash
     # @return [Hash] Returns the object in the form of hash
-    def to_hash
+    def to_hash(downcase: false)
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         next if value.nil?
-        hash[param] = _to_hash(value)
+        key = downcase ? attr : param
+        hash[key] = _to_hash(value, downcase: downcase)
       end
       hash
     end
 
+    # Returns the object in the form of hash with snake_case
+    def to_attributes
+      to_hash(downcase: true)
+    end
+
     # Outputs non-array value in the form of hash
     # For object, use to_hash. Otherwise, just return the value
     # @param [Object] value Any valid value
     # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
+    def _to_hash(value, downcase: false)
       if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
+        value.map do |v|
+          v.to_hash(downcase: downcase)
+        end
       elsif value.is_a?(Hash)
         {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
+          value.map { |k, v| hash[k] = _to_hash(v, downcase: downcase) }
         end
       elsif value.respond_to? :to_hash
-        value.to_hash
+        value.to_hash(downcase: downcase)
       else
         value
       end
     end
 
-    # customized data_parser
     def parse_date(datestring)
-      seconds_since_epoch = datestring.scan(/[0-9]+/)[0].to_i / 1000.0
-      return Time.at(seconds_since_epoch).to_s
+      if datestring.include?('Date')
+        date_pattern = /\/Date\((-?\d+)(\+\d+)?\)\//
+        original, date, timezone = *date_pattern.match(datestring)
+        date = (date.to_i / 1000)
+        Time.at(date).utc.strftime('%Y-%m-%dT%H:%M:%S%z').to_s
+      elsif /(\d\d\d\d)-(\d\d)/.match(datestring) # handles dates w/out Days: YYYY-MM*-DD
+        Time.parse(datestring + '-01').strftime('%Y-%m-%dT%H:%M:%S').to_s
+      else # handle date 'types' for small subset of payroll API's
+        Time.parse(datestring).strftime('%Y-%m-%dT%H:%M:%S').to_s
+      end
     end
   end
 end

data/lib/xero-ruby/models/accounting/organisations.rb

@@ -1,12 +1,11 @@
 =begin
-#Accounting API
+#Xero Accounting API
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.1.3
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0
+OpenAPI Generator version: 4.3.1
 
 =end
 
@@ -14,9 +13,12 @@ require 'time'
 require 'date'
 
 module XeroRuby::Accounting
+  require 'bigdecimal'
+
   class Organisations
-    attr_accessor :organisations
 
+    attr_accessor :organisations
+    
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -129,6 +131,8 @@ module XeroRuby::Accounting
         value.to_i
       when :Float
         value.to_f
+      when :BigDecimal
+        BigDecimal(value.to_s)
       when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
@@ -168,38 +172,53 @@ module XeroRuby::Accounting
 
     # Returns the object in the form of hash
     # @return [Hash] Returns the object in the form of hash
-    def to_hash
+    def to_hash(downcase: false)
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         next if value.nil?
-        hash[param] = _to_hash(value)
+        key = downcase ? attr : param
+        hash[key] = _to_hash(value, downcase: downcase)
       end
       hash
     end
 
+    # Returns the object in the form of hash with snake_case
+    def to_attributes
+      to_hash(downcase: true)
+    end
+
     # Outputs non-array value in the form of hash
     # For object, use to_hash. Otherwise, just return the value
     # @param [Object] value Any valid value
     # @return [Hash] Returns the value in the form of hash
-    def _to_hash(value)
+    def _to_hash(value, downcase: false)
       if value.is_a?(Array)
-        value.compact.map { |v| _to_hash(v) }
+        value.map do |v|
+          v.to_hash(downcase: downcase)
+        end
       elsif value.is_a?(Hash)
         {}.tap do |hash|
-          value.each { |k, v| hash[k] = _to_hash(v) }
+          value.map { |k, v| hash[k] = _to_hash(v, downcase: downcase) }
         end
       elsif value.respond_to? :to_hash
-        value.to_hash
+        value.to_hash(downcase: downcase)
       else
         value
       end
     end
 
-    # customized data_parser
     def parse_date(datestring)
-      seconds_since_epoch = datestring.scan(/[0-9]+/)[0].to_i / 1000.0
-      return Time.at(seconds_since_epoch).to_s
+      if datestring.include?('Date')
+        date_pattern = /\/Date\((-?\d+)(\+\d+)?\)\//
+        original, date, timezone = *date_pattern.match(datestring)
+        date = (date.to_i / 1000)
+        Time.at(date).utc.strftime('%Y-%m-%dT%H:%M:%S%z').to_s
+      elsif /(\d\d\d\d)-(\d\d)/.match(datestring) # handles dates w/out Days: YYYY-MM*-DD
+        Time.parse(datestring + '-01').strftime('%Y-%m-%dT%H:%M:%S').to_s
+      else # handle date 'types' for small subset of payroll API's
+        Time.parse(datestring).strftime('%Y-%m-%dT%H:%M:%S').to_s
+      end
     end
   end
 end