spree_frontend 3.1.14 → 3.2.0.rc1

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

@@ -6,7 +6,7 @@
           <h3 class="panel-title"><%= Spree.t(:billing_address) %></h3>
         </div>
         <div class="panel-body">
-          <%= render :partial => 'spree/address/form', :locals => { :form => bill_form, :address_type => 'billing', :address => @order.bill_address } %>
+          <%= render partial: 'spree/address/form', locals: { form: bill_form, address_type: 'billing', address: @order.bill_address } %>
         </div>
       <% end %>
     </div>
@@ -20,12 +20,12 @@
         </div>
         <div class="panel-body">
           <p class="field checkbox" data-hook="use_billing">
-            <%= label_tag :order_use_billing, :id => 'use_billing' do %>
+            <%= label_tag :order_use_billing, id: 'use_billing' do %>
               <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
               <%= Spree.t(:use_billing_address) %>
             <% end %>
           </p>
-          <%= render :partial => 'spree/address/form', :locals => { :form => ship_form, :address_type => 'shipping', :address => @order.ship_address } %>
+          <%= render partial: 'spree/address/form', locals: { form: ship_form, address_type: 'shipping', address: @order.ship_address } %>
         </div>
       <% end %>
     </div>
@@ -33,7 +33,7 @@
 </div>
 
 <div class="well text-right form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), :class => 'btn btn-lg btn-success' %>
+  <%= submit_tag Spree.t(:save_and_continue), class: 'btn btn-lg btn-success' %>
   <% if try_spree_current_user %>
     <span data-hook="save_user_address">
       &nbsp; &nbsp;

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

@@ -3,11 +3,11 @@
     <h3 class="panel-title"><%= Spree.t(:confirm) %></h3>
   </div>
   <div class="panel-body">
-    <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
+    <%= render partial: 'spree/shared/order_details', locals: { order: @order } %>
   </div>
 </div>
 
 <div class="well text-right form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:place_order), :class => 'btn btn-lg btn-success' %>
+  <%= submit_tag Spree.t(:place_order), class: 'btn btn-lg btn-success' %>
   <script>Spree.disableSaveOnClick();</script>
 </div>

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

@@ -43,7 +43,7 @@
             <% ship_form.object.shipping_rates.each do |rate| %>
               <li class="list-group-item shipping-method">
                 <label>
-                  <%= ship_form.radio_button :selected_shipping_rate_id, rate.id %>
+                  <%= ship_form.radio_button :selected_shipping_rate_id, rate.id, data: { behavior: 'shipping-method-selector', cost: rate.display_cost } %>
                   <span class="rate-name"><%= rate.name %></span>
                   <span class="badge rate-cost"><%= rate.display_cost %></span>
                 </label>
@@ -88,7 +88,7 @@
     <% if Spree::Config[:shipping_instructions] %>
       <p id="minstrs" data-hook>
         <h4><%= Spree.t(:shipping_instructions) %></h4>
-        <%= form.text_area :special_instructions, :cols => 40, :rows => 4, :class => "form-control" %>
+        <%= form.text_area :special_instructions, cols: 40, rows: 4, class: "form-control" %>
       </p>
     <% end %>
   </div>
@@ -97,5 +97,7 @@
 <br />
 
 <div class="well text-right form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), :class => 'btn btn-lg btn-success' %>
+  <%= submit_tag Spree.t(:save_and_continue), class: 'btn btn-lg btn-success' %>
 </div>
+
+<%= javascript_include_tag 'spree/frontend/checkout/shipment' %>

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

@@ -42,7 +42,7 @@
         <li class="list-group-item">
           <label>
             <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.available_payment_methods.first %>
-            <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
+            <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
           </label>
         </li>
       <% end %>
@@ -52,7 +52,7 @@
       <% @order.available_payment_methods.each do |method| %>
         <li id="payment_method_<%= method.id %>" class="<%= 'last' if method == @order.available_payment_methods.last %>" data-hook>
           <fieldset>
-            <%= render :partial => "spree/checkout/payment/#{method.method_type}", :locals => { :payment_method => method } %>
+            <%= render partial: "spree/checkout/payment/#{method.method_type}", locals: { payment_method: method } %>
           </fieldset>
         </li>
       <% end %>
@@ -60,7 +60,7 @@
 
     <p class='field' data-hook='coupon_code'>
       <%= form.label :coupon_code %>
-      <%= form.text_field :coupon_code, :class => 'form-control' %>
+      <%= form.text_field :coupon_code, class: 'form-control' %>
     </p>
   </div>
 </div>

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

@@ -27,10 +27,10 @@
       <% end %>
     </tbody>
 
-    <% if order.passed_checkout_step?("delivery") && order.shipments.any? %>
+    <% if order.passed_checkout_step?("address") && order.shipments.any? %>
       <tr data-hook="shipping_total">
         <td><%= Spree.t(:shipping_total) %>:</td>
-        <td><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
+        <td data-hook='shipping-total' data-currency=<%= Money::Currency.find(order.currency).symbol %>><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
       </tr>
 
       <% if order.shipment_adjustments.nonzero.exists? %>
@@ -59,7 +59,7 @@
 
     <tr data-hook="order_total">
       <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>
+      <td><strong><span id='summary-order-total' class="lead text-primary" data-currency=<%= Money::Currency.find(order.currency).symbol %>><%= order.display_total.to_html %></span></strong></td>
     </tr>
 
     <% if order.using_store_credit? %>

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

@@ -1,3 +1,4 @@
+<% @body_id = 'checkout-page' %>
 <% content_for :google_analytics do %>
   <%= render partial: 'spree/shared/google_checkout.js', locals: { order: @order, step_number: (@order.checkout_steps.index(@order.state) + 1) } %>
 <% end %>

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

@@ -1,20 +1,20 @@
 <div class="well clearfix">
-  <%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image', :class => 'pull-right', :width => '170', :height => '28' %>
+  <%= image_tag 'credit_cards/credit_card.gif', id: 'credit-card-image', class: 'pull-right', width: '170', height: '28' %>
   <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
   <p class="field">
     <%= 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'} %>
+    <%= 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" 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") %>
+    <% 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;
     <span id="card_type" style="display:none;">
       ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
@@ -27,16 +27,16 @@
       <%= 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" %>
+      <%= 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" 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" %>
+      <%= 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>
   </div>
 
-  <%= hidden_field_tag "#{param_prefix}[cc_type]", '', :id => "cc_type", :class => 'ccType' %>
+  <%= hidden_field_tag "#{param_prefix}[cc_type]", '', id: "cc_type", class: 'ccType' %>
 </div>

data/app/views/spree/home/index.html.erb

@@ -1,12 +1,13 @@
+<% @body_id = 'home-page' %>
 <% content_for :sidebar do %>
   <div data-hook="homepage_sidebar_navigation">
-    <%= render :partial => 'spree/shared/taxonomies' %>
+    <%= render partial: 'spree/shared/taxonomies' %>
   </div>
 <% end %>
 
 <div data-hook="homepage_products">
   <% cache(cache_key_for_products) do %>
-    <%= render :partial => 'spree/shared/products', :locals => { :products => @products } %>
+    <%= render partial: 'spree/shared/products', locals: { products: @products } %>
   <% end %>
 </div>
 

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

@@ -2,7 +2,7 @@
   <tr class="adjustment">
     <td colspan="4" align='right'><h5><%= type %>: <%= label %></h5></td>
     <td colspan='2'>
-      <h5><%= Spree::Money.new(adjustments.sum(&:amount), :currency => @order.currency) %></h5>
+      <h5><%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %></h5>
     </td>
   </tr>
 <% end %>

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

@@ -6,12 +6,12 @@
 <tbody id="cart_adjustments" data-hook>
   <% if @order.line_item_adjustments.exists? %>
     <% @order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
-      <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:promotion) %>
+      <%= render "spree/orders/adjustment_row", label: label, adjustments: adjustments, type: Spree.t(:promotion) %>
     <% end %>
   <% end %>
 
   <% @order.all_adjustments.tax.eligible.group_by(&:label).each do |label, adjustments| %>
-    <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:tax) %>
+    <%= render "spree/orders/adjustment_row", label: label, adjustments: adjustments, type: Spree.t(:tax) %>
   <% end %>
 
   <% @order.shipments.each do |shipment| %>
@@ -24,6 +24,6 @@
   <% end %>
 
   <% @order.adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
-    <%= render "spree/orders/adjustment_row", :label => label, :adjustments => adjustments, :type => Spree.t(:adjustment) %>
+    <%= render "spree/orders/adjustment_row", label: label, adjustments: adjustments, type: Spree.t(:adjustment) %>
   <% end %>
 </tbody>

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

@@ -16,7 +16,7 @@
             <%= render partial: 'form', locals: { order_form: order_form } %>
           </div>
 
-          <div class="links col-md-6 navbar-form pull-right text-right" data-hook="cart_buttons">
+          <div class="links col-md-3 navbar-form pull-right text-right" data-hook="cart_buttons">
             <div class="form-group">
               <%= button_tag class: 'btn btn-primary', id: 'update-button' do %>
                 <%= Spree.t(:update) %>
@@ -26,11 +26,19 @@
               <% end %>
             </div>
           </div>
+
+          <div class='col-md-6 form-inline pull-right' data-hook='coupon_code'>
+            <label>
+              <%= order_form.label :coupon_code %>
+              <%= order_form.text_field :coupon_code, size: '30', class: 'form-control' %>
+              <%= button_tag Spree.t(:coupon_code_apply), class: 'btn btn-default' %>
+            </label>
+          </div>
         </div>
       <% end %>
     </div>
 
-    <div id="empty-cart" class="col-md-6 pull-left" data-hook>
+    <div id="empty-cart" class="col-md-3 pull-left" data-hook>
       <%= form_tag empty_cart_path, method: :put do %>
         <p id="clear_cart_link" data-hook>
           <%= submit_tag Spree.t(:empty_cart), class: 'btn btn-default' %>
@@ -41,3 +49,8 @@
     </div>
   <% end %>
 </div>
+
+<script>
+  Spree.current_order_id = "<%= @order.number %>"
+  Spree.current_order_token = "<%= @order.guest_token %>"
+</script>

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

@@ -3,7 +3,7 @@
   <table id="product-properties" class="table table-striped" data-hook>
     <tbody>
       <% @product_properties.each do |product_property| %>
-        <% css_class = cycle('even', 'odd', :name => "properties") %>
+        <% css_class = cycle('even', 'odd', name: "properties") %>
         <tr class="<%= css_class %>">
           <td><strong><%= product_property.property.presentation %></strong></td>
           <td><%= product_property.value %></td>

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

@@ -1,10 +1,10 @@
-<% if "spree/products" == params[:controller] && @taxon || !@taxonomies.empty? %>
+<% if "spree/products" == params[:controller] && @taxon || @taxonomies.present? %>
   <% content_for :sidebar do %>
     <div data-hook="homepage_sidebar_navigation">
       <% if "spree/products" == params[:controller] && @taxon %>
-        <%= render :partial => 'spree/shared/filters' %>
+        <%= render partial: 'spree/shared/filters' %>
       <% else %>
-        <%= render :partial => 'spree/shared/taxonomies' %>
+        <%= render partial: 'spree/shared/taxonomies' %>
       <% end %>
     </div>
   <% end %>
@@ -15,13 +15,13 @@
     <% if @products.empty? %>
       <h6 class="search-results-title"><%= Spree.t(:no_products_found) %></h6>
     <% else %>
-      <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+      <%= render partial: 'spree/shared/products', locals: { products: @products, taxon: @taxon } %>
     <% end %>
   </div>
 <% else %>
   <div data-hook="homepage_products">
     <% cache(cache_key_for_products) do %>
-      <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+      <%= render partial: 'spree/shared/products', locals: { products: @products, taxon: @taxon } %>
     <% end %>
   </div>
 <% end %>

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

@@ -7,20 +7,20 @@
         <div id="product-images" data-hook="product_images">
           <div id="main-image" class="panel panel-default" data-hook>
             <div class="panel-body text-center">
-              <%= render :partial => 'image' %>
+              <%= product_image(@product, itemprop: "image") %>
             </div>
           </div>
           <div id="thumbnails" data-hook>
-            <%= render :partial => 'thumbnails' %>
+            <%= render partial: 'thumbnails' %>
           </div>
         </div>
 
         <div data-hook="product_properties">
-          <%= render :partial => 'properties' %>
+          <%= render partial: 'properties' %>
         </div>
 
         <div data-hook="promotions">
-          <%= render :partial => 'promotions' %>
+          <%= render partial: 'promotions' %>
         </div>
       </div>
     </div>
@@ -35,12 +35,12 @@
           </div>
 
           <div id="cart-form" data-hook="cart_form">
-            <%= render :partial => 'cart_form' %>
+            <%= render partial: 'cart_form' %>
           </div>
         </div>
 
         <div id="taxon-crumbs" class=" five " data-hook="product_taxons">
-          <%= render :partial => 'taxons' %>
+          <%= render partial: 'taxons' %>
         </div>
       </div>
     </div>

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

@@ -18,7 +18,9 @@
     </div>
     <div class="local">
       <span class="locality"><%= address.city %></span>
-      <span class="region"><%= address.state_text %></span>
+      <% if Spree::Config[:address_requires_state] %>
+        <span class="region"><%= address.state_text %></span>
+      <% end %>
       <span class="postal-code"><%= address.zipcode %></span>
       <div class="country-name"><%= address.country.try(:name) %></div>
     </div>

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

@@ -1,6 +1,6 @@
 <% if target && target.errors.any? %>
   <div id="errorExplanation" class="alert alert-danger" data-hook>
-    <h3><%= Spree.t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h3>
+    <h3><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.count) %>:</h3>
     <p><%= Spree.t(:there_were_problems_with_the_following_fields) %>:</p>
      <ul>
        <% target.errors.full_messages.each do |msg| %>

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

@@ -1,7 +1,7 @@
 <% filters = @taxon ? @taxon.applicable_filters : [Spree::Core::ProductFilters.all_taxons] %>
 
 <% unless filters.empty? %>
-  <%= form_tag '', :method => :get, :id => 'sidebar_products_search' do %>
+  <%= form_tag '', method: :get, id: 'sidebar_products_search' do %>
     <%= hidden_field_tag 'per_page', params[:per_page] %>
     <% filters.each do |filter| %>
       <% labels = filter[:labels] || filter[:conds].map {|m,c| [m,m]} %>
@@ -23,6 +23,6 @@
         </ul>
       </div>
     <% end %>
-    <%= submit_tag Spree.t(:search), :name => nil, :class => 'btn btn-primary' %>
+    <%= submit_tag Spree.t(:search), name: nil, class: 'btn btn-primary' %>
   <% end %>
 <% end %>

data/app/views/spree/shared/_google_add_items.js.erb

@@ -1,10 +1,10 @@
 <% order.line_items.each do |line_item| %>
 ga('ec:addProduct', {               // Provide product details in a productFieldObject.
-  'id': '<%= j (line_item.variant.sku || line_item.variant_id) %>',  // Product ID (string).
-  'name': '<%= j line_item.variant.product.name %>', // Product name (string).
-  'category': '',            // Product category (string).
-  'brand': '',                // Product brand (string).
-  'variant': '',               // Product variant (string).
+  'id': '<%= j (line_item.sku || line_item.variant_id) %>',  // Product ID (string).
+  'name': '<%= j line_item.name %>', // Product name (string).
+  'category': '<%= j line_item.category.try(:name) %>',            // Product category (string).
+  'brand': '<%= j line_item.brand.try(:name) %>',                // Product brand (string).
+  'variant': '<%= j line_item.options_text %>',               // Product variant (string).
   'price': '<%= line_item.price %>',
   'quantity': <%= line_item.quantity %>
 });

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

@@ -7,8 +7,10 @@
 <%= favicon_link_tag 'favicon.ico' %>
 <%= stylesheet_link_tag 'spree/frontend/all', media: 'screen' %>
 <%= csrf_meta_tags %>
+<%= render 'spree/shared/paths' %>
 <%= javascript_include_tag 'spree/frontend/all' %>
 <!--[if lt IE 9]>
   <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6/html5shiv.min.js"></script>
 <![endif]-->
 <%= yield :head %>
+<%= render 'spree/shared/translations' %>

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

@@ -5,11 +5,11 @@
         <figure id="logo" class="col-md-4 col-sm-3" data-hook>
           <%= logo %>
         </figure>
-        <%= render :partial => 'spree/shared/nav_bar' %>
+        <%= render partial: 'spree/shared/nav_bar' %>
       </div>
     </div>
   </header>
   <div class="container">
-    <%= render :partial => 'spree/shared/main_nav_bar' if store_menu? %>
+    <%= render partial: 'spree/shared/main_nav_bar' if store_menu? %>
   </div>
 </div>

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

@@ -1,10 +1,10 @@
-<%= form_for Spree::User.new, :as => :spree_user, :url => spree.create_new_session_path do |f| %>
+<%= form_for Spree::User.new, as: :spree_user, url: spree.create_new_session_path do |f| %>
   <fieldset id="password-credentials">
     <div class="form-group">
-      <%= f.email_field :email, :class => 'form-control', :tabindex => 1, :placeholder => Spree.t(:email) %>
+      <%= f.email_field :email, class: 'form-control', tabindex: 1, placeholder: Spree.t(:email) %>
     </div>
     <div class="form-group">
-      <%= f.password_field :password, :class => 'form-control', :tabindex => 2, :placeholder => Spree.t(:password) %>
+      <%= f.password_field :password, class: 'form-control', tabindex: 2, placeholder: Spree.t(:password) %>
     </div>
     <div class="checkbox">
       <label>
@@ -13,7 +13,7 @@
       </label>
     </div>
     <div class="form-group">
-      <%= f.submit Spree.t(:login), :class => 'btn btn-lg btn-success btn-block', :tabindex => 3 %>
+      <%= f.submit Spree.t(:login), class: 'btn btn-lg btn-success btn-block', tabindex: 3 %>
     </div>
   </fieldset>
 <% end %>