quickbooks-ruby 1.0.18 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dda46c200f06a727d9afc9e6fab73b06aff231f1fdf8ad1c2b82f2a47e68725
-  data.tar.gz: c1339cc89632c1268304df4c731bdfda624ee694a49b384d9c7c227f1547d57a
+  metadata.gz: fef9e529bfa1fb897b03273cad08ac6fe1fe45c30667f655a3a44dddaa36d10a
+  data.tar.gz: 5dfe60a549caac7c0ecefd10b9ea3396916bccc440e3011ed804d1e02308cbdf
 SHA512:
-  metadata.gz: d03e41802dea2444518e37c4f3a001461cb0ef89df68a7d66a27ca31320065b275440585d3dde3921912723b16f275d92c9a1aa8d67a6d66cfae634410767bea
-  data.tar.gz: d59eaef4588055cd75b9ec44cdb23d4294509425f7cfd5a1ee391acd18d3ad62fa946755de85c890a411b3bb3fe6db154a4cafc6e16fbde9b3ca0271d1871f4f
+  metadata.gz: 797e5336baeec1e26e813d9975f1721f187f72cff7abcfd87f01fef579d9669b686af0fd31a3812150365a99388fe69b074d0b6ed8fb5ed3437afc1d4ee49b2e
+  data.tar.gz: 15c7ffea9da64f530709637aec045c3b2d235216a08cf197b86a9597820083810525674781e28e2299508a6b58758a487d7c8b42f0eb25f4ae50c0a3034ed373

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', to_xml: Proc.new { |val| val.to_f }
 
       reference_setters :customer_ref, :class_ref, :account_ref, :tax_code_ref
 

data/lib/quickbooks/model/bill.rb

@@ -31,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/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', 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/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', 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/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_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/base_service.rb

@@ -248,11 +248,7 @@ module Quickbooks
           headers['Accept-Encoding'] = HTTP_ACCEPT_ENCODING
         end
 
-        log "------ QUICKBOOKS-RUBY REQUEST ------"
-        log "METHOD = #{method}"
-        log "RESOURCE = #{url}"
-        log_request_body(body)
-        log "REQUEST HEADERS = #{headers.inspect}"
+        log_request(method, url, body, headers)
 
         request_info = RequestInfo.new(url, headers, body, method)
         before_request.call(request_info) if before_request
@@ -273,12 +269,8 @@ module Quickbooks
         after_request.call(request_info, raw_response.body) if after_request
 
         response = Quickbooks::Service::Responses::OAuthHttpResponse.wrap(raw_response)
-        log "------ QUICKBOOKS-RUBY RESPONSE ------"
-        log "RESPONSE CODE = #{response.code}"
-        log_response_body(response)
-        if response.respond_to?(:headers)
-          log "RESPONSE HEADERS = #{response.headers}"
-        end
+        log_response(response)
+
         check_response(response, request: body)
       end
 
@@ -354,28 +346,29 @@ module Quickbooks
         end
       end
 
-      def log_response_body(response)
-        log "RESPONSE BODY:"
-        if is_json?
-          log ">>>>#{response.plain_body.inspect}"
-        elsif is_pdf?
-          log("BODY is a PDF : not dumping")
-        else
-          log(log_xml(response.plain_body))
-        end
+      def log_request(method, url, body, headers)
+        messages = []
+        messages << "------ QUICKBOOKS-RUBY REQUEST ------"
+        messages << "METHOD = #{method}"
+        messages << "RESOURCE = #{url}"
+        messages.concat(request_body_messages(body))
+        messages << "REQUEST HEADERS = #{headers.inspect}"
+
+        log_multiple(messages)
       end
 
-      def log_request_body(body)
-        log "REQUEST BODY:"
+      def request_body_messages(body)
+        messages = []
+        messages <<  "REQUEST BODY:"
         if is_json?
-          log(body.inspect)
+          messages <<  body.inspect
         elsif is_pdf?
-          log("BODY is a PDF : not dumping")
+          messages <<  "BODY is a PDF : not dumping"
         else
           #multipart request for uploads arrive here in a Hash with UploadIO vals
           if body.is_a?(Hash)
             body.each do |k,v|
-              log('BODY PART:')
+              messages << 'BODY PART:'
               val_content = v.inspect
               if v.is_a?(UploadIO)
                 if v.content_type == 'application/xml'
@@ -384,12 +377,37 @@ module Quickbooks
                   end
                 end
               end
-              log("#{k}: #{val_content}")
+              messages << "#{k}: #{val_content}"
             end
           else
-            log(log_xml(body))
+            messages << log_xml(body)
           end
         end
+        messages
+      end
+
+      def log_response(response)
+        messages = []
+        messages << "------ QUICKBOOKS-RUBY RESPONSE ------"
+        messages << "RESPONSE CODE = #{response.code}"
+        messages.concat(response_body_messages(response))
+        messages << "RESPONSE HEADERS = #{response.headers}" if response.respond_to?(:headers)
+
+        log_multiple(messages)
+      end
+
+      def response_body_messages(response)
+        messages = []
+        messages << "RESPONSE BODY:"
+        if is_json?
+          messages << ">>>>#{response.plain_body.inspect}"
+        elsif is_pdf?
+          messages << "BODY is a PDF : not dumping"
+        else
+          messages << log_xml(response.plain_body)
+        end
+
+        messages
       end
 
       def parse_and_raise_exception(options = {})

data/lib/quickbooks/service/payment.rb

@@ -19,6 +19,12 @@ module Quickbooks
         end
       end
 
+      def pdf(payment)
+        url = "#{url_for_resource(model::REST_RESOURCE)}/#{payment.id}/pdf"
+        response = do_http_raw_get(url, {}, {'Accept' => 'application/pdf'})
+        response.plain_body
+      end
+
       private
 
       def model

data/lib/quickbooks/service/service_crud.rb

@@ -33,7 +33,10 @@ module Quickbooks
         if field.class == Symbol
           field = field.to_s.camelcase
         end
-        q = "select * from %s where %s = '%s'" % [model.resource_for_singular, field, selector]
+
+        clause = Quickbooks::Util::QueryBuilder.new.clause(field, '=', selector)
+        q = "select * from %s where %s" % [model.resource_for_singular, clause]
+
         self.query(q, options)
       end
 

data/lib/quickbooks/util/logging.rb

@@ -5,10 +5,22 @@ module Quickbooks
         ::Quickbooks.log(msg)
       end
 
+      def log_multiple(messages)
+        if condense_logs?
+          log(messages.join("\n"))
+        else
+          messages.each(&method(:log))
+        end
+      end
+
       def log?
         ::Quickbooks.log?
       end
 
+      def condense_logs?
+        ::Quickbooks.condense_logs?
+      end
+
       def log_xml(str)
         if ::Quickbooks.log_xml_pretty_print? && !(str and str.empty?)
           Nokogiri::XML(str).to_xml

data/lib/quickbooks/util/query_builder.rb

@@ -20,6 +20,8 @@ module Quickbooks
                   value.strftime('%Y-%m-%d')
                 when Array
                   value = value.map(&escape_single_quotes)
+                when true, false
+                  value
                 else
                   value = escape_single_quotes.call(value)
                 end
@@ -27,6 +29,8 @@ module Quickbooks
         if operator.downcase == 'in' && value.is_a?(Array)
           value = value.map { |v| "#{VALUE_QUOTE}#{v}#{VALUE_QUOTE}" }
           "#{field} #{operator} (#{value.join(', ')})"
+        elsif value == true || value == false
+          "#{field} #{operator} #{value}"
         else
           "#{field} #{operator} #{VALUE_QUOTE}#{value}#{VALUE_QUOTE}"
         end

data/lib/quickbooks/version.rb

@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "1.0.18"
+  VERSION = "1.0.21"
 
 end

data/lib/quickbooks-ruby.rb

@@ -230,13 +230,18 @@ module Quickbooks
     end
 
     # set logging on or off
-    attr_writer :log, :log_xml_pretty_print
+    attr_writer :log, :log_xml_pretty_print, :condense_logs
 
     # Returns whether to log. Defaults to 'false'.
     def log?
       @log ||= false
     end
 
+    # Returns whether to limit log lines
+    def condense_logs?
+      @condense_logs ||= false
+    end
+
     # pretty printing the xml in the logs is "on" by default
     def log_xml_pretty_print?
       defined?(@log_xml_pretty_print) ? @log_xml_pretty_print : true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.21
 platform: ruby
 authors:
 - Cody Caughlan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -361,7 +375,7 @@ homepage: http://github.com/ruckus/quickbooks-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -376,9 +390,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.7.6.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: REST API to Quickbooks Online
 test_files: []