Removed commented legacy @TracKer calls, nil param

Author: scott

app/controllers/admin/posts_controller.rb

@@ -37,11 +37,9 @@ def create
           #@post = Post.new
           case @post.kind
           when "reply"
-            # @tracker.event(category: "Agent: #{current_user.name}", action: "Agent Replied", label: @topic.to_param) #TODO: Need minutes
-            tracker("Agent: #{current_user.name}", "Agent Replied", @topic.to_param, nil) #TODO: Need minutes
+            tracker("Agent: #{current_user.name}", "Agent Replied", @topic.to_param) #TODO: Need minutes
           when "note"
-            # @tracker.event(category: "Agent: #{current_user.name}", action: "Agent Posted Note", label: @topic.to_param) #TODO: Need minutes
-            tracker("Agent: #{current_user.name}", "Agent Posted Note", @topic.to_param, nil) #TODO: Need minutes
+            tracker("Agent: #{current_user.name}", "Agent Posted Note", @topic.to_param) #TODO: Need minutes
           end
           render 'admin/topics/show'
         }

app/controllers/admin/topics_controller.rb

@@ -54,21 +54,17 @@ def index
       topics_raw = topics_raw.where(current_status: @status)
     end
     @topics = topics_raw.page params[:page]
-    # @tracker.event(category: "Admin-Nav", action: "Click", label: @status.titleize)
-    tracker("Admin-Nav", "Click", @status.titleize, nil)
+    tracker("Admin-Nav", "Click", @status.titleize)
   end
 
   def show
     @topic = Topic.where(id: params[:id]).first
     if @topic.current_status == 'new'
-
-      # @tracker.event(category: "Agent: #{current_user.name}", action: "Opened Ticket", label: @topic.to_param, value: @topic.id)
       tracker("Agent: #{current_user.name}", "Opened Ticket", @topic.to_param, @topic.id)
       @topic.open
     end
     @posts = @topic.posts.chronologic
 
-    #@tracker.event(category: "Agent: #{current_user.name}", action: "Viewed Ticket", label: @topic.to_param, value: @topic.id)
     tracker("Agent: #{current_user.name}", "Viewed Ticket", @topic.to_param, @topic.id)
     fetch_counts
   end
@@ -122,9 +118,7 @@ def create
         UserMailer.new_user(@user, @token).deliver_later
 
         # track event in GA
-        # @tracker.event(category: 'Request', action: 'Post', label: 'New Topic')
         tracker('Request', 'Post', 'New Topic')
-        # @tracker.event(category: 'Agent: Unassigned', action: 'New', label: @topic.to_param)
         tracker('Agent: Unassigned', 'New', @topic.to_param)
 
         format.js {
@@ -166,8 +160,7 @@ def update_topic
         @action_performed = "Marked #{params[:change_status].titleize}"
       end
 
-      # Calls to GA for close, reopen, assigned. Inline version of tracker commented
-      # @tracker.event(category: "Agent: #{current_user.name}", action: @action_performed, label: @topic.to_param, value: @minutes)
+      # Calls to GA for close, reopen, assigned.
       tracker("Agent: #{current_user.name}", @action_performed, @topic.to_param, @minutes)
     end
     @posts = @topic.posts.chronologic
@@ -205,7 +198,6 @@ def assign_agent
         @topic.assign(previous_assigned_id, assigned_user.id)
 
         # Calls to GA
-        #@tracker.event(category: "Agent: #{current_user.name}", action: "Assigned to #{assigned_user.name.titleize}", label: @topic.to_param, value: @minutes)
         tracker("Agent: #{current_user.name}", "Assigned to #{assigned_user.name.titleize}", @topic.to_param, @minutes)
       end
       @count = @count + 1

app/controllers/admin/users_controller.rb

@@ -61,15 +61,13 @@ def show
 
     # We still have to grab the first topic for the user to use the same user partial
     @topic = Topic.where(user_id: @user.id).first
-    # @tracker.event(category: "Agent: #{current_user.name}", action: "Viewed User Profile", label: @user.name)
-    tracker("Agent: #{current_user.name}", "Viewed User Profile", @user.name, nil)
+    tracker("Agent: #{current_user.name}", "Viewed User Profile", @user.name)
     render 'admin/topics/index'
   end
 
   def edit
     @user = User.where(id: params[:id]).first
-    # @tracker.event(category: "Agent: #{current_user.name}", action: "Editing User Profile", label: @user.name)
-    tracker("Agent: #{current_user.name}", "Editing User Profile", @user.name, nil)
+    tracker("Agent: #{current_user.name}", "Editing User Profile", @user.name)
   end
 
   def update
@@ -82,8 +80,7 @@ def update
 
     @topics = @user.topics.page params[:page]
     @topic = Topic.where(user_id: @user.id).first
-    # @tracker.event(category: "Agent: #{current_user.name}", action: "Edited User Profile", label: @user.name)
-    tracker("Agent: #{current_user.name}", "Edited User Profile", @user.name, nil)
+    tracker("Agent: #{current_user.name}", "Edited User Profile", @user.name)
 
     # TODO: Refactor this to use an index method/view on the users model
     render 'admin/topics/index'

app/controllers/posts_controller.rb

@@ -51,8 +51,7 @@ def create
           @posts = @topic.posts.ispublic.chronologic.active
           unless @topic.assigned_user_id.nil?
             agent = User.find(@topic.assigned_user_id)
-            # @tracker.event(category: "Agent: #{agent.name}", action: "User Replied", label: @topic.to_param) #TODO: Need minutes
-            tracker("Agent: #{agent.name}", "User Replied", @topic.to_param, nil) #TODO: Need minutes
+            tracker("Agent: #{agent.name}", "User Replied", @topic.to_param) #TODO: Need minutes
           end
         }
       else

app/controllers/topics_controller.rb

@@ -145,9 +145,7 @@ def create
       end
 
       # track event in GA
-      # @tracker.event(category: 'Request', action: 'Post', label: 'New Topic')
       tracker('Request', 'Post', 'New Topic')
-      # @tracker.event(category: 'Agent: Unassigned', action: 'New', label: @topic.to_param)
       tracker('Agent: Unassigned', 'New', @topic.to_param)
 
       if @topic.private?

lib/email_processor.rb

@@ -2,10 +2,7 @@ class EmailProcessor
 
   def initialize(email)
     @email = email
-    Rails.logger.info @email
-    Rails.logger.info "Tracking GA: #{Settings.google_analytics_id}"
-
-    @tracker = Staccato.tracker(Settings.google_analytics_id)
+    @tracker = Staccato.tracker(AppSettings['settings.google_analytics_id'])
   end
 
   def process
@@ -49,6 +46,10 @@ def process
       # Push array of attachments and send to Cloudinary
       handle_attachments(@email, post)
 
+      # Call to GA
+      @tracker.event(category: "Email", action: "Inbound", label: "Forwarded New Topic", non_interactive: true)
+      @tracker.event(category: "Agent: Unassigned", action: "Forwarded New", label: topic.to_param)
+
     else # this is a new direct message
 
       topic = Forum.first.topics.create(:name => subject, :user_id => @user.id, :private => true)