spree_frontend 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed4cbe3de9803ecd8d45ba2d7be6ab92200ab51
-  data.tar.gz: b933db82666ad7fe15832e141ac4486f53fefe11
+  metadata.gz: 6cc8304b9d613d8ac92155be33ef9f3656443781
+  data.tar.gz: 542d5ea4ecbf53168bc734acf2319d4ac5ed989f
 SHA512:
-  metadata.gz: b3d2d40ff149c25770106247c769e2a147f00b9c00172edbaa751f684cd4d0ae69306ff38090a884f442cfa185a9f9abf45975a9b77564d7750bdf851a641338
-  data.tar.gz: 4ad5f621ffd5a4f8596e3b7050054188354a4ed06a0f6ffe5e044b44714868bce71781686151f914b2e4f4af65c8954a2e2af21eff6e083f29dd4bec2260a556
+  metadata.gz: aab462d12ddf9698f2ba2ff389f0a6c3adf7db7b6d6e763b102beb10fd39d2c94bd33a615f95ec4c4dfb70f636b5af70aea84f6df5f190b6a1cc913027fe335e
+  data.tar.gz: bbdc254c624afeced6c80ff56e92b9936d1b3c3ac0625918722af4374008f218a49f47da8e547e88c74e5dc810e528387f4428996d6d8ecc4b5f40751571bddf

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") no-repeat left center;
 
       &:hover {
         border-color: $link_text_color;

data/app/controllers/spree/checkout_controller.rb

@@ -151,8 +151,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/_address.html.erb

@@ -12,7 +12,7 @@
     <%= form.fields_for :ship_address do |ship_form| %>
       <legend align="center"><%= Spree.t(:shipping_address) %></legend>
       <p class="field checkbox" data-hook="use_billing">
-        <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) || @order.bill_address.same_as?(@order.ship_address)) %>
+        <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
         <%= label_tag :order_use_billing, Spree.t(:use_billing_address), :id => 'use_billing' %>
       </p>
       <%= render :partial => 'spree/address/form', :locals => { :form => ship_form, :address_type => 'shipping', :address => @order.ship_address } %>

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/products/_cart_form.html.erb

@@ -7,7 +7,7 @@
         <ul>
           <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
             <li>
-              <%= radio_button_tag "products[#{@product.id}]", variant.id, index == 0, 'data-price' => variant.price_in(current_currency).display_price %>
+              <%= radio_button_tag "products[#{@product.id}]", variant.id, index == 0, 'data-price' => display_price(variant) %>
               <label for="<%= ['products', @product.id, variant.id].join('_') %>">
                 <span class="variant-description">
                   <%= variant_options variant %>
@@ -29,7 +29,7 @@
           <h6 class="product-section-title"><%= Spree.t(:price) %></h6>
           <div>
             <span class="price selling" itemprop="price">
-              <%= display_price(@product.master) %>
+              <%= display_price(@product) %>
             </span>
             <span itemprop="priceCurrency" content="<%= @product.currency %>"></span>
           </div>

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

@@ -0,0 +1,38 @@
+<div class="address vcard">
+  <div class="fn"><%= address.full_name %></div>
+  <% unless address.company.blank? %>
+    <div class="org">
+      <%= address.company %>
+    </div>
+  <% end %>
+  <div class="adr">
+    <div class="street-address">
+      <div class="street-address-line">
+        <%= address.address1 %>
+      </div>
+      <% unless address.address2.blank? %>
+        <div class="street-address-line">
+          <%= address.address2 %>
+        </div>
+      <% end %>
+    </div>
+    <div class="local">
+      <span class="locality"><%= address.city %></span>
+      <span class="region"><%= address.state_text %></span>
+      <span class="postal-code"><%= address.zipcode %></span>
+      <div class="country-name"><%= address.country.try(:name) %></div>
+    </div>
+  </div>
+  <% unless address.phone.blank? %>
+    <div class="tel">
+      <span class="type"><%= Spree.t(:phone) %></span>
+      <%= address.phone %>
+    </div>
+  <% end %>
+  <% unless address.alternative_phone.blank? %>
+    <div class="alternative-phone tel">
+      <span class="type"><%= Spree.t(:alternative_phone) %></span>
+      <%= address.alternative_phone %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,4 +1,4 @@
-Spree::Core::Engine.routes.draw do
+Spree::Core::Engine.add_routes do
 
   root :to => 'home#index'
 
@@ -16,10 +16,10 @@ Spree::Core::Engine.routes.draw do
     request.referer || '/cart'
   end
 
-  get '/orders/populate', :via => :get, :to => populate_redirect
+  get '/orders/populate', :to => populate_redirect
   get '/orders/:id/token/:token' => 'orders#show', :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.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-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.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,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: []
@@ -165,7 +179,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
@@ -175,6 +188,7 @@ files:
 - app/views/spree/products/_thumbnails.html.erb
 - app/views/spree/products/index.html.erb
 - app/views/spree/products/show.html.erb
+- app/views/spree/shared/_address.html.erb
 - app/views/spree/shared/_filters.html.erb
 - app/views/spree/shared/_footer.html.erb
 - app/views/spree/shared/_google_analytics.html.erb
@@ -199,9 +213,7 @@ 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
 - lib/tasks/rake_util.rb
 - lib/tasks/taxon.rake

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

data/lib/spree/scopes/dynamic.rb

@@ -1,33 +0,0 @@
-module Spree
-  module Scopes
-    # This module is extended by ProductScope
-    module Dynamic
-      module_function
-
-      # Sample dynamic scope generating from set of products
-      # generates 0 or (2..scope_limit) scopes for prices, based
-      # on number of products (uses Math.log, to guess number of scopes)
-      def price_scopes_for(products, scope_limit=5)
-        scopes = []
-
-        # Price based scopes
-        all_prices = products.map(&:price).sort
-
-        ranges = [Math.log(products.length).floor, scope_limit].max
-
-        if ranges >= 2
-          l = all_prices.length / ranges
-          scopes << ProductScope.new({:name => "master_price_lte", :arguments => [all_prices[l]] })
-
-          (ranges - 2).times do |x|
-            scopes << ProductScope.new({:name => "price_between",
-                                        :arguments => [ all_prices[l*(x+1)+1], all_prices[l*(x+2)] ] })
-          end
-          scopes << ProductScope.new({:name => "master_price_gte", :arguments => [all_prices[l*(ranges-1)+1]] })
-        end
-
-        scopes
-      end
-    end
-  end
-end