diff --git a/lib/quickbooks/model/invoice.rb b/lib/quickbooks/model/invoice.rb index c044e3bf..1c03dd53 100644 --- a/lib/quickbooks/model/invoice.rb +++ b/lib/quickbooks/model/invoice.rb @@ -14,6 +14,7 @@ class Invoice < BaseModel #== Constants REST_RESOURCE = 'invoice' + MINORVERSION = 1 XML_COLLECTION_NODE = "Invoice" XML_NODE = "Invoice" EMAIL_STATUS_NEED_TO_SEND = 'NeedToSend' diff --git a/lib/quickbooks/model/sales_item_line_detail.rb b/lib/quickbooks/model/sales_item_line_detail.rb index bf683846..37826637 100644 --- a/lib/quickbooks/model/sales_item_line_detail.rb +++ b/lib/quickbooks/model/sales_item_line_detail.rb @@ -9,6 +9,7 @@ class SalesItemLineDetail < BaseModel xml_accessor :quantity, :from => 'Qty', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f } xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference xml_accessor :service_date, :from => 'ServiceDate', :as => Date + xml_accessor :tax_inclusive_amount, :from => 'TaxInclusiveAmt', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f } reference_setters :item_ref, :class_ref, :price_level_ref, :tax_code_ref end diff --git a/lib/quickbooks/service/invoice.rb b/lib/quickbooks/service/invoice.rb index 32416edf..80d8cb1d 100644 --- a/lib/quickbooks/service/invoice.rb +++ b/lib/quickbooks/service/invoice.rb @@ -6,6 +6,21 @@ def delete(invoice) delete_by_query_string(invoice) end + def url_for_resource(resource) + url = super(resource) + "#{url}?minorversion=#{Quickbooks::Model::Invoice::MINORVERSION}" + end + + def fetch_by_id(id, params = {}) + url = "#{url_for_base}/invoice/#{id}?minorversion=#{Quickbooks::Model::Invoice::MINORVERSION}" + fetch_object(model, url, params) + end + + def url_for_query(query = nil, start_position = 1, max_results = 20, options = {}) + url = super(query, start_position, max_results, options) + "#{url}&minorversion=#{Quickbooks::Model::Invoice::MINORVERSION}" + end + def send(invoice, email_address=nil) query = email_address.present? ? "?sendTo=#{email_address}" : "" url = "#{url_for_resource(model::REST_RESOURCE)}/#{invoice.id}/send#{query}"