spree_frontend 2.2.4 → 2.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/orders_controller.rb +2 -6
  3. data/app/views/spree/products/_cart_form.html.erb +1 -1
  4. data/app/views/spree/shared/_google_analytics.html.erb +1 -0
  5. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bcf0a54fb4e6b5238b65ab5d49529d394a27858e
4
- data.tar.gz: e3e458552d6365307df716a378ee2c33e1bc3996
3
+ metadata.gz: 96ace81969e7005302b2f2391ae8d2fa58df7782
4
+ data.tar.gz: d4df40b9efa43637a73694e718137709d909a773
5
5
  SHA512:
6
- metadata.gz: 7509d4e7b29135caf5a4d8a82ff63773ba346bc5081416da36011f4807ce76100f685b6d8f984b44f2b83d3dfde2d915d675fd66a742409fd52c15bc7f2f7330
7
- data.tar.gz: 8104ee125ce255647ff6b1e83a40413443fdde7ca58c7ad810cb7118c9ba4c609b88916ebe0b39551d1f7ad0bf14cff1c565aace1fc9291e9b0d35d3169ea82b
6
+ metadata.gz: 2bea880ffe20ba9cf6cd38a8791f58e8535c3b4c532ededb327e8064e311f70ab329e3f7d6715bc5716f9bcf9dad29fcf746a2a0ea50826fb96e7de6515c6eb5
7
+ data.tar.gz: 376c7eb68f35788edbc1aa489c9cb4949ceded2d70b85a7a3c20b29c9421668a0144e628448bd2453a7843444484c149f345356286bc4195640770dd1b0cda25
data/app/controllers/spree/orders_controller.rb CHANGED
@@ -37,23 +37,19 @@ module Spree
37
37
  def edit
38
38
  @order = current_order || Order.new
39
39
  associate_user
40
- if stale?(current_order)
41
- respond_with(current_order)
42
- end
43
40
  end
44
41
 
45
42
  # Adds a new item to the order (creating a new order if none already exists)
46
43
  def populate
47
44
  populator = Spree::OrderPopulator.new(current_order(create_order_if_necessary: true), current_currency)
48
- if populator.populate(params[:variant_id], params[:quantity])
49
- current_order.ensure_updated_shipments
50
45
 
46
+ if populator.populate(params[:variant_id], params[:quantity])
51
47
  respond_with(@order) do |format|
52
48
  format.html { redirect_to cart_path }
53
49
  end
54
50
  else
55
51
  flash[:error] = populator.errors.full_messages.join(" ")
56
- redirect_to :back
52
+ redirect_back_or_default(spree.root_path)
57
53
  end
58
54
  end
59
55
 
data/app/views/spree/products/_cart_form.html.erb CHANGED
@@ -7,7 +7,7 @@
7
7
  <ul>
8
8
  <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
9
9
  <li>
10
- <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => Spree::Money.new(variant.price, currency: current_currency, with_currency: true).to_s %>
10
+ <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => variant.price_in(current_currency).money %>
11
11
  <%= label_tag "variant_id_#{ variant.id }" do %>
12
12
  <span class="variant-description">
13
13
  <%= variant_options variant %>
data/app/views/spree/shared/_google_analytics.html.erb CHANGED
@@ -6,6 +6,7 @@
6
6
  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
7
7
 
8
8
  ga('create', '<%= tracker.analytics_id %>','<%= Spree::Config[:site_url].sub!(/(^www.)?/,'') %>');
9
+ ga('require', 'displayfeatures');
9
10
  ga('send', 'pageview');
10
11
 
11
12
  <% if flash[:commerce_tracking] && @order.present? %>
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.2.4
4
+ version: 2.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-01 00:00:00.000000000 Z
11
+ date: 2014-08-29 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.2.4
19
+ version: 2.2.5
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.2.4
26
+ version: 2.2.5
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.2.4
33
+ version: 2.2.5
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.2.4
40
+ version: 2.2.5
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: canonical-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
56
56
  name: jquery-rails
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - '='
60
60
  - !ruby/object:Gem::Version
61
61
  version: 3.1.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - '='
67
67
  - !ruby/object:Gem::Version
68
68
  version: 3.1.0
69
69
  - !ruby/object:Gem::Dependency