spree_frontend 2.1.6 → 2.1.7

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 24e4465c12b06284d83c66b91b396c170481f396
4
- data.tar.gz: 9059329a94873217985892db08d9a6f6e66ac7f5
3
+ metadata.gz: 9ea69c79126e5bb8f92bf547def397fc3d6c11fa
4
+ data.tar.gz: 2f786defb2025304844265999626b671cc648140
5
5
  SHA512:
6
- metadata.gz: c062041e7ed1311139c2da44bf83376ea613afd1f58ef9ba57723ea83d29349612785289a0df98209ea5d202898d986c39abbc0157e67258e63d4be757498246
7
- data.tar.gz: a89de1f6323e2aaaf4199cba2c6dd2baaab5064303055c3cb66798e265c2a583d117f19d14415f078c17305565eac6d8a3d6ff2fc1d5ed35f04490019886457d
6
+ metadata.gz: ffa12c5fdca228b354ffedb66cd1ab7e2c8721b90ef87d928d65836977bc40ea131219b90ca4e99cad92e1dea5e4421f163dc9605fce545417f906ed4b13288a
7
+ data.tar.gz: a857b5657cb71cfc0439f119dbbee4efdd96a50156a5aca86f92d9baa59e8cbdde8a3d2479ea3a5e30905303a3eaebdd9b18801ca31c71fc81763d2a99c44457
@@ -1,6 +1,8 @@
1
1
  module Spree
2
2
  class ProductsController < Spree::StoreController
3
3
  before_filter :load_product, :only => :show
4
+ before_filter :load_taxon, :only => :index
5
+
4
6
  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
5
7
  helper 'spree/taxons'
6
8
 
@@ -44,5 +46,9 @@ module Spree
44
46
  @product = Product.active(current_currency).find_by_permalink!(params[:id])
45
47
  end
46
48
  end
49
+
50
+ def load_taxon
51
+ @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
52
+ end
47
53
  end
48
54
  end
@@ -11,7 +11,7 @@
11
11
  <td class="cart-item-description" data-hook="cart_item_description">
12
12
  <h4><%= link_to line_item.name, product_path(variant.product) %></h4>
13
13
  <%= variant.options_text %>
14
- <% if @order.insufficient_stock_lines.include? line_item %>
14
+ <% if line_item.insufficient_stock? %>
15
15
  <span class="out-of-stock">
16
16
  <%= Spree.t(:out_of_stock) %>&nbsp;&nbsp;<br />
17
17
  </span>
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.1.6
4
+ version: 2.1.7
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-03-25 00:00:00.000000000 Z
11
+ date: 2014-05-15 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.1.6
19
+ version: 2.1.7
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.1.6
26
+ version: 2.1.7
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.1.6
33
+ version: 2.1.7
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.1.6
40
+ version: 2.1.7
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: canonical-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -529,7 +529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
529
529
  requirements:
530
530
  - none
531
531
  rubyforge_project: spree_frontend
532
- rubygems_version: 2.2.2
532
+ rubygems_version: 2.2.0
533
533
  signing_key:
534
534
  specification_version: 4
535
535
  summary: Frontend e-commerce functionality for the Spree project.