spree_frontend 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e4465c12b06284d83c66b91b396c170481f396
-  data.tar.gz: 9059329a94873217985892db08d9a6f6e66ac7f5
+  metadata.gz: 9ea69c79126e5bb8f92bf547def397fc3d6c11fa
+  data.tar.gz: 2f786defb2025304844265999626b671cc648140
 SHA512:
-  metadata.gz: c062041e7ed1311139c2da44bf83376ea613afd1f58ef9ba57723ea83d29349612785289a0df98209ea5d202898d986c39abbc0157e67258e63d4be757498246
-  data.tar.gz: a89de1f6323e2aaaf4199cba2c6dd2baaab5064303055c3cb66798e265c2a583d117f19d14415f078c17305565eac6d8a3d6ff2fc1d5ed35f04490019886457d
+  metadata.gz: ffa12c5fdca228b354ffedb66cd1ab7e2c8721b90ef87d928d65836977bc40ea131219b90ca4e99cad92e1dea5e4421f163dc9605fce545417f906ed4b13288a
+  data.tar.gz: a857b5657cb71cfc0439f119dbbee4efdd96a50156a5aca86f92d9baa59e8cbdde8a3d2479ea3a5e30905303a3eaebdd9b18801ca31c71fc81763d2a99c44457

data/app/controllers/spree/products_controller.rb

@@ -1,6 +1,8 @@
 module Spree
   class ProductsController < Spree::StoreController
     before_filter :load_product, :only => :show
+    before_filter :load_taxon, :only => :index
+
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/taxons'
 
@@ -44,5 +46,9 @@ module Spree
           @product = Product.active(current_currency).find_by_permalink!(params[:id])
         end
       end
+
+      def load_taxon
+        @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
+      end
   end
 end

data/app/views/spree/orders/_line_item.html.erb

@@ -11,7 +11,7 @@
     <td class="cart-item-description" data-hook="cart_item_description">
       <h4><%= link_to line_item.name, product_path(variant.product) %></h4>
       <%= variant.options_text %>
-      <% if @order.insufficient_stock_lines.include? line_item %>
+      <% if line_item.insufficient_stock? %>
         <span class="out-of-stock">
           <%= Spree.t(:out_of_stock) %>&nbsp;&nbsp;<br />
         </span>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -529,7 +529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.