spree_frontend 2.3.10 → 2.3.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/checkout_controller.rb +2 -2
  3. data/app/views/spree/shared/_google_analytics.html.erb +5 -1
  4. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c8dc16a9ffbc86e984e3abdb854d09b0ca1f40a4
4
- data.tar.gz: 5ca39c7fd6fa6e00b12c7e49d040895706bc3341
3
+ metadata.gz: 9a8a14712d8323acdf592208deef2c8cfbb6da35
4
+ data.tar.gz: 73fa1cba30bfa137940533f710cb0270285f6c71
5
5
  SHA512:
6
- metadata.gz: a12bda1867338db724c77040da05fcd4749479b7f1714ce30f91ad4b0d57ad85b1523c4e804eee96d23d9735ea8b29071a623eec1079559745e816b94b79944c
7
- data.tar.gz: 13bbd26be47a11aa19158b6e898704bbc0dac7c4451a3601d14a7dec4e7be08cf2b876099c4031d487b342ba06bcb63f8c4cbddacc17cf36e70b56164e2b9398
6
+ metadata.gz: f30d025c46c2265a5fa7661ff73beac7b26fa7afa28a8ef55206b7372827747cf968ec20e2c5a07363cb112a0485fbc91d04b51177f4ffe3f6d2d2d530ce035d
7
+ data.tar.gz: ddf26c41f1cbd1aa4f5c4a6f9b834cc0bef4aa3f2f4352bed170e59ff444a5d4cd34478167a5e4de542fd50d0cca9a096e6a14d8d9650160a55087da562f8895
data/app/controllers/spree/checkout_controller.rb CHANGED
@@ -7,8 +7,8 @@ module Spree
7
7
  ssl_required
8
8
 
9
9
  before_action :load_order_with_lock
10
- before_filter :ensure_valid_state_lock_version, only: [:update]
11
- before_filter :set_state_if_present
10
+ before_action :ensure_valid_state_lock_version, only: [:update]
11
+ before_action :set_state_if_present
12
12
 
13
13
  before_filter :ensure_order_not_completed
14
14
  before_filter :ensure_checkout_allowed
data/app/views/spree/shared/_google_analytics.html.erb CHANGED
@@ -5,7 +5,11 @@
5
5
  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
6
6
  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
7
7
 
8
- ga('create', '<%= tracker.analytics_id %>', 'auto');
8
+ <% if user_analytics_id = try_spree_current_user.try(:analytics_id) %>
9
+ ga('create', { 'trackingId': '<%= tracker.analytics_id %>', 'cookieDomain': 'auto', 'userId': '<%= user_analytics_id %>' });
10
+ <% else %>
11
+ ga('create', '<%= tracker.analytics_id %>', 'auto');
12
+ <% end %>
9
13
  ga('require', 'displayfeatures');
10
14
  ga('send', 'pageview');
11
15
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.10
4
+ version: 2.3.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-05 00:00:00.000000000 Z
11
+ date: 2015-07-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.3.10
19
+ version: 2.3.11
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 2.3.10
26
+ version: 2.3.11
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 2.3.10
33
+ version: 2.3.11
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 2.3.10
40
+ version: 2.3.11
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: canonical-rails
43
43
  requirement: !ruby/object:Gem::Requirement