Specify tracking info adding service name

solidusio-contrib · Nov 20, 2018 · dc9f137 · dc9f137
1 parent 3376cb2
commit dc9f137
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/app/helpers/spree/admin/trackers_helper.rb b/app/helpers/spree/admin/trackers_helper.rb
@@ -2,7 +2,9 @@ module Spree
   module Admin
     module TrackersHelper
       def tracker_types
-        SolidusTrackers::Config[:types].split(' ')
+        SolidusTrackers::Config[:types].map do |type|
+          [type, type.downcase.tr(' ', '_')]
+        end
       end
     end
   end

diff --git a/app/views/spree/shared/_google_analytics.html.erb b/app/views/spree/shared/_google_analytics.html.erb
@@ -1,7 +1,7 @@
-<% tracker = Spree::Tracker.by_type(Spree::Store.default, "analytics") %>
+<% tracker = Spree::Tracker.by_type(Spree::Store.default, 'google_analytics') %>
 
 <% if tracker %>
-  <script id='solidus_trackers_analytics'>
+  <script id='solidus_trackers_google_analytics'>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
       m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

diff --git a/app/views/spree/shared/_google_manager.html.erb b/app/views/spree/shared/_google_manager.html.erb
@@ -1,7 +1,7 @@
-<% tracker = Spree::Tracker.by_type(Spree::Store.default, "manager") %>
+<% tracker = Spree::Tracker.by_type(Spree::Store.default, 'google_manager') %>
 
 <% if tracker %>
-  <script id="solidus_trackers_manager">
+  <script id='solidus_trackers_google_manager'>
     (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
     new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
     j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=

diff --git a/lib/solidus_trackers/configuration.rb b/lib/solidus_trackers/configuration.rb
@@ -1,5 +1,5 @@
 module SolidusTrackers
   class Configuration < Spree::Preferences::Configuration
-    preference :types, :string, default: 'analytics manager'
+    preference :types, :string, default: ['Google Analytics', 'Google Manager']
   end
 end
diff --git a/spec/features/admin/configuration/analytics_tracker_spec.rb b/spec/features/admin/configuration/analytics_tracker_spec.rb
@@ -59,7 +59,7 @@
       create(:tracker, store: store)
 
       visit spree.root_path
-      expect(page).to have_css('#solidus_trackers_analytics', visible: false)
+      expect(page).to have_css('#solidus_trackers_google_analytics', visible: false)
     end
   end
 end