quickbooks-ruby 0.1.2 → 0.1.3

data/lib/quickbooks/model/item_based_expense_line_detail.rb

@@ -3,11 +3,11 @@ module Quickbooks
     class ItemBasedExpenseLineDetail < BaseModel
       xml_accessor :item_ref, :from => 'ItemRef', :as => BaseReference
       xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
-      xml_accessor :unit_price, :from => 'UnitPrice', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
-      xml_accessor :rate_percent, :from => 'RatePercent', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :unit_price, :from => 'UnitPrice', :as => BigDecimal, :to_xml => to_xml_big_decimal
+      xml_accessor :rate_percent, :from => 'RatePercent', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :price_level_ref, :from => 'PriceLevelRef', :as => BaseReference
       xml_accessor :markup_info, :from => 'MarkupInfo', :as => MarkupInfo
-      xml_accessor :quantity, :from => 'Qty', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :quantity, :from => 'Qty', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference
       xml_accessor :customer_ref, :from => 'CustomerRef', :as => BaseReference
       xml_accessor :billable_status, :from => 'BillableStatus'

data/lib/quickbooks/model/line.rb

@@ -10,7 +10,7 @@ module Quickbooks
       xml_accessor :id, :from => 'Id', :as => Integer
       xml_accessor :line_num, :from => 'LineNum', :as => Integer
       xml_accessor :description, :from => 'Description'
-      xml_accessor :amount, :from => 'Amount', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :amount, :from => 'Amount', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :detail_type, :from => 'DetailType'
       xml_accessor :linked_transactions, :from => 'LinkedTxn', :as => [LinkedTransaction]
 

data/lib/quickbooks/model/markup_info.rb

@@ -2,8 +2,8 @@ module Quickbooks
   module Model
     class MarkupInfo < BaseModel
       xml_accessor :percent_based, :from => 'PercentBased'
-      xml_accessor :value, :from => 'Value', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
-      xml_accessor :percent, :from => 'Percent', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :value, :from => 'Value', :as => BigDecimal, :to_xml => to_xml_big_decimal
+      xml_accessor :percent, :from => 'Percent', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :price_level_ref, :from => 'PriceLevelRef', :as => BaseReference
 
       reference_setters :price_level_ref

data/lib/quickbooks/model/payment.rb

@@ -19,10 +19,10 @@ module Quickbooks
       xml_accessor :payment_ref_number, :from => 'PaymentRefNum'
       xml_accessor :credit_card_payment, :from => 'CreditCardPayment', :as => CreditCardPayment
       xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal, :to_xml => :to_f.to_proc
-      xml_accessor :unapplied_amount, :from => 'UnappliedAmt', :as => BigDecimal, :to_xml => :to_f.to_proc
+      xml_accessor :unapplied_amount, :from => 'UnappliedAmt', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :process_payment, :from => 'ProcessPayment'
       xml_accessor :currency_ref, :from => 'CurrencyRef', :as => BaseReference
-      xml_accessor :exchange_rate, :from => 'ExchangeRate', :as => BigDecimal, :to_xml => :to_f.to_proc
+      xml_accessor :exchange_rate, :from => 'ExchangeRate', :as => BigDecimal, :to_xml => to_xml_big_decimal
 
       reference_setters :customer_ref, :ar_account_ref
       reference_setters :payment_method_ref, :deposit_to_account_ref, :currency_ref

data/lib/quickbooks/model/payment_line_detail.rb

@@ -3,10 +3,10 @@ module Quickbooks
     class PaymentLineDetail < BaseModel
       xml_accessor :item_ref, :from => 'ItemRef', :as => BaseReference
       xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
-      xml_accessor :balance, :from => 'Balance', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :balance, :from => 'Balance', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :discount, :from => 'Discount', :as => DiscountOverride
 
       reference_setters :item_ref, :class_ref
     end
   end
-end
+end

data/lib/quickbooks/model/payment_method.rb

@@ -8,7 +8,7 @@ module Quickbooks
       xml_accessor :id, :from => 'Id', :as => Integer
       xml_accessor :name, :from => 'Name'
       xml_accessor :active?, :from => 'Active'
-      xml_accessor :amount, :from => 'Amount', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :amount, :from => 'Amount', :as => BigDecimal, :to_xml => to_xml_big_decimal
     end
   end
 end

data/lib/quickbooks/model/purchase.rb

@@ -24,7 +24,7 @@ module Quickbooks
       xml_accessor :doc_number, :from => 'DocNumber'
       xml_accessor :txn_date, :from => 'TxnDate', :as => Date
       xml_accessor :private_note, :from => 'PrivateNote'
-    
+
       xml_accessor :line_items, :from => 'Line', :as => [PurchaseLineItem]
       xml_accessor :account_ref, :from => 'AccountRef', :as => BaseReference
       xml_accessor :txn_tax_detail, :from => 'TxnTaxDetail', :as => TransactionTaxDetail
@@ -32,7 +32,7 @@ module Quickbooks
       xml_accessor :payment_type, :from => 'PaymentType'
       xml_accessor :entity_ref, :from => 'EntityRef', :as => BaseReference
       xml_accessor :remit_to_address, :from => 'RemitToAddr', :as => PhysicalAddress
-      xml_accessor :total_amount, :from => 'TotalAmt', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :total_amount, :from => 'TotalAmt', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :print_status, :from => 'PrintStatus'
       xml_accessor :department_ref, :from => 'DepartmentRef', :as => BaseReference
 

data/lib/quickbooks/model/sales_item_line_detail.rb

@@ -4,7 +4,7 @@ module Quickbooks
       xml_accessor :item_ref, :from => 'ItemRef', :as => BaseReference
       xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
       xml_accessor :unit_price, :from => 'UnitPrice', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
-      xml_accessor :rate_percent, :from => 'RatePercent', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :rate_percent, :from => 'RatePercent', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :price_level_ref, :from => 'PriceLevelRef', :as => BaseReference
       xml_accessor :quantity, :from => 'Qty', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
       xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference

data/lib/quickbooks/model/sales_receipt.rb

@@ -8,35 +8,37 @@ module Quickbooks
       xml_accessor :id, :from => 'Id', :as => Integer
       xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
       xml_accessor :meta_data, :from => 'MetaData', :as => MetaData
+      xml_accessor :auto_doc_number, :from => 'AutoDocNumber' # See auto_doc_number! method below for usage
       xml_accessor :doc_number, :from => 'DocNumber'
       xml_accessor :placed_on, :from => 'TxnDate', :as => Time
-
       xml_accessor :line_items, :from => 'Line', :as => [Line]
       xml_accessor :customer_ref, :from => 'CustomerRef', :as => BaseReference
       xml_accessor :bill_email, :from => 'BillEmail', :as => EmailAddress
       xml_accessor :bill_address, :from => 'BillAddr', :as => PhysicalAddress
       xml_accessor :ship_address, :from => 'ShipAddr', :as => PhysicalAddress
-
       xml_accessor :po_number, :from => 'PONumber'
-
       xml_accessor :ship_method_ref, :from => 'ShipMethodRef'
       xml_accessor :ship_date, :from => 'ShipDate', :as => Time
       xml_accessor :tracking_num, :from => 'TrackingNum'
-
       xml_accessor :payment_method_ref, :from => 'PaymentMethodRef', :as => BaseReference
       xml_accessor :payment_ref_number, :from => 'PaymentRefNum'
-
       xml_accessor :deposit_to_account_ref, :from => 'DepositToAccountRef', :as => BaseReference
-
       xml_accessor :customer_memo, :from => 'CustomerMemo'
       xml_accessor :private_note, :from => 'PrivateNote'
 
       # readonly
       xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal
 
+      include DocumentNumbering
       reference_setters :customer_ref, :payment_method_ref, :deposit_to_account_ref
 
       validates_length_of :line_items, :minimum => 1
+      validate :document_numbering
+
+      def initialize(*args)
+        ensure_line_items_initialization
+        super
+      end
 
       def email=(email)
         self.bill_email = EmailAddress.new(email)

data/lib/quickbooks/model/tax_code.rb

@@ -10,22 +10,11 @@ module Quickbooks
       xml_accessor :meta_data, :from => "MetaData", :as => MetaData
       xml_accessor :name, :from => "Name"
       xml_accessor :description, :from => "Description"
-      xml_accessor :active, :from => "Active"
-      xml_accessor :taxable, :from => "Taxable"
-      xml_accessor :tax_group, :from => "TaxGroup"
+      xml_accessor :active?, :from => "Active"
+      xml_accessor :taxable?, :from => "Taxable"
+      xml_accessor :tax_group?, :from => "TaxGroup"
       xml_accessor :sales_tax_rate_list, :from => "SalesTaxRateList", :as => SalesTaxRateList
 
-      def active?
-        active == "true"
-      end
-
-      def taxable?
-        taxable == "true"
-      end
-
-      def tax_group?
-        tax_group == "true"
-      end
     end
   end
 end

data/lib/quickbooks/model/tax_line_detail.rb

@@ -2,7 +2,7 @@ module Quickbooks
   module Model
     class TaxLineDetail < BaseModel
 
-      xml_accessor :percent_based, :from => 'PercentBased'
+      xml_accessor :percent_based?, :from => 'PercentBased'
       xml_accessor :net_amount_taxable, :from => 'NetAmountTaxable', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
       xml_accessor :tax_inclusive_amount, :from => 'TaxInclusiveAmount', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
       xml_accessor :override_delta_amount, :from => 'OverrideDeltaAmount', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
@@ -13,4 +13,4 @@ module Quickbooks
       
     end
   end
-end
+end

data/lib/quickbooks/model/tax_rate.rb

@@ -10,7 +10,7 @@ module Quickbooks
       xml_accessor :meta_data, :from => "MetaData", :as => MetaData
       xml_accessor :name, :from => "Name"
       xml_accessor :description, :from => "Description"
-      xml_accessor :active, :from => "Active"
+      xml_accessor :active?, :from => "Active"
       xml_accessor :rate_value, :from => "RateValue", :as => BigDecimal, :to_xml => :to_f.to_proc
       xml_accessor :agency_ref, :from => "AgencyRef", :as => BaseReference
       xml_accessor :tax_return_line_ref, :from => "TaxReturnLineRef", :as => BaseReference
@@ -23,9 +23,6 @@ module Quickbooks
       reference_setters :agency_ref
       reference_setters :tax_return_line_ref
 
-      def active?
-        active == "true"
-      end
     end
   end
 end

data/lib/quickbooks/model/transaction_tax_detail.rb

@@ -3,7 +3,7 @@ module Quickbooks
     class TransactionTaxDetail < BaseModel
 
       xml_accessor :txn_tax_code_ref, :from => 'TxnTaxCodeRef', :as => BaseReference
-      xml_accessor :total_tax, :from => 'TotalTax', :as => BigDecimal, :to_xml => :to_f.to_proc
+      xml_accessor :total_tax, :from => 'TotalTax', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :lines, :from => 'TaxLine', :as => [TaxLine]
 
       reference_setters :txn_tax_code_ref

data/lib/quickbooks/service/account.rb

@@ -9,10 +9,6 @@ module Quickbooks
 
       private
 
-      def default_model_query
-        "SELECT * FROM ACCOUNT"
-      end
-
       def model
         Quickbooks::Model::Account
       end

data/lib/quickbooks/service/base_service.rb

@@ -15,8 +15,9 @@ module Quickbooks
       HTTP_ACCEPT = 'application/xml'
       HTTP_ACCEPT_ENCODING = 'gzip, deflate'
 
-      def initialize()
+      def initialize(attributes = {})
         @base_uri = 'https://qb.sbfinance.intuit.com/v3/company'
+        attributes.each {|key, value| public_send("#{key}=", value) }
       end
 
       def access_token=(token)
@@ -40,6 +41,10 @@ module Quickbooks
         "#{@base_uri}/#{@company_id}"
       end
 
+      def default_model_query
+        "SELECT * FROM #{self.class.name.split("::").last}"
+      end
+
       def url_for_query(query = nil, start_position = 1, max_results = 20)
         query ||= default_model_query
         query = "#{query} STARTPOSITION #{start_position} MAXRESULTS #{max_results}"
@@ -194,11 +199,12 @@ module Quickbooks
           headers['Accept-Encoding'] = HTTP_ACCEPT_ENCODING
         end
 
-        log "------ New Request ------"
+        log "------ QUICKBOOKS-RUBY REQUEST ------"
         log "METHOD = #{method}"
         log "RESOURCE = #{url}"
-        log "BODY(#{body.class}) = #{body == nil ? "<NIL>" : body.inspect}"
-        log "HEADERS = #{headers.inspect}"
+        log "REQUEST BODY:"
+        log(log_xml(body))
+        log "REQUEST HEADERS = #{headers.inspect}"
 
         response = case method
           when :get
@@ -208,7 +214,7 @@ module Quickbooks
           else
             raise "Do not know how to perform that HTTP operation"
           end
-        check_response(response)
+        check_response(response, :request_xml => body)
       end
 
       def add_query_string_to_url(url, params)
@@ -219,25 +225,27 @@ module Quickbooks
         end
       end
 
-      def check_response(response)
+      def check_response(response, options = {})
+        log "------ QUICKBOOKS-RUBY RESPONSE ------"
         log "RESPONSE CODE = #{response.code}"
-        log "RESPONSE BODY = #{response.plain_body}"
+        log "RESPONSE BODY:"
+        log(log_xml(response.plain_body))
         parse_xml(response.plain_body)
         status = response.code.to_i
         case status
         when 200
           # even HTTP 200 can contain an error, so we always have to peek for an Error
           if response_is_error?
-            parse_and_raise_exception
+            parse_and_raise_exception(options)
           else
             response
           end
         when 302
           raise "Unhandled HTTP Redirect"
-        when 401
+        when 401, 403
           raise Quickbooks::AuthorizationFailure
         when 400, 500
-          parse_and_raise_exception
+          parse_and_raise_exception(options)
         when 503
           raise Quickbooks::ServiceUnavailable
         else
@@ -245,13 +253,13 @@ module Quickbooks
         end
       end
 
-      def parse_and_raise_exception
+      def parse_and_raise_exception(options = {})
         err = parse_intuit_error
         ex = Quickbooks::IntuitRequestException.new("#{err[:message]}:\n\t#{err[:detail]}")
         ex.code = err[:code]
         ex.detail = err[:detail]
         ex.type = err[:type]
-
+        ex.request_xml = options[:request_xml]
         raise ex
       end
 

data/lib/quickbooks/service/bill.rb

@@ -2,10 +2,12 @@ module Quickbooks
   module Service
     class Bill < BaseService
 
-      def default_model_query
-        "SELECT * FROM Bill"
+      def delete(bill, options = {})
+        delete_by_query_string(bill)
       end
 
+      private
+      
       def model
         Quickbooks::Model::Bill
       end

data/lib/quickbooks/service/bill_payment.rb

@@ -2,9 +2,7 @@ module Quickbooks
   module Service
     class BillPayment < BaseService
 
-      def default_model_query
-        "SELECT * FROM BillPayment"
-      end
+      private
 
       def model
         Quickbooks::Model::BillPayment

data/lib/quickbooks/service/class.rb

@@ -0,0 +1,23 @@
+module Quickbooks
+  module Service
+    class Class < BaseService
+
+      def update(entity, options = {})
+        raise Quickbooks::InvalidModelException.new('Class sparse update is not supported by Intuit at this time') if options[:sparse] && options[:sparse] == true
+        super(entity, options)
+      end
+
+      def delete(classs)
+        classs.active = false
+        update(classs, :sparse => false)
+      end
+
+      private
+
+      def model
+        Quickbooks::Model::Class
+      end
+
+    end
+  end
+end

data/lib/quickbooks/service/company_info.rb

@@ -3,11 +3,7 @@ module Quickbooks
     class CompanyInfo < BaseService
 
       private
-
-      def default_model_query
-        "SELECT * FROM CompanyInfo"
-      end
-
+      
       def model
         Quickbooks::Model::CompanyInfo
       end

data/lib/quickbooks/service/credit_memo.rb

@@ -2,10 +2,8 @@ module Quickbooks
   module Service
     class CreditMemo < BaseService
 
-      def default_model_query
-        "SELECT * FROM CreditMemo"
-      end
-
+      private
+      
       def model
         Quickbooks::Model::CreditMemo
       end

data/lib/quickbooks/service/customer.rb

@@ -9,10 +9,6 @@ module Quickbooks
 
       private
 
-      def default_model_query
-        "SELECT * FROM CUSTOMER"
-      end
-
       def model
         Quickbooks::Model::Customer
       end

data/lib/quickbooks/service/department.rb

@@ -0,0 +1,23 @@
+module Quickbooks
+  module Service
+    class Department < BaseService
+
+      def update(entity, options = {})
+        raise Quickbooks::InvalidModelException.new('Department sparse update is not supported by Intuit at this time') if options[:sparse] && options[:sparse] == true
+        super(entity, options)
+      end
+
+      def delete(department)
+        department.active = false
+        update(department, :sparse => false)
+      end
+
+      private
+
+      def model
+        Quickbooks::Model::Department
+      end
+
+    end
+  end
+end