solidus_multi_domain 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3f5dcfd0e9f2e1cd6eb1b6fc001442e04f37d7
-  data.tar.gz: ccbe9774d8f526ebbeed4b18ee170a3fc6ad9e4a
+  metadata.gz: 5a40529d83de05109a1f62a8f96574255905d659
+  data.tar.gz: f2874701ba71846ac29025f8f8c190294eb8301b
 SHA512:
-  metadata.gz: ff5e70b3ae70fa83bdefc3eff867582ec51bfe15ad61509e9340122c0ab965f11288c01f8dca01f07be317c482b0ac593f4470062951b8f4f6158de1d91a9371
-  data.tar.gz: 4f86e155a58580fd34b66e65e65a27a8715c7fc06c89ebec5e6c414d476c513b524f767c49e92c49d6c7beb02afe0f79595dc39b2465dfbaa51c7ce6b894d6d5
+  metadata.gz: 53e135eb6ac757ab14ee76e649d5a13daac89681b4a83ec486d9fa3e344d8af6a0e21ab66071394ec17fe8c4020df8f799f260ac06755e5f29cac42cf96c443b
+  data.tar.gz: c77f5c988453ae129a9a507b52ffa7675a52316f4a18ec81eb88ea2a55b035f0266514ba61eb21ce458f91356b66f7a26a046fafb28b339c69ae04ebb00dd853

data/README.md

@@ -40,6 +40,8 @@ Current features:
 
 5. Google analytics trackers can be associated with a store.
 
+Looking for additional information? Checkout out the [wiki](https://github.com/solidusio/solidus_multi_domain/wiki).
+
 Install Instructions
 --------------------
 

data/app/views/spree/shared/_google_analytics.html.erb

@@ -1,39 +1,36 @@
 <% if tracker = current_tracker %>
+  <script>
+    (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)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-  <%= javascript_tag do %>
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
-    _gaq.push(['_trackPageview']);
+    ga('create', '<%= tracker.analytics_id %>', 'auto');
+    ga('require', 'displayfeatures');
+    ga('send', 'pageview');
 
-    <% if flash[:commerce_tracking] && @order.present? %>
-      <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %>
-      _gaq.push(['_addTrans',
-        "<%= j @order.number %>",
-        "<%= tracker.store.name %>",
-        "<%= @order.total %>",
-        "<%= @order.adjustments.tax.sum(:amount) %>",
-        "<%= @order.adjustments.shipping.sum(:amount) %>",
-        "<%= j @order.bill_address.city %>",
-        "<%= j @order.bill_address.state_text %>",
-        "<%= j @order.bill_address.country.name %>"
-      ]);
+    <% if @order && order_just_completed?(@order) %>
+      <%# more info: https://developers.google.com/analytics/devguides/collection/analyticsjs/ecommerce %>
+      ga('require', 'ecommerce', 'ecommerce.js');
+      ga('ecommerce:addTransaction', {
+        'id': '<%= j @order.number %>',                                    // Transaction ID. Required.
+        'affiliation': '<%= @order.store.name %>',                 // Affiliation or store name.
+        'revenue': '<%= @order.total %>',                                // Grand Total.
+        'shipping': '<%= @order.ship_total %>',                                  // Shipping.
+        'tax': '<%= @order.tax_total %>',                                        // Tax.
+        'currency': '<%= @order.currency %>'                        // local currency code.
+      });
       <% @order.line_items.each do |line_item| %>
-        _gaq.push(['_addItem',
-          "<%= j @order.number %>",
-          "<%= j line_item.variant.sku %>",
-          "<%= j line_item.variant.product.name %>",
-          "",
-          "<%= line_item.price %>",
-          "<%= line_item.quantity %>"
-        ]);
+        ga('ecommerce:addItem', {
+          'id': '<%= j @order.number %>',                        // Transaction ID. Required.
+          'name': '<%= j line_item.variant.product.name %>',    // Product name. Required.
+          'sku': '<%= j (line_item.variant.sku || line_item.variant_id) %>', // SKU/code.
+          'category': '',                                     // Category or variation.
+          'price': '<%= line_item.price %>',                 // Unit price.
+          'quantity': '<%= line_item.quantity %>'           // Quantity.
+        });
       <% end %>
-      _gaq.push(['_trackTrans']);
+      ga('ecommerce:send');
     <% end %>
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-  <% end %>
+  </script>
 <% end %>

data/solidus_multi_domain.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_multi_domain"
-  s.version     = "1.3.0"
+  s.version     = "1.4.0"
   s.summary     = "Adds multiple site support to Solidus"
   s.description = "Multiple Solidus stores on different domains - single unified backed for processing orders."
   s.required_ruby_version = ">= 2.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_multi_domain
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -193,7 +193,6 @@ files:
 - app/views/spree/shared/_google_analytics.html.erb
 - app/views/spree/shared/_multi_domain_sidebar_entry.html.erb
 - bin/rails
-- circle.yml
 - config/locales/en.yml
 - config/locales/fr.yml
 - config/locales/pl.yml

data/circle.yml

@@ -1,6 +0,0 @@
-machine:
-  ruby:
-    version: 2.1.5
-test:
-  pre:
-    - bundle exec rake test_app