quickbooks-ruby 1.0.1 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b68c87332554f06f7289cb0a36ab956223eebd6867f0c0696106d9ab0c2b3236
-  data.tar.gz: 523006400f30928bc0a7e8702300ed544e9da7128d9586eb84902164877393cb
+  metadata.gz: 3090c1e6be59c03b4f8802cd3d56771e01ba508166db446e3bb9a372739d5dd0
+  data.tar.gz: 4fdb76a07e05ee92dd3c837622e32ce23cb41ede769928ff198f8cb91d58f5c7
 SHA512:
-  metadata.gz: 36d97d0f30ab9feda23278718dba10bf57cfe9a56eb35f9e7cb2860cca71244454b5a24fae1ec625ac9008a0fe12f8d547b49520f713b57b46cf59df4464048b
-  data.tar.gz: c2614aeec251e6580e89472fafcec0ea1b12b91a6c2ac10fc0b811fa13f4fc8b2a2fbb2578f5cf12a1e47574a7b4f7e9859316d783a735e960bf05abcf6153c8
+  metadata.gz: 26045642638563196533afd56d2a36afa2cdd2a1a8c95a54e6faf0546e99491d144802ae9624df4d1d205e23553965120eeca2fd1b484705a185bcab6633822a
+  data.tar.gz: ea5208b840894935844c3a8d3ff06f880877e48b62fb1a1b8b112f82def2d5d4b7960d3008124891bdaa2cd3044711975ffc2404468cc53f54b2b14b5bc4aeb5

data/lib/quickbooks/model/account.rb

@@ -4,7 +4,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Account"
       XML_NODE = "Account"
       REST_RESOURCE = 'account'
-      MINORVERSION = 13
 
       ASSET = 'Asset'
       EQUITY = 'Equity'

data/lib/quickbooks/model/account_based_expense_line_detail.rb

@@ -7,6 +7,7 @@ module Quickbooks
       xml_accessor :billable_status, :from => 'BillableStatus'
       xml_accessor :tax_amount, :from => 'UnitPrice', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference
+      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', :as => BigDecimal, to_xml: Proc.new { |val| val.to_f }
 
       reference_setters :customer_ref, :class_ref, :account_ref, :tax_code_ref
 

data/lib/quickbooks/model/base_model.rb

@@ -30,6 +30,7 @@ module Quickbooks
 
       def as_json(options = nil)
         options = {} if options.nil?
+        options = options.dup if options.frozen?
         except_conditions = ["roxml_references"]
         except_conditions << options[:except]
         options[:except] = except_conditions.flatten.uniq.compact

data/lib/quickbooks/model/bill.rb

@@ -16,6 +16,7 @@ module Quickbooks
       xml_accessor :department_ref, :from => 'DepartmentRef', :as => BaseReference
 
       xml_accessor :line_items, :from => 'Line', :as => [BillLineItem]
+      xml_accessor :txn_tax_detail, :from => 'TxnTaxDetail', :as => TransactionTaxDetail
 
       xml_accessor :private_note, :from => 'PrivateNote'
 
@@ -30,6 +31,7 @@ module Quickbooks
       xml_accessor :due_date, :from => 'DueDate', :as => Date
       xml_accessor :remit_to_address, :from => 'RemitToAddr', :as => PhysicalAddress
       xml_accessor :ship_address, :from => 'ShipAddr', :as => PhysicalAddress
+      xml_accessor :mailing_address, :from => 'VendorAddr', :as => PhysicalAddress
       xml_accessor :exchange_rate, :from => 'ExchangeRate', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :balance, :from => 'Balance', :as => BigDecimal, :to_xml => to_xml_big_decimal
 

data/lib/quickbooks/model/bill_line_item.rb

@@ -12,6 +12,8 @@ module Quickbooks
       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]
+
       #== Various detail types
       xml_accessor :account_based_expense_line_detail, :from => 'AccountBasedExpenseLineDetail', :as => AccountBasedExpenseLineDetail
       xml_accessor :item_based_expense_line_detail, :from => 'ItemBasedExpenseLineDetail', :as => ItemBasedExpenseLineDetail

data/lib/quickbooks/model/customer.rb

@@ -16,8 +16,6 @@ module Quickbooks
       include NameEntity::Quality
       include NameEntity::PermitAlterations
 
-      MINORVERSION = 33
-
       xml_name XML_NODE
       xml_accessor :id, :from => 'Id'
       xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
@@ -55,12 +53,17 @@ module Quickbooks
       xml_accessor :default_tax_code_ref, :from => 'DefaultTaxCodeRef', :as => BaseReference
       xml_accessor :notes, :from => 'Notes'
       xml_accessor :currency_ref, :from => 'CurrencyRef', :as => BaseReference
+      xml_accessor :tax_exemption_reason_id, :from => 'TaxExemptionReasonId'
+      xml_accessor :primary_tax_identifier, :from => 'PrimaryTaxIdentifier'
+      xml_accessor :customer_type_ref, :from => 'CustomerTypeRef', :as => BaseReference
+      xml_accessor :isproject?, :from => 'IsProject'
 
       #== Validations
       validate :names_cannot_contain_invalid_characters
       validate :email_address_is_valid
 
-      reference_setters :parent_ref, :sales_term_ref, :payment_method_ref, :default_tax_code_ref, :currency_ref
+      reference_setters :parent_ref, :sales_term_ref, :payment_method_ref, :default_tax_code_ref, :currency_ref,
+                        :customer_type_ref
 
       def job?
         job.to_s == 'true'

data/lib/quickbooks/model/customer_type.rb

@@ -0,0 +1,15 @@
+module Quickbooks
+  module Model
+    class CustomerType < BaseModel
+      XML_COLLECTION_NODE = "CustomerType"
+      XML_NODE = "CustomerType"
+      REST_RESOURCE = 'customertype'
+
+      xml_accessor :id, :from => 'Id'
+      xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
+      xml_accessor :meta_data, :from => 'MetaData', :as => MetaData
+      xml_accessor :name, :from => 'Name'
+      xml_accessor :active?, :from => 'Active'
+    end
+  end
+end

data/lib/quickbooks/model/invoice.rb

@@ -17,7 +17,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Invoice"
       XML_NODE = "Invoice"
       EMAIL_STATUS_NEED_TO_SEND = 'NeedToSend'
-      MINORVERSION = 37
 
       xml_accessor :id, :from => 'Id'
       xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
@@ -37,6 +36,7 @@ module Quickbooks
       xml_accessor :customer_memo, :from => 'CustomerMemo'
       xml_accessor :billing_address, :from => 'BillAddr', :as => PhysicalAddress
       xml_accessor :shipping_address, :from => 'ShipAddr', :as => PhysicalAddress
+      xml_accessor :ship_from_address, :from => 'ShipFromAddr', :as => PhysicalAddress
       xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
       xml_accessor :sales_term_ref, :from => 'SalesTermRef', :as => BaseReference
       xml_accessor :due_date, :from => 'DueDate', :as => Date
@@ -60,6 +60,8 @@ module Quickbooks
       xml_accessor :allow_online_credit_card_payment?, :from => 'AllowOnlineCreditCardPayment'
       xml_accessor :allow_online_ach_payment?, :from => 'AllowOnlineACHPayment'
       xml_accessor :deposit_to_account_ref, :from => 'DepositToAccountRef', :as => BaseReference
+      xml_accessor :bill_email_cc, :from => 'BillEmailCc', :as => EmailAddress
+      xml_accessor :bill_email_bcc, :from => 'BillEmailBcc', :as => EmailAddress
 
 
       reference_setters
@@ -88,6 +90,13 @@ module Quickbooks
         self.bill_email = EmailAddress.new(email_address_string)
       end
 
+      def billing_email_cc_address=(email_address_string)
+        self.bill_email_cc = EmailAddress.new(email_address_string)
+      end
+
+      def billing_email_bcc_address=(email_address_string)
+        self.bill_email_bcc = EmailAddress.new(email_address_string)
+      end
 
       def wants_billing_email_sent!
         self.email_status = EMAIL_STATUS_NEED_TO_SEND
@@ -97,7 +106,6 @@ module Quickbooks
         email_status == EMAIL_STATUS_NEED_TO_SEND
       end
 
-
       def existence_of_customer_ref
         if customer_ref.nil? || (customer_ref && customer_ref.value == 0)
           errors.add(:customer_ref, "CustomerRef is required and must be a non-zero value.")

data/lib/quickbooks/model/item.rb

@@ -10,7 +10,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Item"
       XML_NODE = "Item"
       REST_RESOURCE = 'item'
-      MINORVERSION = 33
 
       INVENTORY_TYPE = 'Inventory'
       NON_INVENTORY_TYPE = 'NonInventory'
@@ -31,6 +30,7 @@ module Quickbooks
       xml_accessor :level, :from => 'Level', :as => Integer
       xml_accessor :pref_vendor_ref, :from => 'PrefVendorRef', :as => BaseReference
       xml_accessor :tax_classification_ref, :from => 'TaxClassificationRef', :as => BaseReference
+      xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
 
       # read-only
       xml_accessor :fully_qualified_name, :from => 'FullyQualifiedName'
@@ -52,13 +52,11 @@ module Quickbooks
       xml_accessor :inv_start_date, :from => 'InvStartDate', :as => Date
       xml_accessor :custom_fields, :from => "CustomField", as: [CustomField]
       xml_accessor :print_grouped_items?, :from => 'PrintGroupedItems'
-
-
       xml_accessor :item_group_details, :from => 'ItemGroupDetail', :as => ItemGroupDetail
 
       reference_setters :parent_ref, :income_account_ref, :expense_account_ref
       reference_setters :asset_account_ref, :sales_tax_code_ref, :purchase_tax_code_ref
-      reference_setters :pref_vendor_ref, :tax_classification_ref
+      reference_setters :pref_vendor_ref, :tax_classification_ref, :class_ref
 
       #== Validations
       validates_length_of :name, :minimum => 1

data/lib/quickbooks/model/item_based_expense_line_detail.rb

@@ -13,6 +13,7 @@ module Quickbooks
       xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference
       xml_accessor :customer_ref, :from => 'CustomerRef', :as => BaseReference
       xml_accessor :billable_status, :from => 'BillableStatus'
+      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, :customer_ref, :tax_code_ref
     end

data/lib/quickbooks/model/preferences.rb

@@ -4,7 +4,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Preferences"
       XML_NODE            = "Preferences"
       REST_RESOURCE       = 'preferences'
-      MINORVERSION = 21
 
       xml_name XML_NODE
 
@@ -20,7 +19,7 @@ module Quickbooks
       PREFERENCE_SECTIONS = {
         :accounting_info      => %w(TrackDepartments DepartmentTerminology ClassTrackingPerTxnLine? ClassTrackingPerTxn? CustomerTerminology),
         :product_and_services => %w(ForSales? ForPurchase? QuantityWithPriceAndRate? QuantityOnHand?),
-        :vendor_and_purchase  => %w(TrackingByCustomer? BillableExpenseTracking? DefaultTerms? DefaultMarkup? POCustomField),
+        :vendor_and_purchases => %w(TrackingByCustomer? BillableExpenseTracking? DefaultTerms? DefaultMarkup? POCustomField),
         :time_tracking        => %w(UseServices? BillCustomers? ShowBillRateToAll WorkWeekStartDate MarkTimeEntiresBillable?),
         :tax                  => %w(UsingSalesTax? PartnerTaxEnabled?),
         :currency             => %w(MultiCurrencyEnabled? HomeCurrency),
@@ -28,9 +27,28 @@ module Quickbooks
       }
 
       xml_reader :sales_forms, :from => "SalesFormsPrefs", :as => create_preference_class(*%w(
-        CustomTxnNumbers? AllowDeposit? AllowDiscount? DefaultDiscountAccount? AllowEstimates? EstimateMessage?
-        ETransactionEnabledStatus? ETransactionAttachPDF? ETransactionPaymentEnabled? IPNSupportEnabled?
-        AllowServiceDate? AllowShipping? DefaultShippingAccount? DefaultTerms DefaultCustomerMessage
+        AllowDeposit?
+        AllowDiscount?
+        AllowEstimates?
+        AllowServiceDate?
+        AllowShipping?
+        AutoApplyCredit?
+        CustomField?
+        CustomTxnNumbers?
+        DefaultCustomerMessage
+        DefaultDiscountAccount?
+        DefaultShippingAccount?
+        DefaultTerms
+        EmailCopyToCompany?
+        EstimateMessage
+        ETransactionAttachPDF?
+        ETransactionEnabledStatus
+        ETransactionPaymentEnabled?
+        IPNSupportEnabled?
+        SalesEmailBcc
+        SalesEmailCc
+        UsingPriceLevels?
+        UsingProgressInvoicing?
       )) {
         xml_reader :custom_fields, :as => [CustomField], :from => 'CustomField', in: 'CustomField'
       }

data/lib/quickbooks/model/purchase_change.rb

@@ -0,0 +1,7 @@
+module Quickbooks
+  module Model
+    class PurchaseChange < ChangeModel
+      XML_NODE = "Purchase"
+    end
+  end
+end

data/lib/quickbooks/model/purchase_line_item.rb

@@ -12,6 +12,7 @@ module Quickbooks
       xml_accessor :description, :from => 'Description'
       xml_accessor :amount, :from => 'Amount', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
       xml_accessor :detail_type, :from => 'DetailType'
+      xml_accessor :received, :from => 'Received', :as => BigDecimal, :to_xml => to_xml_big_decimal
 
       #== Various detail types
       xml_accessor :account_based_expense_line_detail, :from => ACCOUNT_BASED_EXPENSE_LINE_DETAIL, :as => AccountBasedExpenseLineDetail

data/lib/quickbooks/model/purchase_order.rb

@@ -24,10 +24,11 @@ module Quickbooks
       xml_accessor :attachable_ref, :from => 'AttachableRef', :as => BaseReference
       xml_accessor :vendor_ref, :from => 'VendorRef', :as => BaseReference
       xml_accessor :ap_account_ref, :from => 'APAccountRef', :as => BaseReference
+      xml_accessor :po_email, from: "POEmail", as: EmailAddress
       xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
       xml_accessor :sales_term_ref, :from => 'SalesTermRef', :as => BaseReference
 
-      xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :due_date, :from => 'DueDate', :as => Date
       xml_accessor :vendor_address, :from => 'VendorAddr', :as => PhysicalAddress
       xml_accessor :ship_address, :from => 'ShipAddr', :as => PhysicalAddress

data/lib/quickbooks/model/report.rb

@@ -38,9 +38,20 @@ module Quickbooks
           value = el.attr('value')
 
           next nil if value.blank?
-          next value if value.to_s.match(/^\d+$|^\d+.\d+$|^-\d+|^-\d+.\d+$|^.\d+$/).nil?
+
+          parse_row_value(value)
+        end
+      end
+
+      def parse_row_value(value)
+        # does it look like a number?
+        if value =~ /\A\-?[0-9\.]+\Z/
           BigDecimal(value)
+        else
+          value
         end
+      rescue ArgumentError
+        value
       end
 
     end

data/lib/quickbooks/model/sales_item_line_detail.rb

@@ -9,6 +9,7 @@ module Quickbooks
       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

data/lib/quickbooks/model/sales_receipt.rb

@@ -22,6 +22,7 @@ module Quickbooks
       xml_accessor :bill_address, :from => 'BillAddr', :as => PhysicalAddress
       xml_accessor :delivery_info, :from => 'DeliveryInfo', :as => DeliveryInfo
       xml_accessor :ship_address, :from => 'ShipAddr', :as => PhysicalAddress
+      xml_accessor :ship_from_address, :from => 'ShipFromAddr', :as => PhysicalAddress
       xml_accessor :po_number, :from => 'PONumber'
       xml_accessor :ship_method_ref, :from => 'ShipMethodRef', :as => BaseReference
       xml_accessor :ship_date, :from => 'ShipDate', :as => Time

data/lib/quickbooks/model/transaction_tax_detail.rb

@@ -1,9 +1,9 @@
 module Quickbooks
   module Model
     class TransactionTaxDetail < BaseModel
-
       xml_accessor :txn_tax_code_ref, :from => 'TxnTaxCodeRef', :as => BaseReference
       xml_accessor :total_tax, :from => 'TotalTax', :as => BigDecimal, :to_xml => to_xml_big_decimal
+      xml_accessor :total_tax_specified, :from => 'TotalTaxSpecified'
       xml_accessor :lines, :from => 'TaxLine', :as => [TaxLine]
 
       reference_setters :txn_tax_code_ref

data/lib/quickbooks/model/vendor.rb

@@ -41,6 +41,7 @@ module Quickbooks
       xml_accessor :account_number, :from => 'AcctNum'
       xml_accessor :is_1099?, :from => 'Vendor1099'
       xml_accessor :currency_ref, :from => 'CurrencyRef', :as => BaseReference
+      xml_accessor :bill_rate, from: "BillRate", as: BigDecimal, to_xml: to_xml_big_decimal
 
       #== Validations
       validate :names_cannot_contain_invalid_characters

data/lib/quickbooks/model/vendor_credit.rb

@@ -28,6 +28,8 @@ module Quickbooks
 
       xml_accessor :currency_ref, :from => 'CurrencyRef', :as => BaseReference
       xml_accessor :exchange_rate, :from => 'ExchangeRate', :as => BigDecimal, :to_xml => to_xml_big_decimal
+      
+      xml_accessor :linked_transactions, :from => 'LinkedTxn', :as => [LinkedTransaction]
 
       reference_setters
 

data/lib/quickbooks/service/access_token.rb

@@ -1,10 +1,8 @@
 module Quickbooks
   module Service
     class AccessToken < BaseService
-
       RENEW_URL = "https://appcenter.intuit.com/api/v1/connection/reconnect"
-      DISCONNECT_URL_OAUTH1 = "https://appcenter.intuit.com/api/v1/connection/disconnect"
-      DISCONNECT_URL_OAUTH2 = "https://developer.api.intuit.com/v2/oauth2/tokens/revoke"
+      DISCONNECT_URL = "https://developer.api.intuit.com/v2/oauth2/tokens/revoke"
 
       # https://developer.intuit.com/docs/0025_quickbooksapi/0053_auth_auth/oauth_management_api#Reconnect
       def renew
@@ -22,26 +20,29 @@ module Quickbooks
 
       # https://developer.intuit.com/docs/0025_quickbooksapi/0053_auth_auth/oauth_management_api#Disconnect
       def disconnect
-        if oauth_v1?
-          response = do_http_get(DISCONNECT_URL_OAUTH1)
-          if response && response.code.to_i == 200
-            Quickbooks::Model::AccessTokenResponse.from_xml(response.plain_body)
-          end
-        elsif oauth_v2?
-          conn = Faraday.new
-          conn.basic_auth oauth.client.id, oauth.client.secret
-          response = conn.post(DISCONNECT_URL_OAUTH2, token: oauth.refresh_token || oauth.token)
+        connection = Faraday.new(headers: { 'Content-Type' => 'application/json' }) do |f|
+          f.adapter(::Quickbooks.http_adapter)
 
-          if response.success?
-            Quickbooks::Model::AccessTokenResponse.new(error_code: "0")
+          if Gem.loaded_specs['faraday'].version >= Gem::Version.create('2.0')
+            f.request(:authorization, :basic, oauth.client.id, oauth.client.secret)
           else
-            Quickbooks::Model::AccessTokenResponse.new(
-              error_code: response.status.to_s, error_message: response.reason_phrase
-            )
+            f.basic_auth(oauth.client.id, oauth.client.secret)
           end
         end
-      end
 
+        url = "#{DISCONNECT_URL}?minorversion=#{Quickbooks.minorversion}"
+        response = connection.post(url) do |request|
+          request.body = JSON.generate({ token: oauth.refresh_token || oauth.token })
+        end
+
+        if response.success?
+          Quickbooks::Model::AccessTokenResponse.new(error_code: "0")
+        else
+          Quickbooks::Model::AccessTokenResponse.new(
+            error_code: response.status.to_s, error_message: response.reason_phrase
+          )
+        end
+      end
     end
   end
 end

data/lib/quickbooks/service/account.rb

@@ -7,11 +7,6 @@ module Quickbooks
         update(account, :sparse => true)
       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::Account::MINORVERSION}"
-      end
-
       private
 
       def model