xeroizer 2.15.5 → 2.15.6

data/lib/xeroizer/models/bank_transaction.rb

@@ -29,6 +29,7 @@ module Xeroizer
 
       datetime_utc  :updated_date_utc, :api_name => "UpdatedDateUTC"
       date          :fully_paid_on_date
+      string        :url
       string        :reference
       string        :bank_transaction_id, :api_name => "BankTransactionID"
       boolean       :is_reconciled
@@ -45,8 +46,8 @@ module Xeroizer
         :in => Xeroizer::Record::LINE_AMOUNT_TYPES, :allow_blanks => false
 
       validates_inclusion_of :type,
-        :in => %w{SPEND RECEIVE}, :allow_blanks => false,
-        :message => "Invalid type. Expected either SPEND or RECEIVE."
+        :in => %w{SPEND RECEIVE RECEIVE-PREPAYMENT RECEIVE-OVERPAYMENT}, :allow_blanks => false,
+        :message => "Invalid type. Expected either SPEND, RECEIVE, RECEIVE-PREPAYMENT or RECEIVE-OVERPAYMENT."
       validates_inclusion_of :status, :in => BANK_TRANSACTION_STATUSES, :unless => :new_record?
 
       validates_presence_of :contact, :bank_account, :allow_blanks => false

data/lib/xeroizer/models/contact.rb

@@ -1,23 +1,26 @@
+require "xeroizer/models/contact_person"
+
 module Xeroizer
   module Record
-    
+
     class ContactModel < BaseModel
-            
+
       set_permissions :read, :write, :update
-      
+
     end
-    
+
     class Contact < Base
-      
+
       CONTACT_STATUS = {
         'ACTIVE' =>     'Active',
-        'DELETED' =>    'Deleted'
+        'DELETED' =>    'Deleted',
+        'ARCHIVED' => 'Archived'
       } unless defined?(CONTACT_STATUS)
-      
+
       set_primary_key :contact_id
       set_possible_primary_keys :contact_id, :contact_number
       list_contains_summary_only true
-      
+
       guid          :contact_id
       string        :contact_number
       string        :contact_status
@@ -35,15 +38,20 @@ module Xeroizer
       datetime_utc  :updated_date_utc, :api_name => 'UpdatedDateUTC'
       boolean       :is_supplier
       boolean       :is_customer
-      
+
       has_many  :addresses, :list_complete => true
       has_many  :phones, :list_complete => true
       has_many  :contact_groups
-      
+      has_many  :contact_persons, :internal_name => :contact_people
+
       validates_presence_of :name
       validates_inclusion_of :contact_status, :in => CONTACT_STATUS.keys, :allow_blanks => true
-      
+
+      def email_address?
+        email_address.present?
+      end
+
     end
-    
+
   end
 end

data/lib/xeroizer/models/contact_person.rb

@@ -0,0 +1,20 @@
+require 'xeroizer/models/account'
+require 'xeroizer/models/line_amount_type'
+
+module Xeroizer
+  module Record
+    class ContactPersonModel < BaseModel
+      set_xml_root_name "ContactPersons"
+    end
+
+    class ContactPerson < Base
+
+      string  :first_name
+      string  :last_name
+      string  :email_address
+      boolean :include_in_emails
+
+    end
+
+  end
+end

data/lib/xeroizer/models/credit_note.rb

@@ -62,11 +62,13 @@ module Xeroizer
       
       belongs_to    :contact
       has_many      :line_items
+      has_many      :allocations
       
       validates_inclusion_of :type, :in => CREDIT_NOTE_TYPES
       validates_inclusion_of :status, :in => CREDIT_NOTE_STATUSES, :allow_blanks => true
       validates_associated :contact
       validates_associated :line_items
+      validates_associated :allocations, :allow_blanks => true
       
       public
       

data/lib/xeroizer/models/expense_claim.rb

@@ -0,0 +1,29 @@
+module Xeroizer
+  module Record
+    
+    class ExpenseClaimModel < BaseModel
+        
+      set_permissions :read, :write, :update
+      
+    end
+    
+    class ExpenseClaim < Base
+      
+      set_primary_key :expense_claim_id
+
+      guid          :expense_claim_id
+      string        :status
+      decimal       :total
+      decimal       :amount_due
+      decimal       :amount_paid
+      date          :payment_due_date
+      date          :reporting_date
+      datetime_utc  :updated_date_utc, :api_name => 'UpdatedDateUTC'
+      
+      belongs_to    :user
+      has_many      :receipts
+      
+    end
+    
+  end
+end

data/lib/xeroizer/models/invoice.rb

@@ -1,32 +1,36 @@
+require "xeroizer/models/attachment"
+
 module Xeroizer
   module Record
-    
+
     class InvoiceModel < BaseModel
       # To create a new invoice, use the folowing
       # $xero_client.Invoice.build(type: 'ACCREC', ..., contact: {name: 'Foo Bar'},...)
       # Note that we are not making an api request to xero just to get the contact
-            
+
       set_permissions :read, :write, :update
-      
+
+      include AttachmentModel::Extensions
+
       public
-      
+
         # Retrieve the PDF version of the invoice matching the `id`.
         # @param [String] id invoice's ID.
         # @param [String] filename optional filename to store the PDF in instead of returning the data.
         def pdf(id, filename = nil)
           pdf_data = @application.http_get(@application.client, "#{url}/#{CGI.escape(id)}", :response => :pdf)
           if filename
-            File.open(filename, "w") { | fp | fp.write pdf_data }
+            File.open(filename, "wb") { | fp | fp.write pdf_data }
             nil
           else
             pdf_data
           end
         end
-      
+
     end
-    
+
     class Invoice < Base
-      
+
       INVOICE_TYPE = {
         'ACCREC' =>           'Accounts Receivable',
         'ACCPAY' =>           'Accounts Payable'
@@ -42,11 +46,13 @@ module Xeroizer
         'VOIDED' =>           'Approved invoices that are voided'
       } unless defined?(INVOICE_STATUS)
       INVOICE_STATUSES = INVOICE_STATUS.keys.sort
-      
+
+      include Attachment::Extensions
+
       set_primary_key :invoice_id
       set_possible_primary_keys :invoice_id, :invoice_number
       list_contains_summary_only true
-      
+
       guid         :invoice_id
       string       :invoice_number
       string       :reference
@@ -65,14 +71,16 @@ module Xeroizer
       decimal      :amount_credited
       datetime_utc :updated_date_utc, :api_name => 'UpdatedDateUTC'
       string       :currency_code
+      decimal      :currency_rate
       datetime     :fully_paid_on_date
       boolean      :sent_to_contact
-      
+      boolean      :has_attachments
+
       belongs_to   :contact
       has_many     :line_items
       has_many     :payments
       has_many     :credit_notes
-      
+
       validates_presence_of :date, :due_date, :unless => :new_record?
       validates_inclusion_of :type, :in => INVOICE_TYPES
       validates_inclusion_of :status, :in => INVOICE_STATUSES, :unless => :new_record?
@@ -80,9 +88,9 @@ module Xeroizer
       validates_associated :contact
       validates_associated :line_items, :allow_blanks => true, :unless => :approved?
       validates_associated :line_items, :if => :approved?
-      
+
       public
-      
+
         # Access the contact name without forcing a download of
         # an incomplete, summary invoice.
         def contact_name
@@ -94,12 +102,12 @@ module Xeroizer
         def contact_id
           attributes[:contact] && attributes[:contact][:contact_id]
         end
-        
+
         # Helper method to check if the invoice has been approved.
         def approved?
           [ 'AUTHORISED', 'PAID', 'VOIDED' ].include? status
         end
-        
+
         # Helper method to check if the invoice is accounts payable.
         def accounts_payable?
           type == 'ACCPAY'
@@ -109,12 +117,12 @@ module Xeroizer
         def accounts_receivable?
           type == 'ACCREC'
         end
-        
+
         def sub_total=(sub_total)
           @sub_total_is_set = true
           attributes[:sub_total] = sub_total
         end
-        
+
         def total_tax=(total_tax)
           @total_tax_is_set = true
           attributes[:total_tax] = total_tax
@@ -129,9 +137,9 @@ module Xeroizer
         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 }
-            
+
             # 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 -= total_tax if line_amount_types == 'Inclusive'
             sum
           else
             attributes[:sub_total]
@@ -155,16 +163,16 @@ module Xeroizer
             attributes[:total]
           end
         end
-        
+
         def not_summary_or_loaded_record(always_summary)
           !always_summary && loaded_record?
         end
 
         def loaded_record?
-          new_record? || 
+          new_record? ||
             (!new_record? && line_items && line_items.size > 0)
         end
-          
+
         # Retrieve the PDF version of this invoice.
         # @param [String] filename optional filename to store the PDF in instead of returning the data.
         def pdf(filename = nil)
@@ -173,23 +181,28 @@ module Xeroizer
 
         # Delete an approved invoice with no payments.
         def delete!
-          delete_or_void_invoice!('DELETED')
+          change_status!('DELETED')
         end
 
         # Void an approved invoice with no payments.
         def void!
-          delete_or_void_invoice!('VOIDED')
+          change_status!('VOIDED')
+        end
+
+        # Approve a draft invoice
+        def approve!
+          change_status!('AUTHORISED')
         end
 
       protected
 
-        def delete_or_void_invoice!(new_status)
-          raise CannotChangeInvoiceStatus.new(record, new_status) unless self.payments.size == 0
+        def change_status!(new_status)
+          raise CannotChangeInvoiceStatus.new(self, new_status) unless self.payments.size == 0
           self.status = new_status
           self.save
         end
-      
+
     end
-    
+
   end
 end

data/lib/xeroizer/models/line_item.rb

@@ -18,6 +18,7 @@ module Xeroizer
       string  :tax_type
       decimal :tax_amount
       decimal :line_amount, :calculated => true
+      decimal :discount_rate
       
       has_many  :tracking, :model_name => 'TrackingCategoryChild'
       

data/lib/xeroizer/models/organisation.rb

@@ -13,6 +13,7 @@ module Xeroizer
       string    :api_key, :api_name => 'APIKey'
       string    :name
       string    :legal_name
+      string    :short_code
       boolean   :pays_tax
       string    :version
       string    :organisation_type
@@ -26,9 +27,13 @@ module Xeroizer
       date      :end_of_year_lock_date
       string    :tax_number
       string    :registration_number
+      string    :timezone
       datetime  :created_date_utc, :api_name => 'CreatedDateUTC'
 
+      has_many :addresses
+      has_many :phones
+
     end
     
   end
-end
+end

data/lib/xeroizer/models/payment.rb

@@ -1,17 +1,17 @@
 module Xeroizer
   module Record
-    
+
     class PaymentModel < BaseModel
-        
+
       set_xml_root_name 'Payments'
       set_permissions :read, :write
-      
+
     end
-    
+
     class Payment < Base
-      
+
       set_primary_key :payment_id
-      
+
       guid          :payment_id
       date          :date
       decimal       :amount
@@ -23,20 +23,25 @@ module Xeroizer
 
       belongs_to    :account
       belongs_to    :invoice
-      
+      belongs_to    :credit_note
+
       def invoice_id
         invoice.id if invoice
       end
-      
+
+      def credit_note_id
+        credit_note.id if credit_note
+      end
+
       def account_id
         account.id if account
       end
-      
+
       def account_code
         account.code if account
       end
-      
+
     end
-    
+
   end
 end

data/lib/xeroizer/models/receipt.rb

@@ -0,0 +1,39 @@
+module Xeroizer
+  module Record
+    
+    class ReceiptModel < BaseModel
+        
+      set_permissions :read, :write, :update
+      
+      include AttachmentModel::Extensions
+
+    end
+    
+    class Receipt < Base
+      
+      include Attachment::Extensions
+      
+      set_primary_key :receipt_id
+      set_possible_primary_keys :receipt_id, :receipt_number
+
+      guid          :receipt_id
+      string        :receipt_number
+      string        :reference
+      string        :status
+      string        :line_amount_types
+      decimal       :sub_total, :calculated => true
+      decimal       :total_tax, :calculated => true
+      decimal       :total, :calculated => true
+      date          :date
+      string        :url
+      boolean       :has_attachments
+      datetime_utc  :updated_date_utc, :api_name => 'UpdatedDateUTC'
+      
+      belongs_to    :user
+      belongs_to    :contact
+      has_many      :line_items
+
+    end
+    
+  end
+end