toolhound-ruby 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac12c439640a4d377f3e99d31eea0d39565008b
-  data.tar.gz: 44328718e7c6552d5963cfbd28bb4e281907d2f1
+  metadata.gz: e3355cab98a26569ba55d4bdf0fa290707f3a2aa
+  data.tar.gz: 93e124b2bca52e00418d0b3d4e961629c0a014c9
 SHA512:
-  metadata.gz: 5ffd9081ce59942944a1adf51cabbabf12bb09e312cb1f0f391001fc5b8f8a6ed775ac7f77db371562db2a04a57f2b53037d53fbc63203ee85df5213640c057e
-  data.tar.gz: 528b7821fc1a2c360d99ccb02640432940716a28c716dfcca7d70ad67fa7bd862aff906c8f8bcc911e7f6d2d98538f1860f7d9db6effee31b32eec095584a705
+  metadata.gz: a28e80e89a5e5bea9b54afe1ef51d745c177a2625853eba2f329eba6a9c725184a09873a88c76a9f1de7f6ec4973b2eea49e8e5badc07232869a4651c3fdb128
+  data.tar.gz: c494e807cf7ceb4bac23188ad14be9aa63b2bb48ce67047f49bb4e3d4543603c1660bdb0d5bbafc0ee8f70cce4898f2bb18d9f21289f917438dd020ef5e249ca

data/lib/toolhound-ruby/inventory_item.rb

@@ -66,34 +66,52 @@ module Toolhound
 
     end
 
-    def charges_for_entity(entity_id, job_id=nil)
-      joins = default_joins
+    def charges(options = {})
+      options = (options || {}).dup
+
+      job_id      = options[:job_id]
+      entity_id   = options[:entity_id]
+      order       = options[:order] || "tblInventoryText.varPartNo"
+
+
+      joins                 = default_joins
+      entity_query          = ""
+      charge_entity_query   = ""
+      charge_entity_query1  = ""
+      if entity_id
+        entity_query          = "AND tblRental.intEntityID = '#{entity_id}'"
+        charge_entity_query   = "WHERE rc.intEntityID = '#{entity_id}'"
+        charge_entity_query1  = "WHERE intEntityID = '#{entity_id}'"
+      end
+
       joins << "INNER JOIN tblInventoryType ON tblInventoryType.intInventoryTypeID = tblInventoryItem.intInventoryTypeID AND tblInventoryType.bolSerialized = 1"
       joins << "INNER JOIN(
      	            SELECT tblRentalItem.intInventoryIDID, SUM(tblRentalItem.decTotalRent) AS decTotalRent
        	          FROM tblRentalItem
                   INNER JOIN tblRentalDetail ON tblRentalDetail.intRentalDetailID = tblRentalItem.intRentalDetailID
-                  INNER JOIN tblRental ON tblRental.intRentalID = tblRentalDetail.intRentalID AND tblRental.intEntityID = '#{entity_id}'
+                  INNER JOIN tblRental ON tblRental.intRentalID = tblRentalDetail.intRentalID #{entity_query}
                   GROUP BY tblRentalItem.intInventoryIDID
        ) AS tblRentalQuery ON tblRentalQuery.intInventoryIDID = tblInventoryID.intInventoryIdID"
+
       joins << "LEFT OUTER JOIN (
                   SELECT rc.intInventoryIDID, MAX(rc.intRentalChargeID) AS latest_id
                   FROM tblRentalCharge as rc
-                  WHERE rc.intEntityID = '#{entity_id}'
+                  #{charge_entity_query}
                   GROUP BY rc.intInventoryIDID
         ) AS tblLatestCharge ON tblLatestCharge.intInventoryIDID = tblInventoryID.intInventoryIdID"
+
       joins << "LEFT OUTER JOIN  (
                   SELECT tblRentalCharge.intJobID, tblRentalCharge.intRentalChargeID
                   FROM tblRentalCharge
-                  WHERE intEntityID = '#{entity_id}'
+                  #{charge_entity_query1}
                 ) AS tblJobCharge ON tblJobCharge.intRentalChargeID = tblLatestCharge.latest_id"
+
       joins << "LEFT OUTER JOIN tblJobText on tblJobText.intJobID = tblJobCharge.intJobID AND tblJobText.varLocaleID = '#{locale}'"
 
-      selects = default_selects
+      selects                 = default_selects
       selects[:job_text]      = [:int_job_id, :int_job_text_id, :var_job_number, :var_job]
       selects[:rental_query]  = [:dec_total_rent]
 
-      # (tblInventoryItem.intQOH=@p_QOH  OR @p_QOH  IS NULL)
       wheres = []
       if job_id
         if job_id == :null
@@ -102,20 +120,9 @@ module Toolhound
           wheres << "(tblJobText.intJobID = #{job_id})"
         end
       end
-      build_and_query(selects: selects, where: wheres, joins: joins, order: "tblInventoryText.varPartNo")
-
-      # SELECT tblInventoryItem.*, subquery1.total_rent FROM tblInventoryItem
-      # INNER JOIN tblInventoryID ON tblInventoryItem.intInventoryItemID = tblInventoryID.intInventoryItemID
-      # INNER JOIN tblInventoryItemText ON tblInventoryItemText.intInventoryItemID = tblInventoryItem.intInventoryItemID
-      # INNER JOIN tblInventoryType ON tblInventoryType.intInventoryTypeID = tblInventoryItem.intInventoryTypeID AND tblInventoryType.bolSerialized = 1
-      # INNER JOIN(
-      # 	SELECT tblRentalItem.intInventoryIDID, SUM(tblRentalItem.decTotalRent) AS total_rent
-      # 	FROM tblRentalItem
-      #   INNER JOIN tblRentalDetail ON tblRentalDetail.intRentalDetailID = tblRentalItem.intRentalDetailID
-      #   INNER JOIN tblRental ON tblRental.intRentalID = tblRentalDetail.intRentalID AND tblRental.intEntityID = 100002
-      #
-      #   GROUP BY tblRentalItem.intInventoryIDID
-      # ) AS subquery1 ON subquery1.intInventoryIDID = tblInventoryID.intInventoryIdID
+
+      build_and_query(selects: selects, where: wheres, joins: joins, order: order)
+
     end
 
 

data/lib/toolhound-ruby/version.rb

@@ -1,3 +1,3 @@
 module Toolhound
-  VERSION = "1.0.22"
+  VERSION = "1.0.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolhound-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Markus Klooth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tiny_tds