diff --git a/web/app/assets/javascripts/web/tracking.js.coffee b/web/app/assets/javascripts/web/tracking.js.coffee index b3fb626f4..8186066de 100644 --- a/web/app/assets/javascripts/web/tracking.js.coffee +++ b/web/app/assets/javascripts/web/tracking.js.coffee @@ -10,25 +10,23 @@ class Tracking @rest = new context.JK.Rest(); adTrack: (app) => - utmSource = $.QueryString['utm_source'] - if utmSource == 'facebook-ads' || utmSource == 'google-ads' || utmSource == 'twitter-ads' || utmSource == 'affiliate' || utmSource == 'pr' - if !context.jamClient.IsNativeClient() - if context.JK.currentUserId? - app.user().done( (user) => - # 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('/landing/jamtracks/existing-user/'); - else - @logger.debug("new user recorded") - context.JK.GA.virtualPageView('/landing/jamtracks/new-user/') - ) - else - @logger.debug("new user recorded") - context.JK.GA.virtualPageView('/landing/jamtracks/new-user/') - else - @logger.debug("existing user recorded") - context.JK.GA.virtualPageView('/landing/jamtracks/existing-user/'); + if !context.jamClient.IsNativeClient() + if context.JK.currentUserId? + app.user().done( (user) => + # 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('/landing/jamtracks/existing-user/'); + else + @logger.debug("new user recorded") + context.JK.GA.virtualPageView('/landing/jamtracks/new-user/') + ) + else if $.cookie('jamkazam_user')? + @logger.debug("existing/logged out user") + context.JK.GA.virtualPageView('/landing/jamtracks/existing-user/') + else + @logger.debug("new user recorded") + context.JK.GA.virtualPageView('/landing/jamtracks/new-user/') jamtrackBrowseTrack: (app) => if context.JK.currentUserId? diff --git a/web/app/helpers/sessions_helper.rb b/web/app/helpers/sessions_helper.rb index 8ce8f71f2..553ad5233 100644 --- a/web/app/helpers/sessions_helper.rb +++ b/web/app/helpers/sessions_helper.rb @@ -2,6 +2,7 @@ module SessionsHelper def sign_in(user) set_remember_token(user) + set_jamkazam_user_cookies set_purchased_jamtrack_cookie unless user.has_redeemable_jamtrack self.current_user = user end @@ -27,6 +28,10 @@ module SessionsHelper cookies.permanent[:redeemed_jamtrack] = true end + def set_jamkazam_user_cookies + cookies.permanent[:jamkazam_user] = true + end + def complete_sign_in(user, redirect=true) sign_in user