caboose-cms 0.9.163 → 0.9.164

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e81b5e959f5700883248c2a026030e0338423120
-  data.tar.gz: 75d8aa80a958573c030512067944fb4ee92dbbdd
+  metadata.gz: 52112fdba754ce88011e49c74845f1af024a2b5e
+  data.tar.gz: 41cb9e6883c044cadad7c0b4191faca6b95748f0
 SHA512:
-  metadata.gz: d6ced582df9dd50f1d55894c263db7381c295aabb925800663c9e77f8fe3388231bce56149e2dcfd5a4523db49c9f536450bd3b1898fb75f6dfb0dc4d7d0e13f
-  data.tar.gz: e98813ecbc21ea355af831c02e7a1fb92d0da95696e0ac426ac654e2dd2b45cdaee215eb190d22d69ba19ad1aa37fcf00e9cc0421a15e177a059aa85e1aacdba
+  metadata.gz: de344c5b6d5ced5f06c123ac9b1011c235543e264d12d7f8091cdc745253523ceb8d35c8eea4558512a2c1649381204fa3a16565d2cd363a0b43989f09b13a53
+  data.tar.gz: ba17886efa38d8209d992fe469998a8a5182a62f05dd1e12a10f7fb2ae0d92397db1e2bbde34ef0f82dc5340d15d2d263517a4236c31c30972019b3cc51b6b27

data/app/controllers/caboose/invoices_controller.rb

@@ -244,18 +244,16 @@ module Caboose
 
 
       if !params[:game_id].blank?
-        game = Colonnade::Game.find(params[:game_id])
-        menu = Colonnade::Menu.where(:game_id => game.id).first if game
-        invoice_ids = Colonnade::SuiteMenu.where(:menu_id => menu.id).pluq(:invoice_id) if menu
+        menu_ids = Colonnade::Menu.where(:game_id => params[:game_id]).pluq(:id)
+        invoice_ids = Colonnade::SuiteMenu.where(:menu_id => menu_ids).pluq(:invoice_id) if !menu_ids.blank?
+        invoice_ids = invoice_ids.to_s.gsub('[','').gsub(']','')
       end
 
-      where << "(id in (?))" if invoice_ids
-      terms << invoice_ids if invoice_ids
-
+      where3 = params[:game_id].blank? ? 'id is not null' : ( invoice_ids.blank? ? "id is null" : "id in (#{invoice_ids})" )
 
       where2 = where.join(' AND ')
 
-      pdf.invoices = Invoice.where(where2, *terms).all  
+      pdf.invoices = Invoice.where(where2, *terms).where(where3).all  
       if params[:print_card_details]
         pdf.print_card_details = params[:print_card_details].to_i == 1
       end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.163'
+  VERSION = '0.9.164'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.163
+  version: 0.9.164
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg