spree_analytics_trackers 1.0.1 → 2.1.1

data/app/models/spree_analytics_trackers/user_decorator.rb

@@ -0,0 +1,9 @@
+module SpreeAnalyticsTrackers
+  module UserDecorator
+    def analytics_id
+      id
+    end
+  end
+end
+
+::Spree.user_class.prepend(::SpreeAnalyticsTrackers::UserDecorator)

data/app/overrides/add_analytics_to_admin_sidebar.rb

@@ -1,9 +1,8 @@
 if Gem.loaded_specs['spree_core'].version >= Gem::Version.create('3.5.0')
   Deface::Override.new(
     virtual_path: 'spree/admin/shared/sub_menu/_configuration',
-    name: 'add_analytics_to_admin_configurations_sidebar_menu',
+    name: 'add_analytics_to_admin_sidebar',
     insert_bottom: '[data-hook="admin_configurations_sidebar_menu"]',
-    original: '72f6a33afb2627a467ae458d42991ab0ce4cc6df',
-    text: '<%= configurations_sidebar_menu_item(Spree.t(:analytics_trackers), spree.admin_trackers_path) if can? :manage, Spree::Tracker %>'
+    partial: 'spree/admin/shared/analytics_sidebar_menu'
   )
 end

data/app/overrides/add_cart_viewed_to_orders_edit.rb

@@ -3,7 +3,7 @@ unless spree_version >= Gem::Version.create('3.4.0') && spree_version < Gem::Ver
   Deface::Override.new(
     virtual_path: 'spree/orders/edit',
     name: 'add_cart_viewed_to_orders_edit',
-    insert_top: "[data-hook='cart_container']",
+    insert_top: '[data-hook="cart_container"]',
     partial: 'spree/shared/trackers/segment/cart_viewed.js',
     original: 'e0a3dcdf759c4ec9fad085cd8a5360c8d68167f5'
   )

data/app/overrides/add_checkout_step_viewed_to_checkout_edit.rb

@@ -2,9 +2,17 @@ spree_version = Gem.loaded_specs['spree_core'].version
 unless spree_version >= Gem::Version.create('3.4.0') && spree_version < Gem::Version.create('3.5.0')
   Deface::Override.new(
     virtual_path: 'spree/checkout/edit',
-    name: 'add_checkout_step_viewed_to_checkout_edit',
-    insert_bottom: "[data-hook='checkout_summary_box']",
+    name: 'add_segment_checkout_step_viewed_to_checkout_edit',
+    insert_after: '[data-hook="checkout_content"]',
     partial: 'spree/shared/trackers/segment/checkout_step_viewed.js',
-    original: 'f7b787e3485b705d0373e248361fcb590a45478e' 
+    original: '806d2120a1ca1050fb093962fee10363c0944b0a'
+  )
+
+  Deface::Override.new(
+    virtual_path: 'spree/checkout/edit',
+    name: 'add_ga_checkout_step_viewed_to_checkout_edit',
+    insert_after: '[data-hook="checkout_content"]',
+    partial: 'spree/shared/trackers/google_analytics/checkout_step_viewed.js',
+    original: '0ac5c18a2db215bf8ba30470a0e5d69e00d0313a'
   )
 end

data/app/overrides/add_google_analytics_page_view_to_spree_application.rb

@@ -0,0 +1,10 @@
+spree_version = Gem.loaded_specs['spree_core'].version
+unless spree_version >= Gem::Version.create('3.3.0') && spree_version < Gem::Version.create('3.5.0') && spree_version != Gem::Version.create('3.5.0.alpha')
+  Deface::Override.new(
+    virtual_path: 'spree/shared/_head',
+    name: 'add_google_analytics_page_viewed_to_spree_application',
+    insert_before: 'meta',
+    partial: 'spree/shared/trackers/google_analytics/page_viewed.js',
+    original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
+  )
+end

data/app/overrides/add_google_analytics_to_spree_application.rb

@@ -1,9 +1,9 @@
 if Gem.loaded_specs['spree_core'].version >= Gem::Version.create('3.5.0.alpha')
   Deface::Override.new(
-    virtual_path: 'spree/layouts/spree_application',
-    name: 'add_google_analytics_to_spree_application',
-    insert_top: "[data-hook='body']",
-    partial: 'spree/shared/google_analytics',
+    virtual_path: 'spree/shared/_head',
+    name: 'add_google_analytics_initializer_to_spree_application',
+    insert_after: 'title',
+    partial: 'spree/shared/trackers/google_analytics/initializer.js',
     original: 'cfa30a2831d9a41394c03229cd28b3c7eee69585'
   )
 end

data/app/overrides/add_google_purchase_to_orders_show.rb

@@ -3,7 +3,7 @@ if Gem.loaded_specs['spree_core'].version >= Gem::Version.create('3.5.0')
     virtual_path: 'spree/orders/show',
     name: 'add_google_purchase_to_orders_show',
     insert_before: "#order_summary",
-    partial: 'spree/shared/google_purchase',
+    partial: 'spree/shared/trackers/google_analytics/purchase.js',
     original: 'ac7f302922a3c1bb080095296ccc20e42bab2967' 
   )
 end

data/app/overrides/add_product_list_filtered_to_taxons_show.rb

@@ -1,7 +1,7 @@
 spree_version = Gem.loaded_specs['spree_core'].version
 unless spree_version >= Gem::Version.create('3.4.0') && spree_version < Gem::Version.create('3.5.0')
   Deface::Override.new(
-    virtual_path: 'spree/taxons/show',
+    virtual_path: 'spree/taxons/_header',
     name: 'add_product_list_filtered_to_taxons_show',
     insert_before: ".taxon-title",
     original: '2d71d85f4cb141a6ff90264e48915493d6856e9b',

data/app/overrides/add_product_list_viewed_to_products_list.rb

@@ -3,7 +3,7 @@ unless spree_version >= Gem::Version.create('3.4.0') && spree_version < Gem::Ver
   Deface::Override.new(
     virtual_path: 'spree/shared/_products',
     name: 'add_product_list_viewed_to_products_list',
-    insert_before: "[data-hook='products_search_results_heading']",
+    insert_before: '[data-hook="homepage_products"]',
     partial: 'spree/shared/trackers/segment/product_list_viewed.js',
     original: '8b47dddca9dfaaacca3d462459c6c1ef06c09926' 
   )

data/app/overrides/add_product_viewed_to_products_show.rb

@@ -3,8 +3,8 @@ unless spree_version >= Gem::Version.create('3.4.0') && spree_version < Gem::Ver
   Deface::Override.new(
     virtual_path: 'spree/products/show',
     name: 'add_product_viewed_to_products_show',
-    insert_before: "[data-hook='product_show']",
+    insert_bottom: '[data-hook="product_show"]',
     partial: 'spree/shared/trackers/segment/product_viewed.js',
-    original: '5426c263ccfe477b270b55024abebc77cf951c91' 
+    original: '5426c263ccfe477b270b55024abebc77cf951c91'
   )
 end

data/app/overrides/add_products_searched_to_products_list.rb

@@ -1,9 +1,9 @@
 spree_version = Gem.loaded_specs['spree_core'].version
 unless spree_version >= Gem::Version.create('3.4.0') && spree_version < Gem::Version.create('3.5.0')
   Deface::Override.new(
-    virtual_path: 'spree/shared/_products',
+    virtual_path: 'spree/products/index',
     name: 'add_products_searched_to_products_list',
-    insert_before: "[data-hook='products_search_results_heading']",
+    insert_before: '[data-hook="search_results"]',
     partial: 'spree/shared/trackers/segment/products_searched.js',
     original: '8b47dddca9dfaaacca3d462459c6c1ef06c09926' 
   )

data/app/overrides/add_segment_initializer_to_layout.rb

@@ -1,10 +1,10 @@
 spree_version = Gem.loaded_specs['spree_core'].version
 unless spree_version >= Gem::Version.create('3.3.0') && spree_version < Gem::Version.create('3.5.0') && spree_version != Gem::Version.create('3.5.0.alpha')
   Deface::Override.new(
-    virtual_path: 'spree/layouts/spree_application',
+    virtual_path: 'spree/shared/_head',
     name: 'add_segment_initializer_to_layout',
-    insert_top: "[data-hook='body']",
+    insert_after: 'title',
     partial: 'spree/shared/trackers/segment/initializer.js',
-    original: '26b91c1073b75c93c9e9c89b1f0a6f52ef29a8f9'
+    original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
   )
 end

data/app/overrides/add_segment_page_viewed_to_layout.rb

@@ -0,0 +1,10 @@
+spree_version = Gem.loaded_specs['spree_core'].version
+unless spree_version >= Gem::Version.create('3.3.0') && spree_version < Gem::Version.create('3.5.0') && spree_version != Gem::Version.create('3.5.0.alpha')
+  Deface::Override.new(
+    virtual_path: 'spree/shared/_head',
+    name: 'add_segment_page_tracker_to_body',
+    insert_before: 'meta',
+    partial: 'spree/shared/trackers/segment/page_viewed.js',
+    original: '6841b819babbe4df1f03d0bc8e05dc81bf0d45ad'
+  )
+end

data/app/presenters/spree_analytics_trackers/base_presenter.rb

@@ -0,0 +1,14 @@
+module SpreeAnalyticsTrackers
+  class BasePresenter
+    include Rails.application.routes.url_helpers
+
+    def initialize(resource = {}, options = {})
+      @resource = resource
+      @options = options
+    end
+
+    def to_json
+      serialize_resource(@resource, @options).to_json
+    end
+  end
+end

data/app/presenters/spree_analytics_trackers/segment/order_presenter.rb

@@ -0,0 +1,32 @@
+module SpreeAnalyticsTrackers
+  module Segment
+    class OrderPresenter < SpreeAnalyticsTrackers::BasePresenter
+      private
+
+      def serialize_resource(resource, options = {})
+        {
+          order_id: resource.number.to_s,
+          total: resource.total&.to_f,
+          shipping: resource.shipment_total&.to_f,
+          tax: resource.additional_tax_total&.to_f,
+          discount: resource.promo_total&.to_f,
+          coupon: resource.promo_code,
+          currency: resource.currency,
+          products: resource.line_items.map { |li| serialize_line_item(li) }
+        }
+      end
+
+      private
+
+      def serialize_line_item(line_item)
+        {
+          product_id: line_item.product_id&.to_s,
+          sku: line_item.sku&.to_s,
+          name: line_item.name,
+          price: line_item.price&.to_f,
+          quantity: line_item.quantity
+        }
+      end
+    end
+  end
+end

data/app/presenters/spree_analytics_trackers/segment/product_presenter.rb

@@ -0,0 +1,40 @@
+module SpreeAnalyticsTrackers
+  module Segment
+    class ProductPresenter < SpreeAnalyticsTrackers::BasePresenter
+      private
+
+      def serialize_resource(resource, options = {})
+        {
+          resource_id: resource.id.to_s,
+          sku: resource.sku&.to_s,
+          category: resource.category&.name,
+          name: resource.name,
+          brand: brand_name,
+          price: resource.price_in(current_currency).amount&.to_f,
+          currency: current_currency,
+          url: resource_url(resource)
+        }.tap do |hash|
+          hash[:image_url] = segment_image_url(hash, options)
+        end.merge(options)
+      end
+
+      def segment_image_url(hash, options)
+        
+      end
+
+      def brand_name
+        resource.vendor.name if defined?(SpreeMultiVendor) && resource.defined?(:vendor) && resource.vendor.present?
+        
+        resource.brand&.name
+      end
+
+      def current_currency
+        @current_currency ||= options[:current_currency]
+      end
+
+      def locale
+        @locale ||= options[:locale]
+      end
+    end
+  end
+end

data/app/views/spree/admin/shared/_analytics_sidebar_menu.html.erb

@@ -1,5 +1,3 @@
-<% if can? :admin, Spree::Tracker %>
-  <ul class="nav nav-sidebar">
-    <%= tab :analytic_trackers, url: spree.admin_trackers_path, icon: 'tasks' %>
-  </ul>
-<% end %>
+<%= configurations_sidebar_menu_item(
+    Spree.t(:analytics), spree.admin_trackers_path
+  ) if can? :manage, Spree::Config %>

data/app/views/spree/admin/trackers/_form.html.erb

@@ -1,12 +1,12 @@
 <div data-hook="admin_tracker_form_fields" class="row">
-  <div class="col-xs-12 col-md-4" data-hook="analytics_engine">
+  <div class="col-12 col-lg-6" data-hook="analytics_engine">
     <%= f.field_container :engine, class: ["form-group"], "data-hook" => "analytics_engine" do %>
       <%= f.label :engine, Spree.t(:analytics_engine) %>
-      <%= f.select :engine, Spree::Tracker.engines.keys.sort.map { |k| [k.humanize, k] }, {}, { class: 'select2' } %>
+      <%= f.select :engine, @engines, {}, { class: 'select2' } %>
       <%= f.error_message_on :engine %>
     <% end %>
   </div>
-  <div class="col-xs-12 col-md-8">
+  <div class="col-12 col-lg-6">
     <div data-hook="active" class="form-group">
       <%= label_tag nil, Spree.t(:active) %>
       <div class="radio">
@@ -23,14 +23,20 @@
       </div>
     </div>
   </div>
-  <div class="col-xs-12 col-md-4" data-hook="analytics_id">
+  <div class="col-12 col-lg-6" data-hook="analytics_id">
     <%= f.field_container :analytics_id, class: ["form-group"], "data-hook" => "analytics_id" do %>
       <%= f.label :analytics_id, Spree.t(:google_analytics_id) %>
       <%= f.text_field :analytics_id, class: 'form-control' %>
       <%= f.error_message_on :analytics_id %>
     <% end %>
   </div>
-  <div data-hook="additional_tracker_fields"></div>
-</div>
-<div data-hook="admin_tracker_form_fields" class="row">
+  <div class="col-12 col-lg-6">
+    <div data-hook="store" class="form-group">
+      <%= label_tag :tracker_store, Spree.t(:store) %>
+      <%= collection_select(:tracker, :store_id, @stores, :id, :name, { include_blank: true }, {id: 'store_id', class: 'select2'}) %>
+    </div>
+  </div>
+  <div class="col-12 col-lg-6" data-hook="additional_tracker_fields"></div>
 </div>
+
+<div data-hook="admin_tracker_form_fields" class="row"></div>

data/app/views/spree/admin/trackers/index.html.erb

@@ -8,16 +8,11 @@
 
 <% if @trackers.any? %>
   <table class="table">
-    <colgroup>
-      <col style="width: 30%">
-      <col style="width: 40%">
-      <col style="width: 15%">
-      <col style="width: 15%">
-    </colgroup>
     <thead>
       <tr data-hook="admin_trackers_index_headers">
         <th><%= Spree.t(:google_analytics_id) %></th>
         <th><%= Spree.t(:analytics_engine) %></th>
+        <th><%= Spree.t(:store) %></th>
         <th class="text-center"><%= Spree.t(:active) %></th>
         <th class="actions"></th>
       </tr>
@@ -27,7 +22,10 @@
         <tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows">
           <td><%= tracker.analytics_id %></td>
           <td><%= tracker.engine.humanize %></td>
-          <td class="text-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td><%= tracker.store&.name %></td>
+          <td class="text-center">
+            <%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+          </td>
           <td class="actions text-right">
             <%= link_to_edit(tracker, no_text: true) if can? :edit, tracker %>
             <%= link_to_delete(tracker, no_text: true) if can? :delete, tracker %>
@@ -37,7 +35,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alert alert-warning">
+  <div class="alert alert-info">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Tracker)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Tracker %>!
   </div>

data/app/views/spree/shared/trackers/google_analytics/_checkout_step_viewed.js.erb

@@ -0,0 +1,19 @@
+<% if ga_enabled? && @order.present? && !@order.completed? %>
+  <script>
+    window.addEventListener('turbolinks:load', function() {
+      if (typeof gtag !== 'undefined') {
+        clearGAplugins();
+        gtag('event', 'checkout_progress', {
+          checkout_step: '<%= (@order.checkout_steps.index(@order.state) + 1) %>',
+          items: [
+            <% @order.line_items.each do |line_item| %>
+              <%= ga_line_item(line_item) %>,
+            <% end %>
+          ],
+          coupon: '<%= @order.promo_code %>',
+          checkout_option: '<%= @order.state %>'
+        });
+      };
+    });
+  </script>
+<% end %>

data/app/views/spree/shared/trackers/google_analytics/_initializer.js.erb

@@ -0,0 +1,25 @@
+<% if ga_enabled? %>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=<%= ga_tracker.analytics_id %>"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', '<%= ga_tracker.analytics_id %>', { 'send_page_view': false });
+    gtag('set', 'allow_google_signals', true )
+    gtag('set', 'allow_ad_personalization_signals', true );
+
+    function clearGAplugins() {
+      if (typeof ga !== "undefined" && typeof ga.getAll === "function") {
+        var trackingDom = ga.getAll()[0].get('trackingId');
+        if (trackingDom !== undefined) {
+          var trackingId = trackingDom.split('-').join('_')
+          if (trackingId !== undefined && ga.o !== undefined && ga.o["gtag_" + trackingId] !== undefined) {
+            delete ga.o["gtag_" + trackingId].plugins_
+          }
+        }
+      }
+    }
+  </script>
+<% end %>

data/app/views/spree/shared/trackers/google_analytics/_page_viewed.js.erb

@@ -0,0 +1,13 @@
+<% if ga_enabled? %>
+  <script>
+    if (typeof gtag !== 'undefined') {
+      <% if user_id = try_spree_current_user.try(:id) %>
+        gtag('config', '<%= ga_tracker.analytics_id %>', {
+          'user_id': '<%= user_id %>'
+        });
+      <% else %>
+        gtag('config', '<%= ga_tracker.analytics_id %>');
+      <% end %>
+    }
+  </script>
+<% end %>

data/app/views/spree/shared/trackers/google_analytics/_purchase.js.erb

@@ -0,0 +1,22 @@
+<% if ga_enabled? && @order.present? && order_just_completed?(@order) %>
+  <script>
+    window.addEventListener('turbolinks:load', function() {
+      if (typeof gtag !== 'undefined') {
+        clearGAplugins();
+        gtag('event', 'purchase', {
+          transaction_id: '<%= @order.number %>',
+          value: <%= @order.total&.to_f %>,
+          currency: '<%= @order.currency %>',
+          tax: <%= @order.tax_total&.to_f %>,
+          shipping: <%= @order.shipment_total&.to_f %>,
+          coupon: '<%= @order.promo_code %>',
+          items: [
+            <% @order.line_items.each do |line_item| %>
+              <%= ga_line_item(line_item) %>,
+            <% end %>
+          ]
+        });
+      }
+    });
+  </script>
+<% end %>

data/app/views/spree/shared/trackers/segment/_cart_viewed.js.erb

@@ -1,22 +1,27 @@
-<script>
-  if (typeof analytics !== 'undefined') {
-    analytics.track('Cart Viewed', {
-      cart_id: '<%= @order.number %>',
-      products: [
-      <% @order.line_items.each_with_index do |line_item, index| %>
-        <%= product_for_segment(line_item, position: index+1, quantity: line_item.quantity) %>,
-      <% end %>
-      ]
-    });
+<% if segment_enabled? && @order.present? && !@order.complete? %>
+  <script>
+    window.addEventListener('turbolinks:load', function() {
+      if (typeof analytics !== 'undefined') {
+        var segmentCartJson = {
+          cart_id: '<%= @order.number %>',
+          products: [
+            <% @order.line_items.each_with_index do |line_item, index| %>
+              <%=
+                product_for_segment(
+                  line_item.product,
+                  position: index+1,
+                  quantity: line_item.quantity,
+                  image: default_image_for_product_or_variant(line_item.variant)
+                )
+              %>,
+            <% end %>
+          ]
+        }
 
-    analytics.page('Cart Viewed', {
-      cart_id: '<%= @order.number %>',
-      products: [
-      <% @order.line_items.each_with_index do |line_item, index| %>
-        <%= product_for_segment(line_item, position: index+1, quantity: line_item.quantity) %>,
-      <% end %>
-      ]
+        analytics.track('Cart Viewed', segmentCartJson);
+        analytics.page('Cart Viewed', segmentCartJson);
+      }
     });
+  </script>
+<% end %>
 
-  }
-</script>