spree_frontend 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e30394e267e6a0eba7a832fc7e1f594fe6740984
-  data.tar.gz: 6b8f494ae512bd4d5aca92915419c5a85fd0498c
+  metadata.gz: 99393747afca53af7cbed71e2fad651be8df2fa5
+  data.tar.gz: 8fc05b8b02ebfe80a8e67bdb88dcd83a2dba3082
 SHA512:
-  metadata.gz: d5f932ffce68dcf18c259eda09a706fa30c00ec038b06ce39382324ed9785cd7b69761c7a393f8b42b137d9722ecc3d083c11064f8029d27fb4d50def51b5b96
-  data.tar.gz: 3812ffc1c83eb9500507a08d48ae7784e4aa669fc0a1b628f91f8e9862f929a5c2a16109d0c1a944e2cbc6d420a8b5df98193367ce43ba10944f2111305c2cf0
+  metadata.gz: ec94fde232ca6bd6951dc690aa706b645782429c809a2027af395600cf4385763cc24de83016aa37be861774aea9a0c4482739d736c42a179657529c9e9d2619
+  data.tar.gz: 00d46ac2c1dbe62cf8b9a47ff615bb07979b887894666042a2020a884ba9ad8d7a283b921d7b7aa692ad5360a0015a285f81d7a89a8f9c91ad2767c4e3fe2b03

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.0.10
+  version: 2.0.11
 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_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -558,7 +558,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.