caboose-cms 0.9.78 → 0.9.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8ecb4c9c7e4d56f905c869c54528bd6a5e56bb
-  data.tar.gz: d06492e063533258dec0dc43503e8fb79f48c3b4
+  metadata.gz: 9f3eaff5231a8427c3a7aded0962b8235f691469
+  data.tar.gz: 236c9aa46e964d9bebda96b2a327dfb82a3a0504
 SHA512:
-  metadata.gz: 906e2228f18312dae8e8cd7ba76834f307d0a69916fb9ceabba7d205d6e40f5b87237298f96b9a696cc2ca60e0c0eb3e8fcde555783d8749294ec13b9d55a874
-  data.tar.gz: e7fbad86da05e316c13f7aa385d0b08067296462d571f55ff60b75a3873cd996ddabe4a303460e1813d2310094cbd192e0fccf2a645f560237a0e8311a3d47ee
+  metadata.gz: 4d41728c2a73aacfc41bc3bc003be46dcf39162a3500afd6452173283bcd58331fc420856903edf62ada192fa8e58f60f336095f28d4ca0ee3a93d2f0f5bdfe9
+  data.tar.gz: 4cad9ad3fd7c2dba703f19160aef157fb785d7fd9c570c34e87b6d57d463b62b2b3f70d4496238e106ade965fc4764104a100e9b31cb5aae3e489cac023c9604

data/app/controllers/caboose/invoices_controller.rb

@@ -67,7 +67,7 @@ module Caboose
         :date_logged    => DateTime.now.utc,
         :invoice_action => InvoiceLog::ACTION_INVOICE_CREATED                        
       )
-      if !params[:colonnade_game_id].blank? && defined?(Colonnade::Campus) && Colonnade::Campus.where(:site_id => @site.id).exists?
+      if !params[:colonnade_game_id].blank? && Colonnade::SuiteMenu.respond_to?(:to_s) && Colonnade::Campus.where(:site_id => @site.id).exists?
         game = Colonnade::Game.where(:id => params[:colonnade_game_id], :site_id => @site.id).first
         menu = Colonnade::Menu.where(:game_id => game.id, :site_id => @site.id).first if game
         user = Caboose::User.where(:site_id => @site.id, :id => params[:colonnade_user_id]).first
@@ -298,6 +298,7 @@ module Caboose
       return if !user_is_allowed('invoices', 'edit')
       invoice = Invoice.find(params[:id])
       invoice.delay(:queue => 'caboose_store').send_payment_authorization_email
+    #  invoice.send_payment_authorization_email
       render :json => { :success => true }
     end
     
@@ -305,7 +306,8 @@ module Caboose
     def admin_send_receipt
       return if !user_is_allowed('invoices', 'edit')
       invoice = Invoice.find(params[:id])
-      invoice.delay(:queue => 'caboose_store').send_receipt_email      
+      invoice.delay(:queue => 'caboose_store').send_receipt_email
+    #  invoice.send_receipt_email        
       render :json => { :success => true }
     end
     

data/app/views/caboose/invoices/admin_new.html.erb

@@ -2,7 +2,7 @@
 
 <p>This will create a new invoice that you can populate and then send to the customer for payment.</p>
 
-<% if defined?(Colonnade::Campus) && Colonnade::Campus.where(:site_id => @site.id).exists? %>
+<% if Colonnade::Campus.respond_to?(:to_s) && Colonnade::Campus.where(:site_id => @site.id).exists? %>
 <form id="colonnade_info">
 	<h5>Game</h5>
 	<select name="colonnade_game_id" id="colonnade_game_id">
@@ -44,7 +44,7 @@ function create_invoice()
   $.ajax({
     url: '/admin/invoices',
     type: 'post',
- <% if defined?(Colonnade::Campus) && Colonnade::Campus.where(:site_id => @site.id).exists? %>
+ <% if Colonnade::Campus.respond_to?(:to_s) && Colonnade::Campus.where(:site_id => @site.id).exists? %>
  		data: { 
  			colonnade_game_id: $('#colonnade_game_id').val(),
  			colonnade_suite_id: $('#colonnade_suite_id').val(),

data/app/views/caboose/invoices_mailer/customer_payment_authorization.html.erb

@@ -15,14 +15,15 @@ logo = logo.gsub('//','https://') if !logo.nil?
 	<p><%== @invoice.site.store_config.download_instructions %></p>
 <% end %>
 
-<% if defined?(Colonnade::SuiteMenu) %>
-	<%
-	sm = Colonnade::SuiteMenu.where(:invoice_id => @invoice.id).first
-	game = sm.menu.game if sm && sm.menu
-	%>
-	<% if game %>
-		<p>Game: <%= game.opponent %> on <%= game.date.strftime('%B %-d, %Y') %></p>
-	<% end %> 
+
+<% if Colonnade::SuiteMenu.respond_to?(:to_s) %>
+  <%
+  sm = Colonnade::SuiteMenu.where(:invoice_id => @invoice.id).first
+  game = sm.menu.game if sm && sm.menu
+  %>
+  <% if game %>
+    <p>Game: <%= game.opponent %> on <%= game.date.strftime('%B %-d, %Y') %></p>
+  <% end %> 
 <% end %>
 
 <table border='1' style='border-collapse: collapse;'>

data/app/views/caboose/invoices_mailer/customer_receipt.html.erb

@@ -9,7 +9,7 @@ logo = logo.gsub('//','https://') if !logo.nil?
 
 <p>Your invoice number #<%= @invoice.id %> has been paid.</p>
 
-<% if defined?(Colonnade::SuiteMenu) %>
+<% if Colonnade::SuiteMenu.respond_to?(:to_s) %>
   <%
   sm = Colonnade::SuiteMenu.where(:invoice_id => @invoice.id).first
   game = sm.menu.game if sm && sm.menu

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.78'
+  VERSION = '0.9.79'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.78
+  version: 0.9.79
 platform: ruby
 authors:
 - William Barry