quickbooks-ruby 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0e5a4d254a49ea8f633ba0b70a4b20c11a7a29
-  data.tar.gz: bb4b11ecdaf0d0b98b9074102b175a0954c3b386
+  metadata.gz: 333d4d3a664eb7b3b48294bdcd2de31071593403
+  data.tar.gz: f67d64f084bec1975705b7aaa19148716f82ed37
 SHA512:
-  metadata.gz: 78b84c571e4b68904be22000788b7240ad9ca6154cd49cd30af99e30b31a953a4250a7cd74a9ad30a770b943707b643a4b5dc82ce46b0e1d59c8120f51b9c994
-  data.tar.gz: b759d252cffacd0466c4d9d98adecf900e262814fd3ec697423e899291fd0685a4ba1f5f7f4c8077b7cf570cee551e778636b5edfe48f367fcb4d1939e560492
+  metadata.gz: 83df4ff5537f43d8066a62804fe31781a7ab95be145c599fbf0b10ae27faf493d7615c1f53ca7454e60a86ec3a2e1f0aab6f3f0576852e1ca10fecd6872e4d1c
+  data.tar.gz: 676423da97728dfde65cf08f9750aaf26ec093f32138b2b6be979c651fe51eda8efd26c9cc6cb36b1ad0f2d46cdd75af14dfea739a6669ddcc4316702047037f

data/lib/quickbooks/model/batch_request.rb

@@ -17,6 +17,7 @@ class Quickbooks::Model::BatchRequest < Quickbooks::Model::BaseModel
     xml_accessor :bill_payment, from: "BillPayment", as: Quickbooks::Model::BillPayment
     xml_accessor :purchase, from: "Purchase", as: Quickbooks::Model::Purchase
     xml_accessor :credit_memo, from: "CreditMemo", as: Quickbooks::Model::CreditMemo
+    xml_accessor :payment, from: "Payment", as: Quickbooks::Model::Payment
   end
 
   XML_COLLECTION_NODE = "IntuitBatchRequest"

data/lib/quickbooks/model/batch_response.rb

@@ -16,6 +16,7 @@ class Quickbooks::Model::BatchResponse < Quickbooks::Model::BaseModel
     xml_accessor :bill_payment, from: "BillPayment", as: Quickbooks::Model::BillPayment
     xml_accessor :purchase, from: "Purchase", as: Quickbooks::Model::Purchase
     xml_accessor :credit_memo, from: "CreditMemo", as: Quickbooks::Model::CreditMemo
+    xml_accessor :payment, from: "Payment", as: Quickbooks::Model::Payment
 
     def fault?
       fault

data/lib/quickbooks/model/credit_memo.rb

@@ -11,9 +11,7 @@ module Quickbooks
       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 :txn_date, :from => 'TxnDate', :as => Date
-      # TODO: Next major version 'placed_on' should be replaced by 'txn_date'
-      xml_accessor :placed_on, :from => 'TxnDate', :as => Date
+      xml_accessor :txn_date, :from => 'TxnDate', :as => Date
       xml_accessor :department_ref, :from => 'DepartmentRef', :as => BaseReference
 
       xml_accessor :line_items, :from => 'Line', :as => [Line]
@@ -31,6 +29,9 @@ module Quickbooks
       # readonly
       xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal
 
+      # backward-compatible alias
+      alias_attribute :placed_on, :txn_date
+
       validate :line_item_size
       validate :document_numbering
 

data/lib/quickbooks/model/employee.rb

@@ -27,7 +27,7 @@ module Quickbooks
       xml_accessor :primary_phone, :from => 'PrimaryPhone', :as => TelephoneNumber
       xml_accessor :mobile_phone, :from => 'Mobile', :as => TelephoneNumber
       xml_accessor :primary_email_address, :from => 'PrimaryEmailAddr', :as => EmailAddress
-      xml_accessor :number, :from => 'EmployeeNumber', :as => Integer
+      xml_accessor :number, :from => 'EmployeeNumber'
       xml_accessor :ssn, :from => 'SSN'
       xml_accessor :address, :from => 'PrimaryAddr', :as => PhysicalAddress
       xml_accessor :billable?, :from => 'BillableTime'

data/lib/quickbooks/model/estimate.rb

@@ -25,7 +25,7 @@ module Quickbooks
       xml_accessor :department_ref, :from => 'DepartmentRef', :as => BaseReference
       xml_accessor :linked_transactions, :from => 'LinkedTxn', :as => [LinkedTransaction]
       xml_accessor :line_items, :from => 'Line', :as => [InvoiceLineItem]
-      xml_accessor :txn_tax_detail, :from => 'TxnTaxDetail'
+      xml_accessor :txn_tax_detail, :from => 'TxnTaxDetail', :as => TransactionTaxDetail
       xml_accessor :txn_status, :from => 'TxnStatus'
 
       xml_accessor :customer_ref, :from => 'CustomerRef', :as => BaseReference

data/lib/quickbooks/model/line.rb

@@ -21,19 +21,47 @@ module Quickbooks
       xml_accessor :payment_line_detail, :from => 'PaymentLineDetail', :as => PaymentLineDetail
       xml_accessor :discount_line_detail, :from => 'DiscountLineDetail', :as => DiscountOverride
       xml_accessor :journal_entry_line_detail, :from => 'JournalEntryLineDetail', :as => JournalEntryLineDetail
-      xml_accessor :linked_transaction, :from => 'LinkedTxn', :as => LinkedTransaction
 
-      def invoice_id=(invoice_id)
-        self.linked_transaction = LinkedTransaction.new(txn_id: invoice_id,
-                                                        txn_type: "Invoice")
+      def initialize(*args)
+        super
+        self.linked_transactions ||= []
       end
 
+      def invoice_id=(id)
+        update_linked_transactions([id], 'Invoice')
+      end
+      alias_method :invoice_ids=, :invoice_id=
+
+      def credit_memo_id=(id)
+        update_linked_transactions([id], 'CreditMemo')
+      end
+      alias_method :credit_memo_ids=, :credit_memo_id=
+
       def sales_item!
         self.detail_type = SALES_LINE_ITEM_DETAIL
         self.sales_item_line_detail = SalesItemLineDetail.new
 
         yield self.sales_item_line_detail if block_given?
       end
+
+
+      private
+
+      def update_linked_transactions(txn_ids, txn_type)
+        remove_linked_transactions(txn_type)
+        txn_ids.flatten.compact.each do |id|
+          add_linked_transaction(id, txn_type)
+        end
+      end
+
+      def remove_linked_transactions(txn_type)
+        self.linked_transactions.delete_if { |lt| lt.txn_type == txn_type }
+      end
+
+      def add_linked_transaction(txn_id, txn_type)
+        self.linked_transactions << LinkedTransaction.new(txn_id: txn_id,
+                                                          txn_type: txn_type)
+      end
     end
   end
 end

data/lib/quickbooks/model/payment.rb

@@ -29,6 +29,11 @@ module Quickbooks
 
       validate :existence_of_customer_ref
 
+      def initialize(*args)
+        ensure_line_items_initialization
+        super
+      end
+
       private
 
       def existence_of_customer_ref

data/lib/quickbooks/model/refund_receipt.rb

@@ -10,7 +10,6 @@ module Quickbooks
       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 :department_ref, :from => 'DepartmentRef', :as => BaseReference
@@ -39,6 +38,9 @@ module Quickbooks
       xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal
       xml_accessor :home_total, :from => 'HomeTotalAmt', :as => BigDecimal, :to_xml => to_xml_big_decimal
 
+      # backward-compatible alias
+      alias_attribute :placed_on, :txn_date
+
       include DocumentNumbering
       reference_setters :customer_ref, :payment_method_ref, :deposit_to_account_ref, :department_ref, :currency_ref, :class_ref
 

data/lib/quickbooks/model/sales_receipt.rb

@@ -11,7 +11,7 @@ module Quickbooks
       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 :txn_date, :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
@@ -30,6 +30,9 @@ module Quickbooks
       # readonly
       xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal
 
+      # backward-compatible alias
+      alias_attribute :placed_on, :txn_date
+
       reference_setters :customer_ref, :payment_method_ref, :deposit_to_account_ref
 
       validate :line_item_size

data/lib/quickbooks/model/time_activity.rb

@@ -20,6 +20,7 @@ module Quickbooks
       xml_accessor :vendor_ref, :from => 'VendorRef', :as => BaseReference
       xml_accessor :customer_ref, :from => 'CustomerRef', :as => BaseReference
       xml_accessor :item_ref, :from => 'ItemRef', :as => BaseReference
+      xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
 
       xml_accessor :billable_status, :from => 'BillableStatus'
       xml_accessor :taxable, :from => 'Taxable'

data/lib/quickbooks/util/query_builder.rb

@@ -10,12 +10,26 @@ module Quickbooks
       end
 
       def clause(field, operator, value)
-        # escape single quotes with an escaped backslash
-        value = value.gsub("'", "\\\\'")
+        value = case value
+                when DateTime, Time
+                  value.iso8601
+                when Date
+                  value.strftime('%Y-%m-%d')
+                when Array
+                  value = value.map{|v| v.to_s.gsub("'", "\\\\'") }
+                else
+                  # escape single quotes with an escaped backslash
+                  value = value.gsub("'", "\\\\'")
+                end
 
-        "#{field} #{operator} #{VALUE_QUOTE}#{value}#{VALUE_QUOTE}"
+        if operator.downcase == 'in' && value.is_a?(Array)
+          value = value.map{|v| "#{VALUE_QUOTE}#{v}#{VALUE_QUOTE}"}
+          "#{field} #{operator} (#{value.join(', ')})"
+        else
+          "#{field} #{operator} #{VALUE_QUOTE}#{value}#{VALUE_QUOTE}"
+        end
       end
 
     end
   end
-end
+end

data/lib/quickbooks/version.rb

@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Cody Caughlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth