quickeebooks 0.1.5 → 0.1.6

data/lib/quickeebooks.rb

@@ -76,6 +76,9 @@ require 'quickeebooks/shared/service/access_token'
 require 'quickeebooks/shared/service/sort'
 require 'quickeebooks/shared/service/operation_node'
 
+#== Model
+require 'quickeebooks/common/addressable'
+
 #== Online
 
 # Models

data/lib/quickeebooks/common/addressable.rb

@@ -0,0 +1,66 @@
+module Quickeebooks
+  module Model
+    module Addressable
+
+      def self.included(base)
+        base.send :include, InstanceMethods
+        base.extend ClassMethods
+      end
+      
+      module ClassMethods
+      end
+      
+      module InstanceMethods
+        def phone=(phone)
+          self.phones ||= []
+          self.phones << phone
+        end
+
+        def address=(address)
+          self.addresses ||= []
+          self.addresses << address
+        end
+
+        def billing_address
+          select_address("Billing")
+        end
+
+        def shipping_address
+          select_address("Shipping")
+        end
+
+        def primary_phone
+          select_phone("Primary")
+        end
+
+        def secondary_phone
+          select_phone("Secondary")
+        end
+
+        def mobile_phone
+          select_phone("Mobile")
+        end
+
+        def fax
+          select_phone("Fax")
+        end
+
+        def pager
+          select_phone("Pager")
+        end
+
+        private
+
+        def select_phone(type)
+          phones.detect { |phone| phone.device_type == type }
+        end
+
+        def select_address(tag)
+          addresses.detect { |address| address.tag == tag }
+        end
+        
+      end # InstanceMethods
+
+    end
+  end
+end

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

@@ -16,6 +16,8 @@ module Quickeebooks
       class Customer < Quickeebooks::Online::Model::IntuitType
         include ActiveModel::Validations
         include OnlineEntityModel
+        include Quickeebooks::Model::Addressable
+
         XML_NODE = "Customer"
         REST_RESOURCE = "customer"
 

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

@@ -23,8 +23,6 @@ module Quickeebooks
         xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
         xml_accessor :meta_data, :from => 'MetaData', :as => Quickeebooks::Online::Model::MetaData
         xml_accessor :header, :from => 'Header', :as => Quickeebooks::Online::Model::InvoiceHeader
-        xml_accessor :bill_address, :from => 'BillAddr', :as => Quickeebooks::Online::Model::Address
-        xml_accessor :ship_address, :from => 'ShipAddr', :as => Quickeebooks::Online::Model::Address
         xml_accessor :bill_email, :from => 'BillEmail'
         xml_accessor :ship_method_id, :from => 'ShipMethodId', :as => Quickeebooks::Online::Model::Id
         xml_accessor :ship_method_name, :from => 'ShipMethodName'

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

@@ -11,21 +11,33 @@ module Quickeebooks
         xml_accessor :doc_number, :from => 'DocNumber'
         xml_accessor :txn_date, :from => 'TxnDate', :as => Time
         xml_accessor :msg, :from => 'Msg'
+        xml_accessor :note, :from => 'Note'
+        xml_accessor :status, :from => 'Status'
         xml_accessor :customer_id, :from => 'CustomerId', :as => Quickeebooks::Online::Model::Id
         xml_accessor :customer_name, :from => 'CustomerName'
+        xml_accessor :class_id, :from => 'ClassId', :as => Quickeebooks::Online::Model::Id
         xml_accessor :sales_tax_code_id, :from => 'SalesTaxCodeId', :as => Quickeebooks::Online::Model::Id
         xml_accessor :sales_tax_code_name, :from => 'SalesTaxCodeName'
+        xml_accessor :ship_date, :from => 'ShipDate', :as => Time
         xml_accessor :sub_total_amount, :from => 'SubTotalAmt', :as => Float
         xml_accessor :tax_rate, :from => 'TaxRate', :as => Float
         xml_accessor :tax_amount, :from => 'TaxAmt', :as => Float
-        xml_accessor :balance, :from => 'Balance', :as => Float
         xml_accessor :total_amount, :from => 'TotalAmt', :as => Float
+        xml_accessor :to_be_emailed, :from => 'ToBeEmailed'
+        xml_accessor :to_be_printed, :from => 'ToBePrinted'
+        xml_accessor :sales_term_id, :from => 'SalesTermId', :as => Quickeebooks::Online::Model::Id
         xml_accessor :due_date, :from => 'DueDate', :as => Time
+        xml_accessor :billing_address, :from => 'BillAddr', :as => Quickeebooks::Online::Model::Address
+        xml_accessor :shipping_address, :from => 'ShipAddr', :as => Quickeebooks::Online::Model::Address
         xml_accessor :bill_email, :from => 'BillEmail'
+        xml_accessor :ship_method_id, :from => 'ShipMethodId', :as => Quickeebooks::Online::Model::Id
+        xml_accessor :ship_method_name, :from => 'ShipMethodName'
+        xml_accessor :balance, :from => 'Balance', :as => Float
         xml_accessor :discount_amount, :from => 'DiscountAmt', :as => Float
-        xml_accessor :status, :from => 'Status'
-        xml_accessor :ship_date, :from => 'ShipDate', :as => Time
-        xml_accessor :to_be_emailed, :from => 'ToBeEmailed'
+        xml_accessor :discount_rate, :from => 'DiscountRate', :as => Float
+        xml_accessor :discount_taxable, :from => 'DiscountTaxable'
+        xml_accessor :txn_id, :from => 'TxnId', :as => Quickeebooks::Online::Model::Id
+        
       end
     end
   end

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

@@ -14,7 +14,8 @@ module Quickeebooks
       class Vendor < Quickeebooks::Online::Model::IntuitType
         include ActiveModel::Validations
         include OnlineEntityModel
-        
+        include Quickeebooks::Model::Addressable
+
         XML_NODE = "Vendor"
         REST_RESOURCE = "vendor"
 

data/lib/quickeebooks/version.rb

@@ -1,5 +1,5 @@
 module Quickeebooks
 
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 
 end

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

@@ -13,6 +13,7 @@ module Quickeebooks
     module Model
       class Customer < Quickeebooks::Windows::Model::IntuitType
         include ActiveModel::Validations
+        include Quickeebooks::Model::Addressable
 
         DEFAULT_TYPE_OF = 'Person'
         XML_COLLECTION_NODE = 'Customers'
@@ -81,14 +82,6 @@ module Quickeebooks
           active == 'true'
         end
         
-        def billing_address
-          addresses.detect { |address| address.tag == "Billing" }
-        end
-
-        def shipping_address
-          addresses.detect { |address| address.tag == "Shipping" }
-        end
-        
         def valid_for_update?
           if sync_token.nil?
             errors.add(:sync_token, "Missing required attribute SyncToken for update")
@@ -112,10 +105,6 @@ module Quickeebooks
           self.email = Quickeebooks::Windows::Model::Email.new(email_address)
         end
         
-        def address=(address)
-          self.addresses ||= []
-          self.addresses << address
-        end
 
         # To delete an account Intuit requires we provide Id and SyncToken fields
         def valid_for_deletion?

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

@@ -5,6 +5,7 @@ module Quickeebooks
   module Windows
     module Model
       class Vendor < Quickeebooks::Windows::Model::IntuitType
+        include Quickeebooks::Model::Addressable
         
         xml_convention :camelcase
         xml_accessor :vendor_id, :from => 'VendorId', :as => Quickeebooks::Windows::Model::VendorId

data/spec/quickeebooks/online/customer_spec.rb

@@ -10,10 +10,15 @@ describe "Quickeebooks::Online::Model::Customer" do
     customer.meta_data.create_time.year.should == create_time.year
     customer.addresses.count.should == 2
 
-    customer.addresses.first.line1.should == "123 Main St."
+    customer.billing_address.line1.should == "123 Main St."
+    customer.shipping_address.line1.should == "123 Shipping St."
 
-    customer.phones.size.should == 2
-    customer.phones.first.free_form_number.should == "(408) 555-1212"
+    customer.phones.size.should == 5
+    customer.primary_phone.free_form_number.should == "(408) 555-1212"
+    customer.secondary_phone.free_form_number.should == "(408) 555-1213"
+    customer.mobile_phone.free_form_number.should == "(408) 555-1214"
+    customer.fax.free_form_number.should == "(408) 555-1215"
+    customer.pager.free_form_number.should == "(408) 555-1216"
 
     customer.email.address.should == "johndoe@gmail.com"
 
@@ -40,4 +45,4 @@ describe "Quickeebooks::Online::Model::Customer" do
     customer.errors.keys.include?(:sync_token).should == true
   end
 
-end
+end

data/spec/xml/online/customer.xml

@@ -17,7 +17,7 @@
     <Tag>Billing</Tag>
   </Address>
   <Address>
-    <Line1>123 Main St.</Line1>
+    <Line1>123 Shipping St.</Line1>
     <Line2>Suite 400</Line2>
     <City>San Diego</City>
     <Country>USA</Country>
@@ -29,9 +29,21 @@
     <DeviceType>Primary</DeviceType>
     <FreeFormNumber>(408) 555-1212</FreeFormNumber>
   </Phone>
+  <Phone>
+    <DeviceType>Secondary</DeviceType>
+    <FreeFormNumber>(408) 555-1213</FreeFormNumber>
+  </Phone>
   <Phone>
     <DeviceType>Mobile</DeviceType>
-    <FreeFormNumber>(831) 334-0987</FreeFormNumber>
+    <FreeFormNumber>(408) 555-1214</FreeFormNumber>
+  </Phone>
+  <Phone>
+    <DeviceType>Fax</DeviceType>
+    <FreeFormNumber>(408) 555-1215</FreeFormNumber>
+  </Phone>
+  <Phone>
+    <DeviceType>Pager</DeviceType>
+    <FreeFormNumber>(408) 555-1216</FreeFormNumber>
   </Phone>
   <WebSite>
     <URI>http://blah.com</URI>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quickeebooks
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roxml
@@ -221,6 +221,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - HISTORY.md
+- lib/quickeebooks/common/addressable.rb
 - lib/quickeebooks/common/date_time.rb
 - lib/quickeebooks/common/logging.rb
 - lib/quickeebooks/common/online_entity_model.rb
@@ -363,7 +364,6 @@ files:
 - lib/quickeebooks/windows/service/time_activity.rb
 - lib/quickeebooks.rb
 - MIT-LICENSE
-- quickeebooks-0.1.4.gem
 - quickeebooks.gemspec
 - Rakefile
 - README.md