xero-ruby 1.1.0 → 5.0.0

data/lib/xero-ruby/models/accounting/overpayment.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,61 +13,72 @@ require 'time'
 require 'date'
 
 module XeroRuby::Accounting
+  require 'bigdecimal'
+
   class Overpayment
     # See Overpayment Types
     attr_accessor :type
+    RECEIVE_OVERPAYMENT ||= "RECEIVE-OVERPAYMENT".freeze
+    SPEND_OVERPAYMENT ||= "SPEND-OVERPAYMENT".freeze
+    AROVERPAYMENT ||= "AROVERPAYMENT".freeze
+    
 
     attr_accessor :contact
-
+    
     # The date the overpayment is created YYYY-MM-DD
     attr_accessor :date
-
+    
     # See Overpayment Status Codes
     attr_accessor :status
+    AUTHORISED ||= "AUTHORISED".freeze
+    PAID ||= "PAID".freeze
+    VOIDED ||= "VOIDED".freeze
+    
 
     attr_accessor :line_amount_types
-
+    
     # See Overpayment Line Items
     attr_accessor :line_items
-
+    
     # The subtotal of the overpayment excluding taxes
     attr_accessor :sub_total
-
+    
     # The total tax on the overpayment
     attr_accessor :total_tax
-
+    
     # The total of the overpayment (subtotal + total tax)
     attr_accessor :total
-
+    
     # UTC timestamp of last update to the overpayment
     attr_accessor :updated_date_utc
+    
 
     attr_accessor :currency_code
-
+    
     # Xero generated unique identifier
     attr_accessor :overpayment_id
-
+    
     # The currency rate for a multicurrency overpayment. If no rate is specified, the XE.com day rate is used
     attr_accessor :currency_rate
-
+    
     # The remaining credit balance on the overpayment
     attr_accessor :remaining_credit
-
+    
     # See Allocations
     attr_accessor :allocations
-
+    
     # The amount of applied to an invoice
     attr_accessor :applied_amount
-
+    
     # See Payments
     attr_accessor :payments
-
+    
     # boolean to indicate if a overpayment has an attachment
     attr_accessor :has_attachments
-
+    
     # See Attachments
     attr_accessor :attachments
-
+    
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -125,14 +135,14 @@ module XeroRuby::Accounting
         :'status' => :'String',
         :'line_amount_types' => :'LineAmountTypes',
         :'line_items' => :'Array<LineItem>',
-        :'sub_total' => :'Float',
-        :'total_tax' => :'Float',
-        :'total' => :'Float',
+        :'sub_total' => :'BigDecimal',
+        :'total_tax' => :'BigDecimal',
+        :'total' => :'BigDecimal',
         :'updated_date_utc' => :'DateTime',
         :'currency_code' => :'CurrencyCode',
         :'overpayment_id' => :'String',
-        :'currency_rate' => :'Float',
-        :'remaining_credit' => :'Float',
+        :'currency_rate' => :'BigDecimal',
+        :'remaining_credit' => :'BigDecimal',
         :'allocations' => :'Array<Allocation>',
         :'applied_amount' => :'Float',
         :'payments' => :'Array<Payment>',
@@ -361,6 +371,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
@@ -400,38 +412,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/overpayments.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 Overpayments
-    attr_accessor :overpayments
 
+    attr_accessor :overpayments
+    
     # 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/payment.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,74 +13,100 @@ require 'time'
 require 'date'
 
 module XeroRuby::Accounting
+  require 'bigdecimal'
+
   class Payment
+
     attr_accessor :invoice
+    
 
     attr_accessor :credit_note
+    
 
     attr_accessor :prepayment
+    
 
     attr_accessor :overpayment
-
+    
     # Number of invoice or credit note you are applying payment to e.g.INV-4003
     attr_accessor :invoice_number
-
+    
     # Number of invoice or credit note you are applying payment to e.g. INV-4003
     attr_accessor :credit_note_number
+    
 
-    attr_accessor :account
+    attr_accessor :batch_payment
+    
 
+    attr_accessor :account
+    
     # Code of account you are using to make the payment e.g. 001 (note- not all accounts have a code value)
     attr_accessor :code
-
+    
     # Date the payment is being made (YYYY-MM-DD) e.g. 2009-09-06
     attr_accessor :date
-
+    
     # Exchange rate when payment is received. Only used for non base currency invoices and credit notes e.g. 0.7500
     attr_accessor :currency_rate
-
+    
     # The amount of the payment. Must be less than or equal to the outstanding amount owing on the invoice e.g. 200.00
     attr_accessor :amount
-
+    
+    # The amount of the payment in the currency of the bank account.
+    attr_accessor :bank_amount
+    
     # An optional description for the payment e.g. Direct Debit
     attr_accessor :reference
-
+    
     # An optional parameter for the payment. A boolean indicating whether you would like the payment to be created as reconciled when using PUT, or whether a payment has been reconciled when using GET
     attr_accessor :is_reconciled
-
+    
     # The status of the payment.
     attr_accessor :status
-
+    AUTHORISED ||= "AUTHORISED".freeze
+    DELETED ||= "DELETED".freeze
+    
     # See Payment Types.
     attr_accessor :payment_type
-
+    ACCRECPAYMENT ||= "ACCRECPAYMENT".freeze
+    ACCPAYPAYMENT ||= "ACCPAYPAYMENT".freeze
+    ARCREDITPAYMENT ||= "ARCREDITPAYMENT".freeze
+    APCREDITPAYMENT ||= "APCREDITPAYMENT".freeze
+    AROVERPAYMENTPAYMENT ||= "AROVERPAYMENTPAYMENT".freeze
+    ARPREPAYMENTPAYMENT ||= "ARPREPAYMENTPAYMENT".freeze
+    APPREPAYMENTPAYMENT ||= "APPREPAYMENTPAYMENT".freeze
+    APOVERPAYMENTPAYMENT ||= "APOVERPAYMENTPAYMENT".freeze
+    
     # UTC timestamp of last update to the payment
     attr_accessor :updated_date_utc
-
+    
     # The Xero identifier for an Payment e.g. 297c2dc5-cc47-4afd-8ec8-74990b8761e9
     attr_accessor :payment_id
-
+    
+    # Present if the payment was created as part of a batch.
+    attr_accessor :batch_payment_id
+    
     # The suppliers bank account number the payment is being made to
     attr_accessor :bank_account_number
-
+    
     # The suppliers bank account number the payment is being made to
     attr_accessor :particulars
-
+    
     # The information to appear on the supplier's bank account
     attr_accessor :details
-
+    
     # A boolean to indicate if a contact has an validation errors
     attr_accessor :has_account
-
+    
     # A boolean to indicate if a contact has an validation errors
     attr_accessor :has_validation_errors
-
+    
     # A string to indicate if a invoice status
     attr_accessor :status_attribute_string
-
+    
     # Displays array of validation error messages from the API
     attr_accessor :validation_errors
-
+    
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -113,17 +138,20 @@ module XeroRuby::Accounting
         :'overpayment' => :'Overpayment',
         :'invoice_number' => :'InvoiceNumber',
         :'credit_note_number' => :'CreditNoteNumber',
+        :'batch_payment' => :'BatchPayment',
         :'account' => :'Account',
         :'code' => :'Code',
         :'date' => :'Date',
         :'currency_rate' => :'CurrencyRate',
         :'amount' => :'Amount',
+        :'bank_amount' => :'BankAmount',
         :'reference' => :'Reference',
         :'is_reconciled' => :'IsReconciled',
         :'status' => :'Status',
         :'payment_type' => :'PaymentType',
         :'updated_date_utc' => :'UpdatedDateUTC',
         :'payment_id' => :'PaymentID',
+        :'batch_payment_id' => :'BatchPaymentID',
         :'bank_account_number' => :'BankAccountNumber',
         :'particulars' => :'Particulars',
         :'details' => :'Details',
@@ -143,17 +171,20 @@ module XeroRuby::Accounting
         :'overpayment' => :'Overpayment',
         :'invoice_number' => :'String',
         :'credit_note_number' => :'String',
+        :'batch_payment' => :'BatchPayment',
         :'account' => :'Account',
         :'code' => :'String',
         :'date' => :'Date',
-        :'currency_rate' => :'Float',
-        :'amount' => :'Float',
+        :'currency_rate' => :'BigDecimal',
+        :'amount' => :'BigDecimal',
+        :'bank_amount' => :'BigDecimal',
         :'reference' => :'String',
         :'is_reconciled' => :'Boolean',
         :'status' => :'String',
         :'payment_type' => :'String',
         :'updated_date_utc' => :'DateTime',
         :'payment_id' => :'String',
+        :'batch_payment_id' => :'String',
         :'bank_account_number' => :'String',
         :'particulars' => :'String',
         :'details' => :'String',
@@ -203,6 +234,10 @@ module XeroRuby::Accounting
         self.credit_note_number = attributes[:'credit_note_number']
       end
 
+      if attributes.key?(:'batch_payment')
+        self.batch_payment = attributes[:'batch_payment']
+      end
+
       if attributes.key?(:'account')
         self.account = attributes[:'account']
       end
@@ -223,6 +258,10 @@ module XeroRuby::Accounting
         self.amount = attributes[:'amount']
       end
 
+      if attributes.key?(:'bank_amount')
+        self.bank_amount = attributes[:'bank_amount']
+      end
+
       if attributes.key?(:'reference')
         self.reference = attributes[:'reference']
       end
@@ -247,6 +286,10 @@ module XeroRuby::Accounting
         self.payment_id = attributes[:'payment_id']
       end
 
+      if attributes.key?(:'batch_payment_id')
+        self.batch_payment_id = attributes[:'batch_payment_id']
+      end
+
       if attributes.key?(:'bank_account_number')
         self.bank_account_number = attributes[:'bank_account_number']
       end
@@ -261,10 +304,14 @@ module XeroRuby::Accounting
 
       if attributes.key?(:'has_account')
         self.has_account = attributes[:'has_account']
+      else
+        self.has_account = false
       end
 
       if attributes.key?(:'has_validation_errors')
         self.has_validation_errors = attributes[:'has_validation_errors']
+      else
+        self.has_validation_errors = false
       end
 
       if attributes.key?(:'status_attribute_string')
@@ -326,17 +373,20 @@ module XeroRuby::Accounting
           overpayment == o.overpayment &&
           invoice_number == o.invoice_number &&
           credit_note_number == o.credit_note_number &&
+          batch_payment == o.batch_payment &&
           account == o.account &&
           code == o.code &&
           date == o.date &&
           currency_rate == o.currency_rate &&
           amount == o.amount &&
+          bank_amount == o.bank_amount &&
           reference == o.reference &&
           is_reconciled == o.is_reconciled &&
           status == o.status &&
           payment_type == o.payment_type &&
           updated_date_utc == o.updated_date_utc &&
           payment_id == o.payment_id &&
+          batch_payment_id == o.batch_payment_id &&
           bank_account_number == o.bank_account_number &&
           particulars == o.particulars &&
           details == o.details &&
@@ -355,7 +405,7 @@ module XeroRuby::Accounting
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [invoice, credit_note, prepayment, overpayment, invoice_number, credit_note_number, account, code, date, currency_rate, amount, reference, is_reconciled, status, payment_type, updated_date_utc, payment_id, bank_account_number, particulars, details, has_account, has_validation_errors, status_attribute_string, validation_errors].hash
+      [invoice, credit_note, prepayment, overpayment, invoice_number, credit_note_number, batch_payment, account, code, date, currency_rate, amount, bank_amount, reference, is_reconciled, status, payment_type, updated_date_utc, payment_id, batch_payment_id, bank_account_number, particulars, details, has_account, has_validation_errors, status_attribute_string, validation_errors].hash
     end
 
     # Builds the object from hash
@@ -401,6 +451,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
@@ -440,38 +492,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