xero-ruby 1.1.0 → 5.0.0

data/lib/xero-ruby/models/accounting/journal.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,31 +13,58 @@ require 'time'
 require 'date'
 
 module XeroRuby::Accounting
+  require 'bigdecimal'
+
   class Journal
     # Xero identifier
     attr_accessor :journal_id
-
+    
     # Date the journal was posted
     attr_accessor :journal_date
-
+    
     # Xero generated journal number
     attr_accessor :journal_number
-
+    
     # Created date UTC format
     attr_accessor :created_date_utc
-
+    
     # reference field for additional indetifying information
     attr_accessor :reference
-
+    
     # The identifier for the source transaction (e.g. InvoiceID)
     attr_accessor :source_id
-
+    
     # The journal source type. The type of transaction that created the journal
     attr_accessor :source_type
-
+    ACCREC ||= "ACCREC".freeze
+    ACCPAY ||= "ACCPAY".freeze
+    ACCRECCREDIT ||= "ACCRECCREDIT".freeze
+    ACCPAYCREDIT ||= "ACCPAYCREDIT".freeze
+    ACCRECPAYMENT ||= "ACCRECPAYMENT".freeze
+    ACCPAYPAYMENT ||= "ACCPAYPAYMENT".freeze
+    ARCREDITPAYMENT ||= "ARCREDITPAYMENT".freeze
+    APCREDITPAYMENT ||= "APCREDITPAYMENT".freeze
+    CASHREC ||= "CASHREC".freeze
+    CASHPAID ||= "CASHPAID".freeze
+    TRANSFER ||= "TRANSFER".freeze
+    ARPREPAYMENT ||= "ARPREPAYMENT".freeze
+    APPREPAYMENT ||= "APPREPAYMENT".freeze
+    AROVERPAYMENT ||= "AROVERPAYMENT".freeze
+    APOVERPAYMENT ||= "APOVERPAYMENT".freeze
+    EXPCLAIM ||= "EXPCLAIM".freeze
+    EXPPAYMENT ||= "EXPPAYMENT".freeze
+    MANJOURNAL ||= "MANJOURNAL".freeze
+    PAYSLIP ||= "PAYSLIP".freeze
+    WAGEPAYABLE ||= "WAGEPAYABLE".freeze
+    INTEGRATEDPAYROLLPE ||= "INTEGRATEDPAYROLLPE".freeze
+    INTEGRATEDPAYROLLPT ||= "INTEGRATEDPAYROLLPT".freeze
+    EXTERNALSPENDMONEY ||= "EXTERNALSPENDMONEY".freeze
+    INTEGRATEDPAYROLLPTPAYMENT ||= "INTEGRATEDPAYROLLPTPAYMENT".freeze
+    INTEGRATEDPAYROLLCN ||= "INTEGRATEDPAYROLLCN".freeze
+    
     # See JournalLines
     attr_accessor :journal_lines
-
+    
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -234,6 +260,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
@@ -273,38 +301,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/journal_line.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,42 +13,45 @@ require 'time'
 require 'date'
 
 module XeroRuby::Accounting
+  require 'bigdecimal'
+
   class JournalLine
     # Xero identifier for Journal
     attr_accessor :journal_line_id
-
+    
     # See Accounts
     attr_accessor :account_id
-
+    
     # See Accounts
     attr_accessor :account_code
+    
 
     attr_accessor :account_type
-
+    
     # See AccountCodes
     attr_accessor :account_name
-
+    
     # The description from the source transaction line item. Only returned if populated.
     attr_accessor :description
-
+    
     # Net amount of journal line. This will be a positive value for a debit and negative for a credit
     attr_accessor :net_amount
-
+    
     # Gross amount of journal line (NetAmount + TaxAmount).
     attr_accessor :gross_amount
-
+    
     # Total tax on a journal line
     attr_accessor :tax_amount
-
-    # The tax type from TaxRates
+    
+    # The tax type from taxRates
     attr_accessor :tax_type
-
+    
     # see TaxRates
     attr_accessor :tax_name
-
+    
     # Optional Tracking Category – see Tracking. Any JournalLine can have a maximum of 2 <TrackingCategory> elements.
     attr_accessor :tracking_categories
-
+    
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -77,9 +79,9 @@ module XeroRuby::Accounting
         :'account_type' => :'AccountType',
         :'account_name' => :'String',
         :'description' => :'String',
-        :'net_amount' => :'Float',
-        :'gross_amount' => :'Float',
-        :'tax_amount' => :'Float',
+        :'net_amount' => :'BigDecimal',
+        :'gross_amount' => :'BigDecimal',
+        :'tax_amount' => :'BigDecimal',
         :'tax_type' => :'String',
         :'tax_name' => :'String',
         :'tracking_categories' => :'Array<TrackingCategory>'
@@ -239,6 +241,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
@@ -278,38 +282,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/journals.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 Journals
-    attr_accessor :journals
 
+    attr_accessor :journals
+    
     # 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

data/lib/xero-ruby/models/accounting/line_amount_types.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
 
@@ -15,9 +14,9 @@ require 'date'
 
 module XeroRuby::Accounting
   class LineAmountTypes
-    EXCLUSIVE = "Exclusive".freeze
-    INCLUSIVE = "Inclusive".freeze
-    NO_TAX = "NoTax".freeze
+    EXCLUSIVE ||= "Exclusive".freeze
+    INCLUSIVE ||= "Inclusive".freeze
+    NO_TAX ||= "NoTax".freeze
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string

data/lib/xero-ruby/models/accounting/line_item.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,46 +13,54 @@ require 'time'
 require 'date'
 
 module XeroRuby::Accounting
+  require 'bigdecimal'
+
   class LineItem
     # LineItem unique ID
     attr_accessor :line_item_id
-
+    
     # Description needs to be at least 1 char long. A line item with just a description (i.e no unit amount or quantity) can be created by specifying just a <Description> element that contains at least 1 character
     attr_accessor :description
-
+    
     # LineItem Quantity
     attr_accessor :quantity
-
+    
     # LineItem Unit Amount
     attr_accessor :unit_amount
-
+    
     # See Items
     attr_accessor :item_code
-
+    
     # See Accounts
     attr_accessor :account_code
-
+    
+    # The associated account ID related to this line item
+    attr_accessor :account_id
+    
     # The tax type from TaxRates
     attr_accessor :tax_type
-
+    
     # The tax amount is auto calculated as a percentage of the line amount (see below) based on the tax rate. This value can be overriden if the calculated <TaxAmount> is not correct.
     attr_accessor :tax_amount
+    
 
-    # If you wish to omit either of the <Quantity> or <UnitAmount> you can provide a LineAmount and Xero will calculate the missing amount for you. The line amount reflects the discounted price if a DiscountRate has been used . i.e LineAmount = Quantity * Unit Amount * ((100 – DiscountRate)/100)
+    attr_accessor :item
+    
+    # If you wish to omit either the Quantity or UnitAmount you can provide a LineAmount and Xero will calculate the missing amount for you. The line amount reflects the discounted price if either a DiscountRate or DiscountAmount has been used i.e. LineAmount = Quantity * Unit Amount * ((100 - DiscountRate)/100) or LineAmount = (Quantity * UnitAmount) - DiscountAmount
     attr_accessor :line_amount
-
+    
     # Optional Tracking Category – see Tracking.  Any LineItem can have a  maximum of 2 <TrackingCategory> elements.
     attr_accessor :tracking
-
+    
     # Percentage discount being applied to a line item (only supported on  ACCREC invoices – ACC PAY invoices and credit notes in Xero do not support discounts
     attr_accessor :discount_rate
-
-    # Discount amount being applied to a line item. Only supported on ACCREC invoices - ACCPAY invoices and credit notes in Xero do not support discounts.
+    
+    # Discount amount being applied to a line item. Only supported on ACCREC invoices and quotes. ACCPAY invoices and credit notes in Xero do not support discounts.
     attr_accessor :discount_amount
-
+    
     # The Xero identifier for a Repeating Invoice
     attr_accessor :repeating_invoice_id
-
+    
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -63,8 +70,10 @@ module XeroRuby::Accounting
         :'unit_amount' => :'UnitAmount',
         :'item_code' => :'ItemCode',
         :'account_code' => :'AccountCode',
+        :'account_id' => :'AccountID',
         :'tax_type' => :'TaxType',
         :'tax_amount' => :'TaxAmount',
+        :'item' => :'Item',
         :'line_amount' => :'LineAmount',
         :'tracking' => :'Tracking',
         :'discount_rate' => :'DiscountRate',
@@ -78,16 +87,18 @@ module XeroRuby::Accounting
       {
         :'line_item_id' => :'String',
         :'description' => :'String',
-        :'quantity' => :'Float',
-        :'unit_amount' => :'Float',
+        :'quantity' => :'BigDecimal',
+        :'unit_amount' => :'BigDecimal',
         :'item_code' => :'String',
         :'account_code' => :'String',
+        :'account_id' => :'String',
         :'tax_type' => :'String',
-        :'tax_amount' => :'Float',
-        :'line_amount' => :'Float',
+        :'tax_amount' => :'BigDecimal',
+        :'item' => :'LineItemItem',
+        :'line_amount' => :'BigDecimal',
         :'tracking' => :'Array<LineItemTracking>',
-        :'discount_rate' => :'Float',
-        :'discount_amount' => :'Float',
+        :'discount_rate' => :'BigDecimal',
+        :'discount_amount' => :'BigDecimal',
         :'repeating_invoice_id' => :'String'
       }
     end
@@ -131,6 +142,10 @@ module XeroRuby::Accounting
         self.account_code = attributes[:'account_code']
       end
 
+      if attributes.key?(:'account_id')
+        self.account_id = attributes[:'account_id']
+      end
+
       if attributes.key?(:'tax_type')
         self.tax_type = attributes[:'tax_type']
       end
@@ -139,6 +154,10 @@ module XeroRuby::Accounting
         self.tax_amount = attributes[:'tax_amount']
       end
 
+      if attributes.key?(:'item')
+        self.item = attributes[:'item']
+      end
+
       if attributes.key?(:'line_amount')
         self.line_amount = attributes[:'line_amount']
       end
@@ -186,8 +205,10 @@ module XeroRuby::Accounting
           unit_amount == o.unit_amount &&
           item_code == o.item_code &&
           account_code == o.account_code &&
+          account_id == o.account_id &&
           tax_type == o.tax_type &&
           tax_amount == o.tax_amount &&
+          item == o.item &&
           line_amount == o.line_amount &&
           tracking == o.tracking &&
           discount_rate == o.discount_rate &&
@@ -204,7 +225,7 @@ module XeroRuby::Accounting
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [line_item_id, description, quantity, unit_amount, item_code, account_code, tax_type, tax_amount, line_amount, tracking, discount_rate, discount_amount, repeating_invoice_id].hash
+      [line_item_id, description, quantity, unit_amount, item_code, account_code, account_id, tax_type, tax_amount, item, line_amount, tracking, discount_rate, discount_amount, repeating_invoice_id].hash
     end
 
     # Builds the object from hash
@@ -250,6 +271,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
@@ -289,38 +312,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