From 1e7b00a553bd6e33eef2cc8060ee0a7842ea5b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Mon, 30 Oct 2017 16:02:02 +0100
Subject: [PATCH] Changing a bit the analytics api

---
 app/coffee/modules/auth.coffee             |  2 -
 app/coffee/modules/common/analytics.coffee | 60 ++++++++++++++--------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee
index 2d55330e..e8e73a41 100644
--- a/app/coffee/modules/auth.coffee
+++ b/app/coffee/modules/auth.coffee
@@ -343,7 +343,6 @@ RegisterDirective = ($auth, $confirm, $location, $navUrls, $config, $routeParams
 
         onSuccessSubmit = (response) ->
             $analytics.trackEvent("auth", "register", "user registration", 1)
-            $analytics.addEcStep("register", null, null)
 
             if $scope.nextUrl.indexOf('http') == 0
                 $window.location.href = $scope.nextUrl
@@ -534,7 +533,6 @@ InvitationDirective = ($auth, $confirm, $location, $config, $params, $navUrls, $
         onSuccessSubmitRegister = (response) ->
             $analytics.trackEvent("auth", "invitationAccept", "invitation accept with new user", 1)
             $analytics.trackEvent("auth", "register", "user registration", 1)
-            $analytics.addEcStep("register", null, null)
 
             $location.path($navUrls.resolve("project", {project: $scope.invitation.project_slug}))
             $confirm.notify("success", "You've successfully joined this project",
diff --git a/app/coffee/modules/common/analytics.coffee b/app/coffee/modules/common/analytics.coffee
index 0d146f96..cb3d9737 100644
--- a/app/coffee/modules/common/analytics.coffee
+++ b/app/coffee/modules/common/analytics.coffee
@@ -85,7 +85,7 @@ class AnalyticsService extends taiga.Service
 
         @win.ga("send", "event", category, action, label, value)
 
-    addEcStep: (step) ->
+    ecStep: (step) ->
         return if not @.initialized
         return if not @win.ga
 
@@ -100,21 +100,11 @@ class AnalyticsService extends taiga.Service
         else if step == "plan-changed"
             stepId = 5
 
-        @win.ga('ec:setAction','checkout', {
-            'step': stepId,
-        })
-        @.trackEvent("ecommerce", "add-step", step, stepId)
 
-    addEcImpression: (plan, page, position) ->
+    ecViewPlan: (plan) ->
         return if not @.initialized
         return if not @win.ga
 
-        @win.ga('ec:addImpression', {
-           'id': plan.plan_id,
-           'name': plan.name,
-           'list': page,
-           'position': position,
-        })
         @win.ga('ec:addProduct', {
             'id': plan.plan_id,
             'name': plan.name,
@@ -123,6 +113,35 @@ class AnalyticsService extends taiga.Service
             'position': 1,
         })
         @win.ga('ec:setAction','detail')
+        @.trackEvent("ecommerce", "view-product-detail", plan.name, plan.plan_id)
+
+    ecClickPlan: (plan) ->
+        return if not @.initialized
+        return if not @win.ga
+
+        @win.ga('ec:addProduct', {
+            'id': plan.plan_id,
+            'name': plan.name,
+            'category': "plans",
+            'quantity': 1,
+            'position': 1,
+        })
+        @win.ga('ec:setAction','click')
+        @.trackEvent("ecommerce", "click-product", plan.name, plan.plan_id)
+
+    ecListPlans: ([plans], page) ->
+        return if not @.initialized
+        return if not @win.ga
+
+        position = 1
+        for plan in plans
+            @win.ga('ec:addImpression', {
+               'id': plan.plan_id,
+               'name': plan.name,
+               'list': page,
+               'position': position,
+            })
+            position++
         @.trackEvent("ecommerce", "add-impression", plan.name, plan.plan_id)
 
     addEcClickProduct: (plan) ->
@@ -139,7 +158,7 @@ class AnalyticsService extends taiga.Service
         @win.ga('ec:setAction','click')
         @.trackEvent("ecommerce", "add-click", plan.name, plan.plan_id)
 
-    addEcProduct: (plan_id, plan_name, plan_price) ->
+    ecAddToCart: (plan_id, plan_name, plan_price) ->
         return if not @.initialized
         return if not @win.ga
 
@@ -153,6 +172,11 @@ class AnalyticsService extends taiga.Service
         })
         @win.ga('ec:setAction','add')
         @win.ga('send', 'event', 'add-to-cart', 'Collect Payment Info')
+
+    ecConfirmChange: (plan_id, plan_name, plan_price) ->
+        return if not @.initialized
+        return if not @win.ga
+
         @win.ga('ec:addProduct', {
             'id': plan_id,
             'name': plan_name,
@@ -163,10 +187,12 @@ class AnalyticsService extends taiga.Service
         })
         @.addEcStep("confirm-plan")
 
-    addEcPurchase: (plan_id, plan_name, plan_price) ->
+    ecPurchase: (plan_id, plan_name, plan_price) ->
         return if not @.initialized
         return if not @win.ga
 
+        @.addEcStep("plan-changed")
+
         @win.ga('ec:addProduct', {
             'id': plan_id,
             'name': plan_name,
@@ -181,10 +207,4 @@ class AnalyticsService extends taiga.Service
         })
         @win.ga('send', 'event', 'checkout', 'Plan checkout')
 
-    setEcAction: (action, page) ->
-        @win.ga('ec:setAction', action, {
-            'list': page
-        })
-        @.trackEvent("ecommerce", "set-action", (action+page), 0)
-
 module.service("$tgAnalytics", AnalyticsService)