diff --git a/db/up/find_sessions_2020.sql b/db/up/find_sessions_2020.sql index 2f41c4005..f242e2aad 100644 --- a/db/up/find_sessions_2020.sql +++ b/db/up/find_sessions_2020.sql @@ -158,4 +158,6 @@ CREATE INDEX recorded_videos_user_id_idx ON recorded_videos USING btree (user_id CREATE INDEX music_sessions_user_id_idx ON music_sessions USING btree (user_id); ALTER TABLE users ADD COLUMN used_current_month INT; -ALTER TABLE users ADD COLUMN used_month_play_time INT; \ No newline at end of file +ALTER TABLE users ADD COLUMN used_month_play_time INT; + +ALTER TABLE bands ADD COLUMN school_id INT; \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index cc6c34ff4..0a412facc 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -949,7 +949,7 @@ module JamRuby music_session_user_history.end_history # then update any users that need their user progress updated - if music_session_user_history.duration_minutes > 15 && music_session_user_history.max_concurrent_connections >= 3 + if music_session_user_history.duration_minutes > 15 && music_session_user_history.max_concurrent_connections.to_i >= 3 music_session_user_history.user.update_progression_field(:first_real_music_session_at) end end diff --git a/web/app/controllers/clients_controller.rb b/web/app/controllers/clients_controller.rb index c4a8d0cfb..9ab725c27 100644 --- a/web/app/controllers/clients_controller.rb +++ b/web/app/controllers/clients_controller.rb @@ -19,7 +19,13 @@ class ClientsController < ApplicationController return end - @is_guitar_center = current_user && current_user.is_guitar_center? + if current_user + @is_guitar_center = false #current_user.is_guitar_center? + gon.user_id = current_user.id + gon.user_email = current_user.email + gon.user_name = current_user.name + end + @in_client_page = true @minimal_curtain = Rails.application.config.minimal_curtain gon.recurly_tax_estimate_jam_track_plan = Rails.application.config.recurly_tax_estimate_jam_track_plan diff --git a/web/app/views/layouts/client.html.erb b/web/app/views/layouts/client.html.erb index b0e8de053..e2e00d256 100644 --- a/web/app/views/layouts/client.html.erb +++ b/web/app/views/layouts/client.html.erb @@ -8,6 +8,7 @@ <%= stylesheet_link_tag "client/client", media: "all" %> + <%= include_gon %>