From eba9afab045ab4cd71df42c59d4e631b9fa7ef56 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 15 May 2015 15:30:15 -0500 Subject: [PATCH] * fix bug in ability to open JamTrack --- web/app/assets/javascripts/dialog/openJamTrackDialog.js | 2 +- web/app/assets/javascripts/redeem_complete.js | 5 ++--- web/app/helpers/sessions_helper.rb | 1 + web/spec/features/products_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/app/assets/javascripts/dialog/openJamTrackDialog.js b/web/app/assets/javascripts/dialog/openJamTrackDialog.js index 3dd131e41..867314632 100644 --- a/web/app/assets/javascripts/dialog/openJamTrackDialog.js +++ b/web/app/assets/javascripts/dialog/openJamTrackDialog.js @@ -89,7 +89,7 @@ rest.openJamTrack({id: context.JK.CurrentSessionModel.id(), jam_track_id: jamTrack.id}) .done(function(response) { $dialog.data('result', {success:true, jamTrack: jamTrack}) - context.JK.CurrentSessionModel.updateSession(response);s + context.JK.CurrentSessionModel.updateSession(response); app.layout.closeDialog('open-jam-track-dialog'); }) .fail(function(jqXHR) { diff --git a/web/app/assets/javascripts/redeem_complete.js b/web/app/assets/javascripts/redeem_complete.js index 5f93cd4ce..6d5ec9a3d 100644 --- a/web/app/assets/javascripts/redeem_complete.js +++ b/web/app/assets/javascripts/redeem_complete.js @@ -140,9 +140,8 @@ $jamTrackInBrowser.removeClass('hidden'); app.user().done(function(user) { - // cut off time - var cutoff = new Date("May 8, 2015 00:00:00"); - if(new Date(user.created_at).getTime() < cutoff.getTime()) { + // relative to 1 day ago (24 * 60 * 60 * 1000) + if(new Date(user.created_at).getTime() < new Date().getTime() - 86400000) { logger.debug("existing user recorded") context.JK.GA.virtualPageView('/redeemInBrowserExistingUser'); } diff --git a/web/app/helpers/sessions_helper.rb b/web/app/helpers/sessions_helper.rb index 6e6cb7c7b..a5e914512 100644 --- a/web/app/helpers/sessions_helper.rb +++ b/web/app/helpers/sessions_helper.rb @@ -95,6 +95,7 @@ module SessionsHelper redirect_location = signup_hint.redirect_location end + cookies[:new_user] = { musician: user.musician, registrationType: user.user_authorization('facebook') ? 'Facebook' : 'Native', want_jamblaster: want_jamblaster, redirect_location: redirect_location }.to_json end diff --git a/web/spec/features/products_spec.rb b/web/spec/features/products_spec.rb index 37afb0df8..98f1ce38a 100644 --- a/web/spec/features/products_spec.rb +++ b/web/spec/features/products_spec.rb @@ -52,7 +52,7 @@ describe "Product Pages", :js => true, :type => :feature, :capybara_feature => t click_button "SIGN IN" end - # should be back at the jamblaster product page, and told we placed our order + # should be back loat the jamblaster product page, and told we placed our order find('h1', text: 'The JamBlaster by JamKazam') find('#banner h1', text: 'virtual order placed')