quickeebooks 0.1.22 → 0.1.23

data/lib/quickeebooks/online/model/sales_receipt_line_item.rb

@@ -1,5 +1,5 @@
-module Quickeebooks 
-  module Online 
+module Quickeebooks
+  module Online
     module Model
       class SalesReceiptLineItem < Quickeebooks::Online::Model::IntuitType
         xml_name 'Line'

data/lib/quickeebooks/online/model/time_activity.rb

@@ -37,6 +37,8 @@ module Quickeebooks
         xml_accessor :description, :from => 'Description'
 
         validates_inclusion_of :name_of, :in => %w(Employee Vendor)
+        validate :has_vendor_node, :if => Proc.new { |c| c.name_of == 'Vendor' }
+        validate :has_employee_node, :if => Proc.new { |c| c.name_of == 'Employee' }
         validates_presence_of :customer_id, :if => Proc.new { |c| c.billable_status == 'Billable' }
         validates_presence_of :hourly_rate, :if => Proc.new { |c| c.billable_status == 'Billable' }
         validates_inclusion_of :billable_status, :in => %w(Billable NotBillable HasBeenBilled),
@@ -52,6 +54,17 @@ module Quickeebooks
           end
         end
 
+        def has_vendor_node
+          unless self.vendor.is_a?(Quickeebooks::Online::Model::TimeActivityVendor)
+            errors.add(:vendor, "can't be blank")
+          end
+        end
+
+        def has_employee_node
+          unless self.vendor.is_a?(Quickeebooks::Online::Model::TimeActivityEmployee)
+            errors.add(:employee, "can't be blank")
+          end
+        end
 
         def self.resource_for_collection
           'time-activities'

data/lib/quickeebooks/online/model/time_activity_employee.rb

@@ -9,4 +9,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/model/time_activity_vendor.rb

@@ -9,4 +9,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/model/tracking_class.rb

@@ -40,4 +40,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/model/unit_price.rb

@@ -8,4 +8,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/model/web_site.rb

@@ -9,7 +9,7 @@ module Quickeebooks
         def initialize(uri = nil)
           self.uri = uri if uri
         end
-        
+
         def to_xml(options = {})
           return "" if uri.to_s.empty?
           super(options)
@@ -18,4 +18,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/account.rb

@@ -9,4 +9,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/clazz.rb

@@ -9,4 +9,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/employee.rb

@@ -10,4 +10,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/entitlement.rb

@@ -12,4 +12,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/item.rb

@@ -9,4 +9,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/pagination.rb

@@ -16,4 +16,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/payment_method.rb

@@ -9,4 +9,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/sort.rb

@@ -5,4 +5,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/online/service/tracking_class.rb

@@ -10,4 +10,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/shared/service/filter.rb

@@ -73,7 +73,7 @@ module Quickeebooks
           end
           clauses.join(" :AND: ")
         end
-        
+
         def date_to_s
           clauses = []
           if @before
@@ -129,7 +129,7 @@ module Quickeebooks
         def number_to_xml
           "<#{@field}>#{CGI::escapeHTML(@value.to_s)}</#{@field}>"
         end
-        
+
         def date_to_xml
           "<#{@field}>#{formatted_date(@value)}</#{@field}>"
         end
@@ -137,7 +137,7 @@ module Quickeebooks
         def datetime_to_xml
           "<#{@field}>#{formatted_datetime(@value)}</#{@field}>"
         end
-        
+
         def formatted_date(date)
           date.strftime(DATE_FORMAT)
         end
@@ -145,7 +145,7 @@ module Quickeebooks
         def formatted_datetime(datetime)
           datetime.strftime(DATE_TIME_FORMAT)
         end
-        
+
         def valid_datetime?(value)
           value.respond_to?(:strftime)
         end

data/lib/quickeebooks/shared/service/operation_node.rb

@@ -3,13 +3,13 @@ require 'securerandom'
 module Quickeebooks
   module Shared
     module Service
-      
+
       class OperationNode
-        
+
         def add(&block)
           node("Add", &block)
         end
-        
+
         def mod(&block)
           node("Mod", &block)
         end
@@ -17,9 +17,9 @@ module Quickeebooks
         def guid
           SecureRandom.hex(16)
         end
-        
+
         private
-        
+
         def node(type, &block)
           content = %Q{<#{type} xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"}
           content << %Q{ RequestId="#{guid}" xmlns="http://www.intuit.com/sb/cdm/v2">}
@@ -27,9 +27,9 @@ module Quickeebooks
           content << "</#{type}>"
           content
         end
-        
+
       end
-      
+
     end
   end
-end
+end

data/lib/quickeebooks/shared/service/sort.rb

@@ -19,4 +19,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/version.rb

@@ -1,5 +1,5 @@
 module Quickeebooks
 
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 
 end

data/lib/quickeebooks/windows/model/account.rb

@@ -7,15 +7,15 @@ module Quickeebooks
     module Model
       class Account < Quickeebooks::Windows::Model::IntuitType
         include ActiveModel::Validations
-        
+
         XML_COLLECTION_NODE = 'Accounts'
         XML_NODE = 'Account'
-        
+
         # https://services.intuit.com/sb/account/v2/<realmID>
         REST_RESOURCE = "account"
-        
+
         xml_convention :camelcase
-        xml_accessor :id, :from => 'Id'
+        xml_accessor :id, :from => 'Id', :as => Quickeebooks::Windows::Model::Id
         xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
         xml_accessor :meta_data, :from => 'MetaData', :as => Quickeebooks::Windows::Model::MetaData
         xml_accessor :external_key, :from => 'ExternalKey'
@@ -55,9 +55,9 @@ module Quickeebooks
           return false if(id.nil? || sync_token.nil?)
           id.to_i > 0 && !sync_token.to_s.empty? && sync_token.to_i >= 0
         end
-        
+
         private
-        
+
         def ensure_name_is_valid
           if name.nil?
             errors.add(:name, "Missing required attribute: name")
@@ -71,4 +71,4 @@ module Quickeebooks
 
     end
   end
-end
+end

data/lib/quickeebooks/windows/model/account_reference.rb

@@ -4,7 +4,7 @@ module Quickeebooks
   module Windows
     module Model
       class AccountReference < Quickeebooks::Windows::Model::IntuitType
-        xml_accessor :account_id, :from => 'AccountId'
+        xml_accessor :account_id, :from => 'AccountId', :as => Quickeebooks::Windows::Model::Id
         xml_accessor :account_name, :from => 'AccountName'
         xml_accessor :account_type, :from => 'AccountType'
 
@@ -20,4 +20,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/windows/model/address.rb

@@ -25,15 +25,15 @@ module Quickeebooks
         def to_xml_ns
           to_xml
         end
-        
+
         def default?
           default == "true"
         end
-        
+
         def state
           country_sub_division_code
         end
-        
+
         def state=(new_state)
           self.country_sub_division_code = new_state
         end
@@ -41,4 +41,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/windows/model/clazz.rb

@@ -12,10 +12,10 @@ module Quickeebooks
 
         XML_COLLECTION_NODE = 'Classes'
         XML_NODE = 'Class'
-        
+
         # https://services.intuit.com/sb/customer/v2/<realmID>
         REST_RESOURCE = "class"
-        
+
         xml_convention :camelcase
         xml_accessor :id, :from => 'Id', :as => Quickeebooks::Windows::Model::Id
         xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
@@ -28,20 +28,20 @@ module Quickeebooks
         xml_accessor :active
         xml_accessor :class_parent_id, :from => 'ClassParentId', :as => Quickeebooks::Windows::Model::Id
         xml_accessor :class_parent_name, :from => 'ClassParentName'
-        
+
         validates_length_of :name, :minimum => 1, :maximum => 256
-        
+
         def active?
           active == 'true'
         end
-        
+
         def valid_for_update?
           if sync_token.nil?
             errors.add(:sync_token, "Missing required attribute SyncToken for update")
           end
           errors.empty?
         end
-        
+
         def valid_for_create?
           valid?
           if type_of.nil?

data/lib/quickeebooks/windows/model/company_meta_data.rb

@@ -12,7 +12,7 @@ module Quickeebooks
 
         XML_COLLECTION_NODE = 'CompaniesMetaData'
         XML_NODE = 'CompanyMetaData'
-        
+
         REST_RESOURCE = "company"
 
         xml_convention :camelcase

data/lib/quickeebooks/windows/model/custom_field.rb

@@ -10,4 +10,4 @@ module Quickeebooks
       end
     end
   end
-end
+end

data/lib/quickeebooks/windows/model/customer.rb

@@ -18,10 +18,10 @@ module Quickeebooks
         DEFAULT_TYPE_OF = 'Person'
         XML_COLLECTION_NODE = 'Customers'
         XML_NODE = 'Customer'
-        
+
         # https://services.intuit.com/sb/customer/v2/<realmID>
         REST_RESOURCE = "customer"
-        
+
         xml_convention :camelcase
         xml_accessor :id, :from => 'Id', :as => Quickeebooks::Windows::Model::Id
         xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
@@ -77,18 +77,18 @@ module Quickeebooks
         validate :require_an_address
         validate :name_cannot_contain_invalid_characters
         validate :email_address_is_valid
-        
+
         def active?
           active == 'true'
         end
-        
+
         def valid_for_update?
           if sync_token.nil?
             errors.add(:sync_token, "Missing required attribute SyncToken for update")
           end
           errors.empty?
         end
-        
+
         def valid_for_create?
           valid?
           if type_of.nil?
@@ -104,20 +104,20 @@ module Quickeebooks
         def email_address=(email_address)
           self.email = Quickeebooks::Windows::Model::Email.new(email_address)
         end
-        
+
 
         # To delete an account Intuit requires we provide Id and SyncToken fields
         def valid_for_deletion?
           return false if(id.nil? || sync_token.nil?)
           id.to_i > 0 && !sync_token.to_s.empty? && sync_token.to_i >= 0
         end
-        
+
         def name_cannot_contain_invalid_characters
           if name.to_s.index(':')
             errors.add(:name, "Name cannot contain a colon (:)")
           end
         end
-        
+
         def email_address_is_valid
           if email
             address = email.address
@@ -126,7 +126,7 @@ module Quickeebooks
             end
           end
         end
-        
+
         def require_an_address
           if addresses.nil? || (addresses.is_a?(Array) && addresses.empty?)
             errors.add(:addresses, "Must provide at least one address for this Customer.")

data/lib/quickeebooks/windows/model/customer_msg.rb

@@ -11,10 +11,10 @@ module Quickeebooks
 
         XML_COLLECTION_NODE = 'CustomerMsgs'
         XML_NODE = 'CustomerMsg'
-        
+
         # https://services.intuit.com/sb/customermsg/v2/<realmID>
         REST_RESOURCE = "customermsg"
-        
+
         xml_convention :camelcase
         xml_accessor :id, :as => Quickeebooks::Windows::Model::Id
         xml_accessor :sync_token
@@ -28,4 +28,4 @@ module Quickeebooks
       end
     end
   end
-end
+end