toolhound-ruby 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10b0a155efcae695fcc9306c753f85d6b25c0cf4
-  data.tar.gz: c508cd06bd9564ebb87efb7b5e0489f617500b94
+  metadata.gz: 53126038ede3803fb0ae8de7c4ad8a0f8664bba8
+  data.tar.gz: 2e9847e4abe3aa0986cfd4253e52a098feca87ee
 SHA512:
-  metadata.gz: 881c8e61a0b30456ecaae20e141353ccdf789d395b01d766e11b082595d08479e8121801ac0c36509d2674c00dfcd6533865be23bbfc079e3b24591b17173e4d
-  data.tar.gz: 62bf45e81b5f5161169d6da040bfa3b4feb7e08f9bc1bdf15fcda82e38e7f067617ea84e09d1a8f524ee614645839e7f749f3f3be4c59a59cd736fedad091821
+  metadata.gz: a9b9406b193741830c11e7d68d11975eda1958b4a9d4a8f74c4987dcb0fdd4e60150e781db3c5ec65a1c27beb2e27da4289696107d65e4d852b0a4df4e90df24
+  data.tar.gz: bfe4e05305086edc36c6ae96c48fd4140e11ac53635e3748cd3542e4b606389b5addeea619093615c7764743e45e44bf32c702a2173467aeb35b96b5c58df642

data/lib/toolhound-ruby/base.rb

@@ -360,6 +360,10 @@ module Toolhound
     end
 
     def parse_time(date)
+      if date.is_a?(String)
+        date = Time.parse(date)
+      end
+
       date = date.utc if date.respond_to?(:utc)
 
       date.strftime(DATE_TIME_FORMAT)

data/lib/toolhound-ruby/rental_charge.rb

@@ -46,7 +46,11 @@ module Toolhound
       all(where: [{"rental_detail.int_rental_id" => id}])
     end
 
-    def for_entity_over_period(entity_id, from, to)
+    def for_entity_over_period(options)
+      entity_id     = options.delete :entity_id
+      from          = options.delete :from
+      to            = options.delete :to
+
       joins = []
       joins << "LEFT OUTER JOIN tblRentalItem ON tblRentalItem.intRentalItemID = tblRentalCharge.intRentalItemID"
       joins << "LEFT OUTER JOIN tblRentalDetail ON tblRentalDetail.intRentalDetailID = tblRentalItem.intRentalDetailID"
@@ -56,12 +60,15 @@ module Toolhound
       joins << "INNER JOIN tblInventoryText ON tblInventory.intInventoryID = tblInventoryText.intInventoryID"
 
       wheres = [
-        {"rental_charge.int_entity_id" => entity_id},
         {"inventory.bol_deleted" => 0},
         {"inventory.bol_is_active" => 1},
         {"inventory_text.var_locale_id" => locale},
-        {dte_end_date: {value: [from, to], op: :between} }
       ]
+
+      wheres << {"rental_charge.int_entity_id" => entity_id}  if entity_id.present?
+      wheres << {dte_end_date: {value: [parse_time(from), parse_time(to)], op: :between} } if from.present? && to.present?
+
+
       selects = {
         rental_charge: [
           :int_rental_charge_id, :int_entity_id, :int_qty, :dec_total, :var_type, :int_inventory_id_id,

data/lib/toolhound-ruby/transaction.rb

@@ -93,7 +93,7 @@ module Toolhound
       wheres  = []
       wheres << {"transaction_type.bol_return" => 'true'}
 
-      wheres << {"transaction.int_entity_id" => entity_id}                                  if entity_id
+      wheres << {"transaction.int_entity_id" => entity_id}                                  if entity_id.present?
       wheres << "tblTransaction.dteTransactionDate BETWEEN '#{parse_time(from_date)}' AND '#{parse_time(to_date)}'" if from_date && to_date
       wheres << "(tblReturnStatus.bolCreateWO = 1 OR tblReturnStatus.bolRetire = 1)"        if damaged_only == true
 

data/lib/toolhound-ruby/version.rb

@@ -1,3 +1,3 @@
 module Toolhound
-  VERSION = "1.0.16"
+  VERSION = "1.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolhound-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Markus Klooth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tiny_tds