spree_frontend 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4648f59f227cbb4cdc23403055f4910dcc48dc61
-  data.tar.gz: 536af35efd794e1431a1e57255fa705e1b653719
+  metadata.gz: 9e329bd5468c79c26df7443dcb6832d4b1427aad
+  data.tar.gz: 58c60c6e1f5ba57f4c4d1d75fc0b0a1507494e52
 SHA512:
-  metadata.gz: 4af58cfefc3867d11eee4258766426906e37d49e5c01998835af6d01d5773c47a95903801faaa2ada1b219b252140070a21e797620e795402b767357002e7fcb
-  data.tar.gz: ae39a90aad057acc766b596e27001b197201248df68db24dcdd8f03632621877172c83011035a54ce9df6087f17dcca6e858d917b5e270a2fcfd98e454bdbb53
+  metadata.gz: 9078a1b7758639ff967d86dbfad29615003f6fafcf9d46060179d994870e6798c1157dba2f13adcd7ccd01b80ce233c4b134fdea0bf3bd95734766d68d7b5fc7
+  data.tar.gz: 0e86c6caa2fcf1646570ee62295a54d197f15d7c7361dd42449a97ab7455f1211b1ba7db674eb9d805409842d6f6a7e5e99a865d5e354a272a20765d62ff561e

data/app/assets/stylesheets/store/screen.css.scss

@@ -118,7 +118,7 @@ input[type="week"] {
   font-size: $input_box_font_size;
 
   &:active, &:focus {
-    border-color: $link_text_color;;
+    border-color: $link_text_color;
     outline: none;
     -webkit-box-shadow: none;
     -moz-box-shadow: none;
@@ -300,7 +300,7 @@ nav #main-nav-bar {
     &#link-to-cart {
       float: right;
       padding-left: 24px;
-      background: url("cart.png") no-repeat left center;
+      background: asset-url("store/cart.png", image) no-repeat left center;
 
       &:hover {
         border-color: $link_text_color;

data/app/controllers/spree/checkout_controller.rb

@@ -148,8 +148,9 @@ module Spree
         end
       end
 
-      def rescue_from_spree_gateway_error
+      def rescue_from_spree_gateway_error(exception)
         flash[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
+        @order.errors.add(:base, exception.message)
         render :edit
       end
 

data/app/controllers/spree/products_controller.rb

@@ -26,7 +26,7 @@ module Spree
           # Do nothing
         else
           if referer_path && referer_path.match(/\/t\/(.*)/)
-            @taxon = Taxon.find_by_permalink($1)
+            @taxon = Spree::Taxon.find_by_permalink($1)
           end
         end
       end

data/app/views/spree/checkout/edit.html.erb

@@ -26,3 +26,7 @@
   </div>
 
 </div>
+
+<% if I18n.locale != :en %>
+  <script src='/assets/jquery.validate/localization/messages_<%= I18n.locale %>.js'></script>
+<% end %>

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

@@ -9,7 +9,7 @@
       <% end %>
     </td>
     <td class="cart-item-description" data-hook="cart_item_description">
-      <h4><%= link_to variant.product.name, product_path(variant.product) %></h4>
+      <h4><%= link_to line_item.name, product_path(variant.product) %></h4>
       <%= variant.options_text %>
       <% if @order.insufficient_stock_lines.include? line_item %>
         <span class="out-of-stock">
@@ -17,7 +17,7 @@
         </span>
       <% end %>
       <span class="line-item-description" data-hook="line_item_description">
-        <%= line_item_description(variant) %>
+        <%= line_item_description_text(line_item.description) %>
       </span>
     </td>
     <td class="cart-item-price" data-hook="cart_item_price">

data/app/views/spree/shared/_search.html.erb

@@ -3,7 +3,7 @@
   <%= select_tag :taxon,
         options_for_select([[Spree.t(:all_departments), '']] +
                               @taxons.map {|t| [t.name, t.id]},
-                            @taxon ? @taxon.id : params[:taxon]) %>
+                              @taxon ? @taxon.id : params[:taxon]), 'aria-label' => 'Taxon' %>
   <%= search_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search) %>
   <%= submit_tag Spree.t(:search), :name => nil %>
 <% end %>

data/config/routes.rb

@@ -22,7 +22,7 @@ Spree::Core::Engine.routes.draw do
   get '/orders/populate', :via => :get, :to => populate_redirect
   match '/orders/:id/token/:token' => 'orders#show', :via => :get, :as => :token_order
 
-  resources :orders do
+  resources :orders, :except => [:new, :create] do
     post :populate, :on => :collection
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-10-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.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: capybara-accessible
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -194,7 +208,6 @@ files:
 - app/views/spree/orders/_form.html.erb
 - app/views/spree/orders/_line_item.html.erb
 - app/views/spree/orders/edit.html.erb
-- app/views/spree/orders/new.html.erb
 - app/views/spree/orders/show.html.erb
 - app/views/spree/products/_cart_form.html.erb
 - app/views/spree/products/_image.html.erb
@@ -228,7 +241,6 @@ files:
 - config/routes.rb
 - lib/spree/frontend/engine.rb
 - lib/spree/frontend/middleware/seo_assist.rb
-- lib/spree/frontend/preference_rescue.rb
 - lib/spree/frontend.rb
 - lib/spree/scopes/dynamic.rb
 - lib/spree_frontend.rb

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

@@ -1,9 +0,0 @@
-<% @body_id = 'cart' %>
-
-<h1><%= Spree.t(:shopping_cart) %></h1>
-
-<%= form_for @order, :url =>'#', :method => :put do |order_form| %>
-  <%= render :partial => 'form', :locals => { :order_form => order_form } %>
-<% end %>
-
-<p><%= link_to Spree.t(:continue_shopping), products_path %></p>

data/lib/spree/frontend/preference_rescue.rb

@@ -1,25 +0,0 @@
-module Spree
-  class OldPrefs < ActiveRecord::Base
-    self.table_name = "spree_preferences"
-    belongs_to  :owner, :polymorphic => true
-    attr_accessor :owner_klass
-  end
-
-  class PreferenceRescue
-    def self.try
-      OldPrefs.where(:key => nil).each do |old_pref|
-        next unless owner = (old_pref.owner rescue nil)
-        unless old_pref.owner_type == "Spree::Activator" || old_pref.owner_type == "Spree::Configuration"
-          begin
-            old_pref.key = [owner.class.name, old_pref.name, owner.id].join('::').underscore
-            old_pref.value_type = owner.preference_type(old_pref.name)
-            puts "Migrating Preference: #{old_pref.key}"
-            old_pref.save
-          rescue NoMethodError => ex
-            puts ex.message
-          end
-        end
-      end
-    end
-  end
-end