lib/e9_crm/controller.rb in e9_crm-0.1.30 vs lib/e9_crm/controller.rb in e9_crm-0.1.31

@@ -29,11 +29,11 @@
     # Falls back the the default campaign (typically No Campaign) if the tracking cookie
     # is not associated with a campaign.
     #
     def tracking_campaign
       @_tracking_campaign ||= begin
-        tracking_cookie.code.present? && Campaign.find_by_code(tracking_cookie.code) || Campaign.default
+        tracking_cookie.code.present? && ::Campaign.find_by_code(tracking_cookie.code) || ::Campaign.default
       end
     end
 
     def _user_from_params
       if user_id = params.delete(E9Crm.query_user_id)
@@ -52,11 +52,11 @@
 
         code    = params.delete(E9Crm.query_param)
 
         if hid = cookies[E9Crm.cookie_name]
           E9Crm.log("Installed cookie found: hid(#{hid})")
-          @_tracking_cookie = TrackingCookie.find_by_hid(hid)
+          @_tracking_cookie = ::TrackingCookie.find_by_hid(hid)
 
           unless @_tracking_cookie
             # This should only happen in developemnt, as it means the cookie has been
             # installed then removed from the database.
             E9Crm.log("Installed cookie's hash id does not match any stored cookies!")
@@ -80,11 +80,11 @@
                 E9Crm.log("Cookie has no user, setting as user from params (#{_user_from_params.id})")
                 attrs[:user] = _user_from_params
               end
             end
 
-            if code.present? && code != @_tracking_cookie.code && Campaign.find_by_code(code)
+            if code.present? && code != @_tracking_cookie.code && ::Campaign.find_by_code(code)
               E9Crm.log "Code present and cookie code(#{@_tracking_cookie.code}) does not match (#{code}), changing..."
               attrs[:code] = code
 
               E9Crm.log "Cookie marked as new"
               session[:new_visit] = true
@@ -100,10 +100,10 @@
         end
 
         @_tracking_cookie ||= begin
           session[:new_visit] = true
 
-          TrackingCookie.create(:code => code, :user => current_user || _user_from_params).tap do |cookie|
+          ::TrackingCookie.create(:code => code, :user => current_user || _user_from_params).tap do |cookie|
             E9Crm.log "Installing new cookie (#{E9Crm.cookie_name} : #{cookie.hid})"
             cookies.permanent[E9Crm.cookie_name] = cookie.hid
           end
         end