toolhound-ruby 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9bb19365bad8211a21cb1236ab9dd44ec5b567e
-  data.tar.gz: 916ecdf9c5d21387356a34ff121fe61acef0f4f8
+  metadata.gz: 1e25f7d284dc16bf2579fc28b625acdfd9b20c6c
+  data.tar.gz: 97b1eb6e9957db0a2dc779819b9a604a3e4672c8
 SHA512:
-  metadata.gz: a1e885e703b4cef7a1f0a883371bb44aa19f8287f8c3930cf0f6d69d0089f5b40a796056acdc5c62ab2d519ddb7decf0316146f9d78993eb0fb50ee96fcb5d6e
-  data.tar.gz: cd6fc6df1e56709ddc7f75ab40e7c932f53070c7f4dbbab6ea00f9ae545f2d552f6d3e5f4617dc01cd16c648b3481e77eb9c1ee80947b3e017b736a11c2e255d
+  metadata.gz: a99563ca92facb61c3e517025cfbabdcbeec63e24a63e3ff7e500e0b7078928cd9df92fd4cfd41d846cef5c7d1bf0b4dee6f5a74225ec49559288b8261f0900d
+  data.tar.gz: c86f5cf485f36bc7011bb9d87f6f3315b5b051921d9c39a080b5b5343f3e8b01c3862d66e5abbd411c2f021e1c9f58e2bf1789b09e193a0cb0425408b98e9384

data/lib/toolhound-ruby/project.rb

@@ -13,7 +13,12 @@ module Toolhound
       {
         location:       [:int_location_id, :dte_created_date, :dte_modified_date],
         location_text:  [:var_location_name],
-        entity:         [:int_entity_id, var_entity_id: :job_no ]
+        entity:         [:int_entity_id, var_entity_id: :job_no ],
+        # tax rates
+        tax:            [:dec_tax1_rate, :dec_tax2_rate, :dec_tax3_rate, :dec_tax4_rate],
+        tax_text:       [:var_tax1_description, :var_tax2_description, :var_tax3_description, :var_tax4_description],
+        # rental periods
+        rental_period:  [:dte_min_rental_date, :dte_max_rental_date]
       }
     end
 
@@ -21,7 +26,17 @@ module Toolhound
       arr = []
       arr << "INNER JOIN tblEntity ON (tblEntity.intEntityID = tblLocation.intEntityID)"
       arr << "INNER JOIN tblLocationText ON (tblLocationText.intLocationID = tblLocation.intLocationID)"
-
+      # tax rates
+      arr << "LEFT OUTER JOIN (
+                SELECT intLocationID, MAX(tblTax.dteCreatedDate) AS max_date FROM tblTax GROUP BY intLocationID
+              ) as taxQuery ON taxQuery.intLocationID = tblLocation.intLocationID"
+      arr << "LEFT OUTER JOIN tblTax ON tblTax.intLocationID = taxQuery.intLocationID AND tblTax.dteCreatedDate = taxQuery.max_date"
+      arr << "LEFT OUTER JOIN tblTaxText ON tblTaxText.intTaxID = tblTax.intTaxID AND tblTaxText.varLocaleID = '#{locale}'"
+
+      # rental periods
+      arr << "LEFT OUTER JOIN (
+	             SELECT intEntityID, MIN(dteStartDate) as dteMinRentalDate, MAX(dteStartDate) AS dteMaxRentalDate FROM tblRentalCharge GROUP BY intEntityID
+             ) AS tblRentalPeriod ON tblRentalPeriod.intEntityID = tblEntity.intEntityID"
       arr
     end
 

data/lib/toolhound-ruby/rental_charge.rb

@@ -39,7 +39,7 @@ module Toolhound
         ]
       }
 
-      build_and_query(selects: selects, where: [{int_entity_id: entity_id}])
+      build_and_query(selects: selects, where: [{int_entity_id: entity_id}]).first
     end
 
     def find_by_rental_id(id)

data/lib/toolhound-ruby/version.rb

@@ -1,3 +1,3 @@
 module Toolhound
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toolhound-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Markus Klooth