Reports

lib/quickbooks-ruby.rb

@@ -102,7 +102,7 @@
 require 'quickbooks/model/customer_change'
 require 'quickbooks/model/vendor_change'
 require 'quickbooks/model/item_change'
-require 'quickbooks/model/reports'
+require 'quickbooks/model/report'
 require 'quickbooks/model/credit_memo_change'
 require 'quickbooks/model/payment_change'
 

lib/quickbooks/model/report.rb

@@ -0,0 +1,52 @@
+module Quickbooks
+  module Model
+    class Report < BaseModel
+
+      attr_accessor :xml
+
+      def all_rows
+        @all_rows ||= xml.css("ColData:first-child").map {|node| parse_row(node.parent) }
+      end
+
+      def columns
+        @columns ||= begin
+          nodes = xml.css('Column')
+          nodes.map do |node|
+            # There is also a ColType field, but it does not seem valuable to capture
+            node.at('ColTitle').content
+          end
+        end
+      end
+
+      def find_row(label)
+        all_rows.find {|r| r[0] == label }
+      end
+
+      private
+
+      # Parses the given row:
+      #   <Row type="Data">
+      #     <ColData value="Checking" id="35"/>
+      #     <ColData value="1201.00"/>
+      #     <ColData value="200.50"/>
+      #   </Row>
+      #
+      #  To:
+      #   ['Checking', BigDecimal(1201.00), BigDecimal(200.50)]
+      def parse_row(row_node)
+        row_node.elements.map.with_index do |el, i|
+          value = el.attr('value')
+
+          if i.zero? # Return the first column as a string, its the label.
+            value
+          elsif value.blank?
+            nil
+          else
+            BigDecimal(value)
+          end
+        end
+      end
+
+    end
+  end
+end

lib/quickbooks/service/base_service.rb

@@ -121,13 +121,9 @@ def parse_collection(response, model)
             collection.count = xml.xpath(path_to_nodes).count
             if collection.count > 0
               xml.xpath(path_to_nodes).each do |xa|
-                entry = model.from_xml(xa)
-                addition = xml.xpath(path_to_nodes)[0].xpath("//xmlns:Currency").children.to_s if "#{model::XML_NODE}" == "Reports"
-                entry.currency = addition if "#{model::XML_NODE}" == "Reports"
-                collection.body = response.body if "#{model::XML_NODE}" == "Reports"
-                results << entry
+                results << model.from_xml(xa)
               end
-            end              
+            end
 
             collection.entries = results
           rescue => ex

lib/quickbooks/service/reports.rb

@@ -1,3 +1,4 @@
+# Docs: https://developer.intuit.com/docs/0100_accounting/0400_references/reports
 module Quickbooks
   module Service
     class Reports < BaseService
@@ -16,21 +17,15 @@ def url_for_query(which_report = 'BalanceSheet', date_macro = 'This Fiscal Year-
         end
       end
 
-      def fetch_collection(model, date_macro, object_query, options = {})
-        response = do_http_get(url_for_query(object_query, date_macro, options))
-
-        parse_collection(response, model)
-
-      end
-
       def query(object_query = 'BalanceSheet', date_macro = 'This Fiscal Year-to-date', options = {})
-        fetch_collection(model, date_macro , object_query, options)
+        do_http_get(url_for_query(object_query, date_macro, options))
+        model.new(:xml => @last_response_xml)
       end
 
       private
 
       def model
-        Quickbooks::Model::Reports
+        Quickbooks::Model::Report
       end
 
     end