spree_frontend 2.4.7 → 2.4.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/checkout_controller.rb +9 -2
  3. data/app/views/spree/products/show.html.erb +1 -1
  4. data/app/views/spree/shared/_google_analytics.html.erb +5 -1
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 59bc5df5a9174c03ff330c111558d41c6703a3d5
4
- data.tar.gz: 7d84345a4fed3e8b33aa2a97c42a9c1dd0487a8f
3
+ metadata.gz: a1623866d1bd06ceb5c76fc406d94705c19f4545
4
+ data.tar.gz: ad981988cd0619908278c4cc79cb13ee815ae7f8
5
5
  SHA512:
6
- metadata.gz: fb6533a372e7a73c80e94327ca6dbbd581b793002f4a7d540fd41472e7fea5ec378e15213fad901e458585a5e05afb10995c2fc17b1c04948c11b07a642ab18f
7
- data.tar.gz: 4ad8718a72cf3e93eabd772cb271765462e73660337b14c35811ec629cb89fc0211a0d4b015cdbf5a2c47d28614f39b6139c09ed734936879f0d9f06fe09a436
6
+ metadata.gz: 10420b73aaacf88945d92a0f8da9521b4c211f1bb5a65859708b95bebd5f3e0cbf63c9d98be6e5392513d6a20f8ee037c9e7f526dcafebe24154811074d5fe73
7
+ data.tar.gz: 23dd2c18480398c06f12211f2eeed656b4310194d758b30ed81d72406e7387ec964847e5ca74fd955bec4ed6535eaf8efb34149a079e143f161d0fda3cb3e159
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_action :ensure_order_not_completed
14
14
  before_action :ensure_checkout_allowed
@@ -143,6 +143,13 @@ module Spree
143
143
  @differentiator.missing.each do |variant, quantity|
144
144
  @order.contents.remove(variant, quantity)
145
145
  end
146
+
147
+ # @order.contents.remove did transitively call reload in the past.
148
+ # Hiding the fact that the machine advanced already to "payment" state.
149
+ #
150
+ # As an intermediary step to optimize reloads out of high volume code path
151
+ # the reload was lifted here and will be removed by later passes.
152
+ @order.reload
146
153
  end
147
154
 
148
155
  if try_spree_current_user && try_spree_current_user.respond_to?(:payment_sources)
data/app/views/spree/products/show.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <% cache [I18n.locale, current_currency, @product] do %>
1
+ <% cache [I18n.locale, current_currency, @product, @product.possible_promotions] do %>
2
2
  <div data-hook="product_show" itemscope itemtype="http://schema.org/Product">
3
3
  <% @body_id = 'product-details' %>
4
4
 
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.4.7
4
+ version: 2.4.8
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.4.7
19
+ version: 2.4.8
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.4.7
26
+ version: 2.4.8
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.4.7
33
+ version: 2.4.8
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.4.7
40
+ version: 2.4.8
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: canonical-rails
43
43
  requirement: !ruby/object:Gem::Requirement