spree_frontend 3.0.10 → 3.1.0.rc1

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

@@ -61,5 +61,12 @@
       <td><strong><%= Spree.t(:order_total) %>:</strong></td>
       <td><strong><span id='summary-order-total' class="lead text-primary"><%= order.display_total.to_html %></span></strong></td>
     </tr>
+
+    <% if order.using_store_credit? %>
+      <tr data-hook="order_details_store_credit">
+        <td><%= Spree.t(:store_credit_name) %>:</strong></td>
+        <td><span id='summary-store-credit'><%= order.display_total_applied_store_credit.to_html %></span></td>
+      </tr>
+    <% end %>
   </tbody>
 </table>

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

@@ -9,7 +9,9 @@
     <div class="col-sm-3">
       <h1 data-hook="checkout_title"><%= Spree.t(:checkout) %></h1>
     </div>
-    <div class="col-sm-9" data-hook="checkout_progress"><%= checkout_progress %></div>
+    <div class="col-sm-9" data-hook="checkout_progress">
+      <%= checkout_progress %>
+    </div>
   </div>
 
   <div class="row" data-hook="checkout_content">

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -3,12 +3,16 @@
   <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
   <p class="field">
-    <%= label_tag "name_on_card_#{payment_method.id}", Spree.t(:name_on_card) %><span class="required">*</span><br />
-    <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", :class => 'form-control required'} %>
+    <%= label_tag "name_on_card_#{payment_method.id}" do %>
+      <%= Spree.t(:name_on_card) %><abbr class="required" title="required">*</abbr>
+    <% end %>
+    <%= text_field_tag "#{param_prefix}[name]", "#{@order.bill_address_firstname} #{@order.bill_address_lastname}", { id: "name_on_card_#{payment_method.id}", :class => 'form-control required'} %>
   </p>
 
   <p class="field" data-hook="card_number">
-    <%= label_tag "card_number", Spree.t(:card_number) %><span class="required">*</span><br />
+    <%= label_tag "card_number" do %>
+      <%= Spree.t(:card_number) %><abbr class="required" title="required">*</abbr>
+    <% end %>
     <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
     <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'form-control required cardNumber', :size => 19, :maxlength => 19, :autocomplete => "off") %>
     &nbsp;
@@ -20,11 +24,15 @@
   </p>
   <div class="row">
     <div class="col-md-8 field" data-hook="card_expiration">
-      <%= label_tag "card_expiry", Spree.t(:expiration) %><span class="required">*</span><br />
+      <%= label_tag "card_expiry" do %>
+        <%= Spree.t(:expiration) %><abbr class="required" title="required">*</abbr>
+      <% end %>
       <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "form-control required cardExpiry", :placeholder => "MM / YY" %>
     </div>
     <div class="col-md-4 field" data-hook="card_code">
-      <%= label_tag "card_code", Spree.t(:card_code) %><span class="required">*</span><br />
+      <%= label_tag "card_code" do %>
+        <%= Spree.t(:card_code) %><abbr class="required" title="required">*</abbr>
+      <% end %>
       <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'form-control required cardCode', :size => 5) %>
       <%= link_to "(#{Spree.t(:what_is_this)})", spree.content_path('cvv'), :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
     </div>

data/app/views/spree/checkout/payment/_storecredit.html.erb

@@ -0,0 +1,16 @@
+<% if @order.using_store_credit? %>
+  <div class="alert alert-success text-center" data-hook="checkout_payment_store_credit_success">
+    <h3><%= Spree.t('store_credit.applicable_amount', amount: Spree::Money.new(@order.total_applicable_store_credit, { currency: @order.currency })) %></h3>
+    <% if @order.covered_by_store_credit? %>
+      <p><%= Spree.t('store_credit.remaining_amount', amount: @order.display_store_credit_remaining_after_capture) %></p>
+    <% else %>
+      <p><%= Spree.t('store_credit.additional_payment_needed', amount: @order.display_order_total_after_store_credit) %></p>
+    <% end %>
+  </div>
+
+<% elsif @order.could_use_store_credit? %>
+  <div class="alert alert-info text-center" data-hook="checkout_payment_store_credit_available">
+    <h2><%= Spree.t('store_credit.available_amount', amount: @order.display_total_available_store_credit) %></h2>
+    <%= button_tag Spree.t('store_credit.apply'), name: 'apply_store_credit', class: 'continue btn btn-lg btn-primary' %>
+  </div>
+<% end %>

data/app/views/spree/payments/_payment.html.erb

@@ -14,3 +14,5 @@
 <% else %>
   <%= content_tag(:span, payment.payment_method.name) %>
 <% end %>
+
+<span class="payment-amount">(<%= payment.display_amount %>)</span>

data/app/views/spree/products/_cart_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for :order, :url => populate_orders_path do |f| %>
+<%= form_for :order, url: populate_orders_path do |f| %>
   <div class="row" id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="https://schema.org/Offer">
     <% if @product.variants_and_option_values(current_currency).any? %>
       <div id="product-variants" class="col-md-6">
@@ -6,7 +6,10 @@
         <ul class="list-group">
           <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
             <li>
-              <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => variant.price_in(current_currency).money  %>
+              <%= radio_button_tag "variant_id", variant.id, index == 0,
+                  'data-price' => variant.price_in(current_currency).money, 
+                  'data-in-stock' => variant.can_supply?
+              %>
               <%= label_tag "variant_id_#{ variant.id }" do %>
                 <span class="variant-description">
                   <%= variant_options variant %>
@@ -26,7 +29,7 @@
       <%= hidden_field_tag "variant_id", @product.master.id %>
     <% end %>
 
-    <% if @product.price_in(current_currency) and !@product.price.nil? %>
+    <% if @product.price_in(current_currency) && !@product.price.nil? %>
       <div data-hook="product_price" class="col-md-5">
         <div id="product-price">
           <h6 class="product-section-title"><%= Spree.t(:price) %></h6>
@@ -45,22 +48,28 @@
           <% end %>
         </div>
 
-        <div class="add-to-cart">
-          <br/>
-          <div class="input-group">
-            <%= number_field_tag :quantity, 1, :class => 'title form-control', :min => 1 %>
-            <span class="input-group-btn">
-              <%= button_tag :class => 'btn btn-success', :id => 'add-to-cart-button', :type => :submit do %>
-                <%= Spree.t(:add_to_cart) %>
-              <% end %>
-            </span>
+        <% if @product.can_supply? %>
+          <div class="add-to-cart">
+            <br />
+            <div class="input-group">
+              <%= number_field_tag :quantity, 1, class: 'title form-control', min: 1 %>
+              <span class="input-group-btn">
+                <%= button_tag class: 'btn btn-success', id: 'add-to-cart-button', type: :submit do %>
+                  <%= Spree.t(:add_to_cart) %>
+                <% end %>
+              </span>
+            </div>
           </div>
-        </div>
+        <% end %>
       </div>
     <% else %>
       <div id="product-price">
-        <br>
-        <div><span class="price selling" itemprop="price"><%= Spree.t('product_not_available_in_this_currency') %></span></div>
+        <br />
+        <div>
+          <span class="price selling" itemprop="price">
+            <%= Spree.t('product_not_available_in_this_currency') %>
+          </span>
+        </div>
       </div>
     <% end %>
   </div>

data/app/views/spree/products/_taxons.html.erb

@@ -1,12 +1,8 @@
-<% if !@product.taxons.blank? %>
-  <div id="taxon-crumbs" data-hook class=" five ">
-    <h3 class="product-section-title"><%= Spree.t(:look_for_similar_items) %></h3>
-    <div data-hook="product_taxons">
-      <ul class="list-group" id="similar_items_by_taxon" data-hook>
-        <% @product.taxons.each do |taxon| %>
-          <li class="list-group-item"><%= link_to taxon.name, seo_url(taxon) %></li>
-        <% end %>
-      </ul>
-    </div>
-  </div>
+<% if @product.taxons.present? %>
+  <h3 class="product-section-title"><%= Spree.t(:look_for_similar_items) %></h3>
+  <ul class="list-group" id="similar_items_by_taxon" data-hook>
+    <% @product.taxons.each do |taxon| %>
+      <li class="list-group-item"><%= link_to taxon.name, seo_url(taxon) %></li>
+    <% end %>
+  </ul>
 <% end %>

data/app/views/spree/products/show.html.erb

@@ -1,8 +1,8 @@
 <% @body_id = 'product-details' %>
 
-<% cache [I18n.locale, current_currency, @product, @product.possible_promotions] do %>
-  <div data-hook="product_show" itemscope itemtype="https://schema.org/Product">
-    <div class="col-md-4" data-hook="product_left_part">
+<% cache cache_key_for_product do %>
+  <div data-hook="product_show" class="row" itemscope itemtype="https://schema.org/Product">
+    <div class="col-md-4 col-sm-5" data-hook="product_left_part">
       <div data-hook="product_left_part_wrap">
         <div id="product-images" data-hook="product_images">
           <div id="main-image" class="panel panel-default" data-hook>
@@ -25,13 +25,13 @@
       </div>
     </div>
 
-    <div class="col-md-8" data-hook="product_right_part">
+    <div class="col-md-8 col-sm-7" data-hook="product_right_part">
       <div data-hook="product_right_part_wrap">
         <div id="product-description" data-hook="product_description">
           <h1 class="product-title" itemprop="name"><%= @product.name %></h1>
 
           <div class="well" itemprop="description" data-hook="description">
-            <%= product_description(@product) rescue Spree.t(:product_has_no_description) %>
+            <%= product_description(@product) %>
           </div>
 
           <div id="cart-form" data-hook="cart_form">
@@ -39,7 +39,9 @@
           </div>
         </div>
 
-        <%= render :partial => 'taxons' %>
+        <div id="taxon-crumbs" class=" five " data-hook="product_taxons">
+          <%= render :partial => 'taxons' %>
+        </div>
       </div>
     </div>
   </div>

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

@@ -16,7 +16,7 @@
                      id="<%= label %>"
                      name="search[<%= filter[:scope].to_s %>][]"
                      value="<%= val %>"
-                     <%= params[:search] && params[:search][filter[:scope]] && params[:search][filter[:scope]].include?(val.to_s) ? "checked" : "" %> />
+                     <%= params[:search].present? && params[:search][filter[:scope]] && params[:search][filter[:scope]].include?(val.to_s) ? "checked" : "" %> />
               <label class="nowrap" for="<%= label %>"> <%= nm %> </label>
             </li>
           <% end %>

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

@@ -2,7 +2,7 @@
   <header id="header" data-hook>
     <div class="container">
       <div class="row">
-        <figure id="logo" class="col-md-4" data-hook>
+        <figure id="logo" class="col-md-4 col-sm-3" data-hook>
           <%= logo %>
         </figure>
         <%= render :partial => 'spree/shared/nav_bar' %>

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

@@ -1,4 +1,4 @@
-<nav class="navbar col-md-8" id="top-nav-bar">
+<nav class="navbar col-md-8 col-sm-9" id="top-nav-bar">
   <ul id="nav-bar" class="nav navbar-nav navbar-right" data-hook>
     <li id="search-bar" data-hook>
       <%= render :partial => 'spree/shared/search' %>

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

@@ -1,17 +1,17 @@
 <div class="row steps-data">
   <% if order.has_step?("address") %>
-    <div class="col-md-3" data-hook="order-bill-address">
+    <div class="col-md-3 col-sm-3 col-xs-6" data-hook="order-bill-address">
       <h4><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h4>
       <%= render 'spree/shared/address', address: order.bill_address %>
     </div>
 
     <% if order.has_step?("delivery") %>
-      <div class="col-md-3" data-hook="order-ship-address">
+      <div class="col-md-3 col-sm-3 col-xs-6" data-hook="order-ship-address">
         <h4><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h4>
         <%= render 'spree/shared/address', address: order.ship_address %>
       </div>
 
-      <div class=" col-md-3" data-hook="order-shipment">
+      <div class="col-md-3 col-sm-3 col-xs-6" data-hook="order-shipment">
         <h4><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:delivery) unless order.completed? %></h4>
         <div class="delivery">
           <% order.shipments.each do |shipment| %>
@@ -25,9 +25,9 @@
       </div>
     <% end %>
   <% end %>
-  
-  <% if @order.has_step?("payment") %>
-    <div class="col-md-3">
+
+  <% if order.has_step?("payment") %>
+    <div class="col-md-3 col-sm-3 col-xs-6" data-hook="order-payment">
       <h4><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:payment) unless order.completed? %></h4>
       <div class="payment-info">
         <% order.payments.valid.each do |payment| %>

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

@@ -1,11 +1,6 @@
-<%
-  paginated_products = @searcher.retrieve_products if params.key?(:keywords)
-  paginated_products ||= products
-%>
-
 <% content_for :head do %>
-  <% if paginated_products.respond_to?(:num_pages) %>
-    <%= rel_next_prev_link_tags paginated_products %>
+  <% if products.respond_to?(:num_pages) %>
+    <%= rel_next_prev_link_tags products %>
   <% end %>
 <% end %>
 
@@ -24,13 +19,16 @@
 <% if products.any? %>
   <div id="products" class="row" data-hook>
     <% products.each do |product| %>
-      <% url = spree.product_path(product, taxon_id: @taxon.try(:id)) %>
-      <div id="product_<%= product.id %>" class="col-md-3 col-sm-6 product-list-item" data-hook="products_list_item" itemscope itemtype="https://schema.org/Product">
+      <% url = spree.product_url(product, taxon_id: @taxon.try(:id)) %>
+      <div id="product_<%= product.id %>" class="col-md-3 col-sm-6 col-xs-6 product-list-item" data-hook="products_list_item" itemscope itemtype="https://schema.org/Product">
         <div class="panel panel-default">
-          <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
+          <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : cache_key_for_product(product)) do %>
             <div class="panel-body text-center product-body">
-              <%= link_to small_image(product, itemprop: "image"), url, itemprop: 'url' %><br/>
-              <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
+              <%= link_to url, itemprop: "url" do %>
+                <%= small_image(product, itemprop: "image") %><br/>
+                <%= content_tag(:span, truncate(product.name, length: 50), class: 'info', itemprop: "name", title: product.name) %>
+              <% end %>
+              <br/>
             </div>
             <div class="panel-footer text-center">
               <span itemprop="offers" itemscope itemtype="https://schema.org/Offer">
@@ -45,6 +43,6 @@
   </div>
 <% end %>
 
-<% if paginated_products.respond_to?(:num_pages) %>
-  <%= paginate paginated_products, theme: 'twitter-bootstrap-3' %>
+<% if products.respond_to?(:num_pages) %>
+  <%= paginate products, theme: 'twitter-bootstrap-3' %>
 <% end %>

data/config/routes.rb

@@ -1,36 +1,32 @@
 Spree::Core::Engine.add_routes do
 
-  root :to => 'home#index'
-
-  resources :products, :only => [:index, :show]
-
-  get '/locale/set', :to => 'locale#set'
+  get '/locale/set', to: 'locale#set'
 
   # non-restful checkout stuff
-  patch '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
-  get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
-  get '/checkout', :to => 'checkout#edit' , :as => :checkout
+  patch '/checkout/update/:state', to: 'checkout#update', as: :update_checkout
+  get '/checkout/:state', to: 'checkout#edit', as: :checkout_state
+  get '/checkout', to: 'checkout#edit', as: :checkout
 
   populate_redirect = redirect do |params, request|
     request.flash[:error] = Spree.t(:populate_get_error)
     request.referer || '/cart'
   end
 
-  get '/orders/populate', :to => populate_redirect
+  get '/orders/populate', to: populate_redirect
 
-  resources :orders, :except => [:index, :new, :create, :destroy] do
-    post :populate, :on => :collection
+  resources :orders, except: [:index, :new, :create, :destroy] do
+    post :populate, on: :collection
   end
 
-  get '/cart', :to => 'orders#edit', :as => :cart
-  patch '/cart', :to => 'orders#update', :as => :update_cart
-  put '/cart/empty', :to => 'orders#empty', :as => :empty_cart
+  get '/cart', to: 'orders#edit', as: :cart
+  patch '/cart', to: 'orders#update', as: :update_cart
+  put '/cart/empty', to: 'orders#empty', as: :empty_cart
 
   # route globbing for pretty nested taxon and product paths
-  get '/t/*id', :to => 'taxons#show', :as => :nested_taxons
+  get '/t/*id', to: 'taxons#show', as: :nested_taxons
 
-  get '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
-  get '/content/cvv', :to => 'content#cvv', :as => :cvv
-  get '/content/*path', :to => 'content#show', :as => :content
-  get '/cart_link', :to => 'store#cart_link', :as => :cart_link
+  get '/unauthorized', to: 'home#unauthorized', as: :unauthorized
+  get '/content/cvv', to: 'content#cvv', as: :cvv
+  get '/content/*path', to: 'content#show', as: :content
+  get '/cart_link', to: 'store#cart_link', as: :cart_link
 end

data/spec/controllers/controller_helpers_spec.rb

@@ -5,22 +5,118 @@ require 'spec_helper'
 # ProductsController is good.
 describe Spree::ProductsController, :type => :controller do
 
+  let!(:available_locales) { [:en, :de] }
+  let!(:available_locale) { :de }
+  let!(:unavailable_locale) { :ru }
+
   before do
     I18n.enforce_available_locales = false
-    expect(I18n).to receive(:available_locales).and_return([:en, :de])
-    Spree::Frontend::Config[:locale] = :de
+    expect(I18n).to receive(:available_locales).and_return(available_locales)
   end
 
   after do
     Spree::Frontend::Config[:locale] = :en
+    Rails.application.config.i18n.default_locale = :en
     I18n.locale = :en
     I18n.enforce_available_locales = true
   end
 
   # Regression test for #1184
-  it "sets the default locale based off Spree::Frontend::Config[:locale]" do
-    expect(I18n.locale).to eq(:en)
-    spree_get :index
-    expect(I18n.locale).to eq(:de)
+  context 'when session locale not set' do
+    before(:each) do
+      session[:locale] = nil
+    end
+
+    context 'when Spree::Frontend::Config[:locale] not present' do
+      before(:each) do
+        Spree::Frontend::Config[:locale] = nil
+      end
+
+      context 'when rails application default locale not set' do
+        before(:each) do
+          Rails.application.config.i18n.default_locale = nil
+        end
+
+        it "sets the I18n default locale" do
+          spree_get :index
+          expect(I18n.locale).to eq(I18n.default_locale)
+        end
+      end
+
+      context 'when rails application default locale is set' do
+        context 'and not in available_locales' do
+          before(:each) do
+            Rails.application.config.i18n.default_locale = unavailable_locale
+          end
+
+          it "sets the I18n default locale" do
+            spree_get :index
+            expect(I18n.locale).to eq(I18n.default_locale)
+          end
+        end
+
+        context 'and in available_locales' do
+          before(:each) do
+            Rails.application.config.i18n.default_locale = available_locale
+          end
+
+          it "sets the rails app locale" do
+            expect(I18n.locale).to eq(:en)
+            spree_get :index
+            expect(I18n.locale).to eq(available_locale)
+          end
+        end
+      end
+    end
+
+    context 'when Spree::Frontend::Config[:locale] is present' do
+      context 'and not in available_locales' do
+        before(:each) do
+          Spree::Frontend::Config[:locale] = unavailable_locale
+        end
+
+        it "sets the I18n default locale" do
+          spree_get :index
+          expect(I18n.locale).to eq(I18n.default_locale)
+        end
+      end
+
+      context 'and not in available_locales' do
+        before(:each) do
+          Spree::Frontend::Config[:locale] = available_locale
+        end
+
+        it "sets the default locale based on Spree::Frontend::Config[:locale]" do
+          expect(I18n.locale).to eq(:en)
+          spree_get :index
+          expect(I18n.locale).to eq(available_locale)
+        end
+      end
+    end
+  end
+
+  context 'when session locale is set' do
+    context 'and not in available_locales' do
+      before(:each) do
+        session[:locale] = unavailable_locale
+      end
+
+      it "sets the I18n default locale" do
+        spree_get :index
+        expect(I18n.locale).to eq(I18n.default_locale)
+      end
+    end
+
+    context 'and in available_locales' do
+      before(:each) do
+        session[:locale] = available_locale
+      end
+
+      it "sets the session locale" do
+        expect(I18n.locale).to eq(:en)
+        spree_get :index
+        expect(I18n.locale).to eq(available_locale)
+      end
+    end
   end
 end