xeroizer 2.16.5 → 2.17.1

data/lib/xeroizer/models/account.rb

@@ -64,6 +64,7 @@ module Xeroizer
       string  :bank_account_number
       string  :reporting_code
       string  :reporting_code_name
+      datetime_utc :updated_date_utc, api_name: 'UpdatedDateUTC'
 
     end
 

data/lib/xeroizer/models/address.rb

@@ -1,18 +1,18 @@
 module Xeroizer
   module Record
-    
+
     class AddressModel < BaseModel
-            
+
     end
-    
+
     class Address < Base
-      
+
       ADDRESS_TYPE = {
         'STREET' =>     'Street',
         'POBOX' =>      'PO Box',
         'DEFAULT' =>    'Default address type'
       } unless defined?(ADDRESS_TYPE)
-      
+
       string :address_type, :internal_name => :type
       string :attention_to
       string :address_line1, :internal_name => :line1
@@ -23,10 +23,19 @@ module Xeroizer
       string :region
       string :postal_code
       string :country
-      
+
       validates_inclusion_of :type, :in => ADDRESS_TYPE.keys
-      
+      validates_length_of :address_line1, :max => 500
+      validates_length_of :address_line2, :max => 500
+      validates_length_of :address_line3, :max => 500
+      validates_length_of :address_line4, :max => 500
+      validates_length_of :city, :max => 255
+      validates_length_of :region, :max => 255
+      validates_length_of :postal_code, :max => 50
+      validates_length_of :country, :max => 50
+      validates_length_of :attention_to, :max => 255
+
     end
-    
+
   end
-end
+end

data/lib/xeroizer/models/attachment.rb

@@ -82,7 +82,7 @@ module Xeroizer
       def get(filename = nil)
         data = parent.application.http_get(parent.application.client, url)
         if filename
-          File.open(filename, "w") { | fp | fp.write data }
+          File.open(filename, "wb") { | fp | fp.write data }
           nil
         else
           data

data/lib/xeroizer/models/balances.rb

@@ -6,6 +6,7 @@ module Xeroizer
     
     class BalancesModel < BaseModel
       set_permissions :read
+      set_api_controller_name 'Balances'
     end
     
     class Balances < Base

data/lib/xeroizer/models/bank_transaction.rb

@@ -52,8 +52,8 @@ module Xeroizer
         :in => Xeroizer::Record::LINE_AMOUNT_TYPES, :allow_blanks => false
 
       validates_inclusion_of :type,
-        :in => %w{SPEND RECEIVE RECEIVE-PREPAYMENT RECEIVE-OVERPAYMENT}, :allow_blanks => false,
-        :message => "Invalid type. Expected either SPEND, RECEIVE, RECEIVE-PREPAYMENT or RECEIVE-OVERPAYMENT."
+        :in => %w{RECEIVE RECEIVE-OVERPAYMENT RECEIVE-PREPAYMENT SPEND SPEND-OVERPAYMENT SPEND-PREPAYMENT}, :allow_blanks => false,
+        :message => "Invalid type. Expected one of https://developer.xero.com/documentation/api/types#BankTransactionTypes"
       validates_inclusion_of :status, :in => BANK_TRANSACTION_STATUSES, :allow_blanks => true
 
       validates_presence_of :contact, :bank_account, :allow_blanks => false

data/lib/xeroizer/models/bank_transfer.rb

@@ -0,0 +1,28 @@
+module Xeroizer
+  module Record
+    class BankTransferModel < BaseModel
+      set_permissions :read, :write, :update
+    end
+
+    class BankTransfer < Base
+
+      def initialize(parent)
+        super parent
+      end
+
+      set_primary_key :bank_transfer_id
+
+      string          :bank_transfer_id, :api_name => "BankTransferID"
+      datetime_utc    :created_date_utc, :api_name => "CreatedDateUTC"
+      date            :date
+      decimal         :amount
+      decimal         :currency_rate
+      string          :from_bank_transaction_id, :api_name => "FromBankTransactionID"
+      string          :to_bank_transaction_id, :api_name => "ToBankTransactionID"
+
+      validates_presence_of :from_bank_account, :to_bank_account, :allow_blanks => false
+      belongs_to :from_bank_account, :model_name => 'FromBankAccount'
+      belongs_to :to_bank_account, :model_name => 'ToBankAccount'
+    end
+  end
+end

data/lib/xeroizer/models/contact.rb

@@ -10,6 +10,8 @@ module Xeroizer
 
       set_permissions :read, :write, :update
 
+      include AttachmentModel::Extensions
+
     end
 
     class Contact < Base
@@ -20,6 +22,8 @@ module Xeroizer
         'ARCHIVED' => 'Archived'
       } unless defined?(CONTACT_STATUS)
 
+      include Attachment::Extensions
+
       set_primary_key :contact_id
       set_possible_primary_keys :contact_id, :contact_number
       list_contains_summary_only true
@@ -37,13 +41,15 @@ module Xeroizer
       string        :last_name
       string        :email_address
       string        :skype_user_name
-      string        :contact_groups
       string        :default_currency
       string        :purchases_default_account_code
       string        :sales_default_account_code
       datetime_utc  :updated_date_utc, :api_name => 'UpdatedDateUTC'
       boolean       :is_supplier
       boolean       :is_customer
+      string        :website # read only
+      decimal       :discount # read only
+      boolean       :has_attachments
 
       has_many  :addresses, :list_complete => true
       has_many  :phones, :list_complete => true
@@ -53,12 +59,13 @@ module Xeroizer
       has_many :sales_tracking_categories, :model_name => 'ContactSalesTrackingCategory'
       has_many :purchases_tracking_categories, :model_name => 'ContactPurchasesTrackingCategory'
 
-      has_one :balances ,:model_name => 'Balances', :list_complete => true
-      has_one :batch_payments ,:model_name => 'BatchPayments', :list_complete => true
-      has_one :payment_terms ,:model_name => 'PaymentTerms', :list_complete => true
+      has_one :balances, :model_name => 'Balances', :list_complete => true
+      has_one :batch_payments, :model_name => 'BatchPayments', :list_complete => true
+      has_one :payment_terms, :model_name => 'PaymentTerms', :list_complete => true
 
       validates_presence_of :name, :unless => Proc.new { | contact | contact.contact_id.present?}
       validates_inclusion_of :contact_status, :in => CONTACT_STATUS.keys, :allow_blanks => true
+      validates_associated :addresses, allow_blanks: true
 
       def email_address?
         email_address.present?

data/lib/xeroizer/models/credit_note.rb

@@ -5,6 +5,8 @@ module Xeroizer
         
       set_permissions :read, :write, :update
       
+      include AttachmentModel::Extensions
+      
       public
 
         # Retrieve the PDF version of the credit matching the `id`.
@@ -39,6 +41,8 @@ module Xeroizer
         'ACCPAYCREDIT' =>           'Accounts Payable'
       } unless defined?(CREDIT_NOTE_TYPE)
       CREDIT_NOTE_TYPES = CREDIT_NOTE_TYPE.keys.sort
+
+      include Attachment::Extensions
       
       set_primary_key :credit_note_id
       set_possible_primary_keys :credit_note_id, :credit_note_number
@@ -60,7 +64,8 @@ module Xeroizer
       decimal       :currency_rate
       datetime      :fully_paid_on_date
       boolean       :sent_to_contact
-      decimal :remaining_credit
+      decimal       :remaining_credit
+      boolean       :has_attachments
 
       belongs_to    :contact
       has_many      :line_items
@@ -94,11 +99,11 @@ module Xeroizer
         # Calculate sub_total from line_items.
         def sub_total(always_summary = false)
           if !always_summary && (new_record? || (!new_record? && line_items && line_items.size > 0))
-            sum = (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.line_amount }
+            overall_sum = (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.line_amount }
             
             # If the default amount types are inclusive of 'tax' then remove the tax amount from this sub-total.
-            sum -= total_tax if line_amount_types == 'Inclusive' 
-            sum
+            overall_sum -= total_tax if line_amount_types == 'Inclusive' 
+            overall_sum
           else
             attributes[:sub_total]
           end

data/lib/xeroizer/models/from_bank_account.rb

@@ -0,0 +1,12 @@
+module Xeroizer
+  module Record
+    class FromBankAccountModel < BaseModel
+      set_permissions :read
+    end
+
+    class FromBankAccount < Base
+      guid   :account_id
+      string :code
+    end
+  end
+end

data/lib/xeroizer/models/invoice.rb

@@ -69,6 +69,7 @@ module Xeroizer
       decimal      :sub_total, :calculated => true
       decimal      :total_tax, :calculated => true
       decimal      :total, :calculated => true
+      decimal      :total_discount
       decimal      :amount_due
       decimal      :amount_paid
       decimal      :amount_credited
@@ -77,6 +78,7 @@ module Xeroizer
       decimal      :currency_rate
       datetime     :fully_paid_on_date
       datetime     :expected_payment_date
+      datetime     :planned_payment_date
       boolean      :sent_to_contact
       boolean      :has_attachments
 
@@ -94,6 +96,12 @@ module Xeroizer
       validates_associated :line_items, :if => :approved?
 
       public
+        def initialize(parent)
+          super(parent)
+          @sub_total_is_set = false
+          @total_tax_is_set = false
+          @total_is_set = false
+        end
 
         # Access the contact name without forcing a download of
         # an incomplete, summary invoice.
@@ -140,11 +148,11 @@ module Xeroizer
         # Calculate sub_total from line_items.
         def sub_total(always_summary = false)
           if !@sub_total_is_set && not_summary_or_loaded_record(always_summary)
-            sum = (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.line_amount }
+            overall_sum = (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.line_amount }
 
             # If the default amount types are inclusive of 'tax' then remove the tax amount from this sub-total.
-            sum -= total_tax if line_amount_types == 'Inclusive'
-            sum
+            overall_sum -= total_tax if line_amount_types == 'Inclusive'
+            overall_sum
           else
             attributes[:sub_total]
           end

data/lib/xeroizer/models/invoice_reminder.rb

@@ -0,0 +1,19 @@
+module Xeroizer
+  module Record
+    
+    class InvoiceReminderModel < BaseModel
+      
+      set_api_controller_name 'InvoiceReminders/Settings'
+    
+      set_permissions :read 
+    
+    end
+    
+    class InvoiceReminder < Base
+
+      boolean   :enabled
+
+    end
+    
+  end
+end

data/lib/xeroizer/models/line_item.rb

@@ -4,12 +4,12 @@ require 'xeroizer/models/line_amount_type'
 module Xeroizer
   module Record
     class LineItemModel < BaseModel
-        
+
     end
-    
+
     class LineItem < Base
       TAX_TYPE = Account::TAX_TYPE unless defined?(TAX_TYPE)
-      
+
       string  :item_code
       string  :description
       decimal :quantity
@@ -20,22 +20,34 @@ module Xeroizer
       decimal :line_amount, :calculated => true
       decimal :discount_rate
       string  :line_item_id
-      
+
       has_many  :tracking, :model_name => 'TrackingCategoryChild'
-      
+
+      def initialize(parent)
+        super(parent)
+        @line_amount_set = false
+      end
+
       def line_amount=(line_amount)
         @line_amount_set = true
         attributes[:line_amount] = line_amount
       end
-            
+
       # Calculate the line_total (if there is a quantity and unit_amount).
       # Description-only lines have been allowed since Xero V2.09.
       def line_amount(summary_only = false)
         return attributes[:line_amount] if summary_only || @line_amount_set
-        
-        BigDecimal((quantity * unit_amount).to_s).round(2) if quantity && unit_amount
+
+        if quantity && unit_amount
+          total = quantity * unit_amount
+          if discount_rate
+            BigDecimal((total * ((100 - discount_rate) / 100)).to_s).round(2)
+          else
+            BigDecimal(total.to_s).round(2)
+          end
+        end
       end
-      
+
     end
     
   end

data/lib/xeroizer/models/manual_journal.rb

@@ -1,9 +1,13 @@
+require "xeroizer/models/attachment"
+
 module Xeroizer
   module Record
     
     class ManualJournalModel < BaseModel
         
       set_permissions :read, :write, :update
+
+      include AttachmentModel::Extensions
                   
     end
     
@@ -14,6 +18,8 @@ module Xeroizer
         'POSTED' =>     'Posted'
       } unless defined?(JOURNAL_STATUS)
       JOURNAL_STATUSES = JOURNAL_STATUS.keys.sort
+
+      include Attachment::Extensions
             
       set_primary_key :manual_journal_id
       set_possible_primary_keys :manual_journal_id

data/lib/xeroizer/models/organisation.rb

@@ -36,9 +36,12 @@ module Xeroizer
       string    :name
       string    :legal_name
       string    :short_code
+      string    :organisation_id
       boolean   :pays_tax
       string    :version
       string    :organisation_type
+      string    :organisation_entity_type
+      string    :line_of_business
       string    :base_currency
       string    :country_code
       boolean   :is_demo_company
@@ -58,6 +61,7 @@ module Xeroizer
 
       has_many :addresses
       has_many :phones
+      has_many :external_links
 
       validates :sales_tax_basis, :message => "is not a valid option" do
         valid = true

data/lib/xeroizer/models/overpayment.rb

@@ -0,0 +1,40 @@
+module Xeroizer
+  module Record
+
+    class OverpaymentModel < BaseModel
+
+      set_xml_root_name 'Overpayments'
+      set_api_controller_name 'Overpayment'
+      set_permissions :read
+
+    end
+
+    class Overpayment < Base
+      set_primary_key :overpayment_id
+
+      guid          :overpayment_id
+      date          :date
+      string        :status
+      string        :line_amount_types
+      decimal       :sub_total
+      decimal       :total_tax
+      decimal       :total
+      datetime_utc  :updated_date_utc, :api_name => 'UpdatedDateUTC'
+      string        :currency_code
+      string        :type
+      decimal       :remaining_credit
+      boolean       :has_attachments
+
+      belongs_to    :contact
+      belongs_to    :invoice
+      has_many      :allocations
+      has_many      :line_items
+      has_many      :payments
+
+      def contact_id
+        contact.id if contact
+      end
+
+    end
+  end
+end

data/lib/xeroizer/models/payroll/bank_account.rb

@@ -0,0 +1,23 @@
+module Xeroizer
+  module Record
+    module Payroll
+    
+      class BankAccountModel < PayrollBaseModel
+          
+      end
+      
+      class BankAccount < PayrollBase
+        
+        string      :statement_text
+        string      :account_name
+        string      :bsb
+        string      :account_number
+        boolean     :remainder
+        string      :percentage
+        decimal     :amount
+
+      end
+
+    end 
+  end
+end