solidus_frontend 2.1.1 → 2.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e323f4e7b153bb4040b7dc1dfcbbc7defc77ae4
-  data.tar.gz: bdc8eedc12748eb0daf6ab42b24b6f3666f927e1
+  metadata.gz: 3848fb0f3afde34da5f91a456bc57bb61b4b4785
+  data.tar.gz: e6d1cf1dac916b4b2de89815736bf3d83ffbe470
 SHA512:
-  metadata.gz: 5b1eee5392d91699615e41c01bc2aa4798055bc3122654d61e2c6f192ffec664170ea64aa72bec98b3f2c059f392305ff9395ae2b24066ff1e402522eab7c9fe
-  data.tar.gz: 3aa20a2be94c224c20c593011419ad55bc7ee2eeae0d695bc6c6928f70394358ff2bad255ccdc0a6b85060aef4106bbd4d5a261f83524fe277ad2549a801a64e
+  metadata.gz: ce6aea89fa22eedd9a168df53f32a217d02a0721ee1a70716b02bb184751766a55d45ec19b717c9d4a6e34a17204dafea0545dc3fe0685a55b773de444876d4c
+  data.tar.gz: 2b669c2dbac2c9a6a23cea1d5e1c1bc6707d5d150267ea6863e55eb442068758c8419fe0ff724c69b8600f09a8ee0235d9160867f6b08a2b969dae842cb96ef4

data/Gemfile

@@ -2,5 +2,6 @@ eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
 
 gem 'solidus_core', path: '../core'
 gem 'solidus_api', path: '../api'
+gem 'generator_spec', group: :test
 
 gemspec

data/README.md

@@ -2,6 +2,36 @@
 
 Frontend contains controllers and views implementing a storefront and cart for Solidus.
 
+## Override views
+
+In order to customize a view you should copy the file into your host app. Using Deface is not
+recommended as it provides lots of headaches while debugging and degrades your shops performance.
+
+Solidus provides a generator to help with copying the right view into your host app.
+
+Simply call the generator to copy all views into your host app.
+
+```shell
+$ bundle exec rails g solidus:views:override
+```
+
+If you only want to copy certain views into your host app, you can provide the `--only` argument:
+
+```shell
+$ bundle exec rails g solidus:views:override --only products/show
+```
+
+The argument to `--only` can also be a substring of the name of the view from the `app/views/spree` folder:
+
+```shell
+$ bundle exec rails g solidus:views:override --only product
+```
+
+This will copy all views whose directory or filename contains the string "product".
+
+### Handle upgrades
+
+After upgrading solidus to a new version run the generator again and follow on screen instructions.
 
 ## Testing
 

data/app/assets/config/solidus_frontend_manifest.js

@@ -0,0 +1,6 @@
+//= link_tree ../../../vendor/assets/javascripts/jquery.validate/localization/ .js
+//
+//= link_tree ../images
+//
+//= link spree/frontend/all.js
+//= link spree/frontend/all.css

data/app/assets/javascripts/spree/frontend/checkout/coupon-code.js.coffee

@@ -13,14 +13,14 @@ Spree.onCouponCodeApply = (e) ->
     }
   )
 
-  couponStatus.removeClass([successClass,errorClass].join(" "));
+  couponStatus.removeClass([successClass,errorClass].join(" "))
 
   req = Spree.ajax
     method: "PUT",
     url: url
 
   req.done (data) ->
-    window.location.reload();
+    window.location.reload()
     couponCodeField.val('')
     couponStatus.addClass(successClass).html("Coupon code applied successfully.")
 

data/app/assets/javascripts/spree/frontend/checkout.js.coffee

@@ -7,3 +7,11 @@
 Spree.disableSaveOnClick = ->
   ($ 'form.edit_order').submit ->
     ($ this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass 'disabled'
+
+Spree.ready ($) ->
+  termsCheckbox = ($ '#accept_terms_and_conditions')
+  termsCheckbox.change( () ->
+    submitBtn = $(this.closest('form')).find(':submit')
+    submitBtn.prop('disabled', !this.checked)
+    submitBtn.toggleClass('disabled', !this.checked)
+  )

data/app/assets/stylesheets/spree/frontend/screen.css.scss

@@ -30,13 +30,6 @@ hr {
   border-bottom: $default_border;
 }
 
-/* Custom text-selection colors (remove any text shadows: twitter.com/miketaylr/status/12228805301) */
-::-moz-selection{background: $link_text_color; color: $layout_background_color; text-shadow: none;}
-::selection {background: $link_text_color; color: $layout_background_color; text-shadow: none;}
-
-/*  j.mp/webkit-tap-highlight-color */
-a:link {-webkit-tap-highlight-color: $link_text_color;}
-
 ins {background-color: $link_text_color; color: $layout_background_color; text-decoration: none;}
 mark {background-color: $link_text_color; color: $layout_background_color; font-style: italic; font-weight: bold;}
 
@@ -216,6 +209,16 @@ input[type= "reset"], button, a.button {
   }
 }
 
+input[type=button],
+input[type=submit],
+button {
+  &.disabled {
+    background:#ccc;
+    border-color: #ccc;
+    text-shadow:none;
+  }
+}
+
 input[type="checkbox"], label {
   vertical-align: middle;
 }
@@ -925,6 +928,14 @@ p[data-hook="use_billing"] {
   }
 }
 
+.terms_and_conditions {
+  .policy {
+    height: 100px;
+    width: 100%;
+    overflow: scroll;
+  }
+}
+
 /*--------------------------------------*/
 /* Cart
 /*--------------------------------------*/

data/app/controllers/spree/checkout_controller.rb

@@ -25,26 +25,22 @@ module Spree
 
     # Updates the order and advances to the next state (when possible.)
     def update
-      if OrderUpdateAttributes.new(@order, update_params, request_env: request.headers.env).apply
-        @order.temporary_address = !params[:save_user_address]
-        success = if @order.state == 'confirm'
-          @order.complete
-        else
-          @order.next
-        end
-        if !success
-          flash[:error] = @order.errors.full_messages.join("\n")
-          redirect_to(checkout_state_path(@order.state)) && return
+      if update_order
+
+        assign_temp_address
+
+        unless transition_forward
+          redirect_on_failure
+          return
         end
 
+
         if @order.completed?
-          @current_order = nil
-          flash.notice = Spree.t(:order_processed_successfully)
-          flash['order_completed'] = true
-          redirect_to completion_route
+          finalize_order
         else
-          redirect_to checkout_state_path(@order.state)
+          send_to_next_state
         end
+
       else
         render :edit
       end
@@ -52,6 +48,42 @@ module Spree
 
     private
 
+    def update_order
+      OrderUpdateAttributes.new(@order, update_params, request_env: request.headers.env).apply
+    end
+
+    def assign_temp_address
+      @order.temporary_address = !params[:save_user_address]
+    end
+
+    def redirect_on_failure
+      flash[:error] = @order.errors.full_messages.join("\n")
+      redirect_to(checkout_state_path(@order.state))
+    end
+
+    def transition_forward
+      if @order.confirm?
+        @order.complete
+      else
+        @order.next
+      end
+    end
+
+    def finalize_order
+      @current_order = nil
+      set_successful_flash_notice
+      redirect_to completion_route
+    end
+
+    def set_successful_flash_notice
+      flash.notice = Spree.t(:order_processed_successfully)
+      flash['order_completed'] = true
+    end
+
+    def send_to_next_state
+      redirect_to checkout_state_path(@order.state)
+    end
+
     def update_params
       if update_params = massaged_params[:order]
         update_params.permit(permitted_checkout_attributes)
@@ -65,7 +97,11 @@ module Spree
       massaged_params = params.deep_dup
 
       move_payment_source_into_payments_attributes(massaged_params)
-      move_existing_card_into_payments_attributes(massaged_params)
+      if massaged_params[:order] && massaged_params[:order][:existing_card].present?
+        Spree::Deprecation.warn("Passing order[:existing_card] is deprecated. Send order[:wallet_payment_source_id] instead.", caller)
+        move_existing_card_into_payments_attributes(massaged_params) # deprecated
+      end
+      move_wallet_payment_source_id_into_payments_attributes(massaged_params)
       set_payment_parameters_amount(massaged_params, @order)
 
       massaged_params
@@ -74,7 +110,7 @@ module Spree
     def ensure_valid_state
       unless skip_state_validation?
         if (params[:state] && !@order.has_checkout_step?(params[:state])) ||
-           (!params[:state] && !@order.has_checkout_step?(@order.state))
+          (!params[:state] && !@order.has_checkout_step?(@order.state))
           @order.state = 'cart'
           redirect_to checkout_state_path(@order.checkout_steps.first)
         end
@@ -118,7 +154,8 @@ module Spree
 
     def ensure_sufficient_stock_lines
       if @order.insufficient_stock_lines.present?
-        flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity)
+        out_of_stock_items = @order.insufficient_stock_lines.collect(&:name).to_sentence
+        flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity, names: out_of_stock_items)
         redirect_to spree.cart_path
       end
     end
@@ -136,7 +173,7 @@ module Spree
     def before_address
       # if the user has a default address, a callback takes care of setting
       # that; but if he doesn't, we need to build an empty one here
-      default = { country_id: Country.default.id }
+      default = {country_id: Spree::Country.default.id}
       @order.build_bill_address(default) unless @order.bill_address
       @order.build_ship_address(default) if @order.checkout_steps.include?('delivery') && !@order.ship_address
     end
@@ -157,8 +194,13 @@ module Spree
         end
       end
 
-      if try_spree_current_user && try_spree_current_user.respond_to?(:payment_sources)
-        @payment_sources = try_spree_current_user.payment_sources
+      if try_spree_current_user && try_spree_current_user.respond_to?(:wallet)
+        @wallet_payment_sources = try_spree_current_user.wallet.wallet_payment_sources
+        @default_wallet_payment_source = @wallet_payment_sources.detect(&:default) ||
+                                         @wallet_payment_sources.first
+        # TODO: How can we deprecate this instance variable?  We could try
+        # wrapping it in a delegating object that produces deprecation warnings.
+        @payment_sources = try_spree_current_user.wallet.wallet_payment_sources.map(&:payment_source).select { |ps| ps.is_a?(Spree::CreditCard) }
       end
     end
 

data/app/controllers/spree/orders_controller.rb

@@ -13,7 +13,7 @@ module Spree
     skip_before_action :verify_authenticity_token, only: [:populate]
 
     def show
-      @order = Order.find_by_number!(params[:id])
+      @order = Spree::Order.find_by_number!(params[:id])
     end
 
     def update
@@ -36,7 +36,7 @@ module Spree
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order || Order.incomplete.find_or_initialize_by(guest_token: cookies.signed[:guest_token])
+      @order = current_order || Spree::Order.incomplete.find_or_initialize_by(guest_token: cookies.signed[:guest_token])
       associate_user
     end
 

data/app/controllers/spree/products_controller.rb

@@ -37,9 +37,9 @@ module Spree
 
     def load_product
       if try_spree_current_user.try(:has_spree_role?, "admin")
-        @products = Product.with_deleted
+        @products = Spree::Product.with_deleted
       else
-        @products = Product.available
+        @products = Spree::Product.available
       end
       @product = @products.friendly.find(params[:id])
     end

data/app/controllers/spree/store_controller.rb

@@ -39,7 +39,7 @@ module Spree
     end
 
     def lock_order
-      OrderMutex.with_lock!(@order) { yield }
+      Spree::OrderMutex.with_lock!(@order) { yield }
     rescue Spree::OrderMutex::LockFailed
       flash[:error] = Spree.t(:order_mutex_error)
       redirect_to spree.cart_path

data/app/controllers/spree/taxons_controller.rb

@@ -6,7 +6,7 @@ module Spree
     respond_to :html
 
     def show
-      @taxon = Taxon.find_by_permalink!(params[:id])
+      @taxon = Spree::Taxon.find_by_permalink!(params[:id])
       return unless @taxon
 
       @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))

data/app/models/spree/frontend_configuration.rb

@@ -1,5 +1,8 @@
 module Spree
   class FrontendConfiguration < Preferences::Configuration
     preference :locale, :string, default: Rails.application.config.i18n.default_locale
+
+    # Add your terms and conditions in app/views/spree/checkout/_terms_and_conditions.en.html.erb
+    preference :require_terms_and_conditions_acceptance, :boolean, default: false
   end
 end

data/app/views/spree/address/_form.html.erb

@@ -51,7 +51,7 @@
         <%=
           form.collection_select(
             :state_id, address.country.states, :id, :name,
-            {:include_blank => true},
+            {include_blank: true},
             {
               class: have_states ? 'required' : '',
               style: have_states ? '' : 'display: none;',
@@ -70,7 +70,7 @@
         %>
       </span>
       <noscript>
-        <%= form.text_field :state_name, :class => 'required', autocomplete: address_type + ' address-level1' %>
+        <%= form.text_field :state_name, class: 'required', autocomplete: address_type + ' address-level1' %>
       </noscript>
     </p>
   <% end %>

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

@@ -2,7 +2,7 @@
   <fieldset id="billing" data-hook>
     <%= form.fields_for :bill_address do |bill_form| %>
       <legend align="center"><%= Spree.t(:billing_address) %></legend>
-      <%= 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 } %>
     <% end %>
   </fieldset>
 </div>
@@ -13,16 +13,16 @@
       <legend align="center"><%= Spree.t(:shipping_address) %></legend>
       <p class="field checkbox" data-hook="use_billing">
         <%= 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' %>
+        <%= 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 } %>
+      <%= render partial: 'spree/address/form', locals: { form: ship_form, address_type: 'shipping', address: @order.ship_address } %>
     <% end %>
   </fieldset>
 </div>
 <hr class="clear" />
 
 <div class="form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), :class => 'continue button primary' %>
+  <%= submit_tag Spree.t(:save_and_continue), class: 'continue button primary' %>
   <% if try_spree_current_user %>
     <span data-hook="save_user_address">
       &nbsp; &nbsp;

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

@@ -1,12 +1,25 @@
 <fieldset id="order_details" data-hook>
   <div class="clear"></div>
   <legend align="center"><%= Spree.t(:confirm) %></legend>
-  <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
+  <%= render partial: 'spree/shared/order_details', locals: { order: @order } %>
 </fieldset>
 
 <br />
 
 <div class="form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:place_order), :class => 'continue button primary' %>
+  <% Spree::Frontend::Config[:require_terms_and_conditions_acceptance].tap do |requires_acceptance| %>
+    <% if requires_acceptance %>
+      <div class="terms_and_conditions" data-hook="terms_and_conditions">
+        <div class="policy"><%= render partial: "spree/checkout/terms_and_conditions" %></div>
+        <%= check_box_tag :accept_terms_and_conditions, 'accepted', false %>
+        <%= label_tag :accept_terms_and_conditions, Spree.t(:agree_to_terms_of_service) %>
+      </div>
+    <% end %>
+
+    <%= submit_tag Spree.t(:place_order),
+      disabled: requires_acceptance,
+      class: "continue button primary #{ 'disabled' if requires_acceptance }" %>
+  <% end %>
+
   <script>Spree.disableSaveOnClick();</script>
 </div>

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

@@ -87,7 +87,7 @@
     <% if Spree::Config[:shipping_instructions] %>
       <p id="minstrs" data-hook>
         <%= form.label :special_instructions, Spree.t(:shipping_instructions) %><br />
-        <%= form.text_area :special_instructions, :cols => 40, :rows => 7 %>
+        <%= form.text_area :special_instructions, cols: 40, rows: 7 %>
       </p>
     <% end %>
   </div>
@@ -96,5 +96,5 @@
 <br />
 
 <div class="form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), :class => 'continue button primary' %>
+  <%= submit_tag Spree.t(:save_and_continue), class: 'continue button primary' %>
 </div>

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

@@ -1,7 +1,7 @@
 <fieldset id="payment" data-hook>
   <legend align="center"><%= Spree.t(:payment_information) %></legend>
   <div data-hook="checkout_payment_step">
-    <% if @payment_sources.present? %>
+    <% if @wallet_payment_sources.present? %>
       <div class="card_options">
         <%= radio_button_tag 'use_existing_card', 'yes', true %>
         <label for="use_existing_card_yes">
@@ -18,16 +18,16 @@
         <p class="field" data-hook="existing_cards">
           <table class="existing-credit-card-list">
             <tbody>
-              <% @payment_sources.each do |card| %>
-                <tr id="<%= dom_id(card,'spree')%>" class="<%= cycle('even', 'odd') %>">
-                  <td><%= card.name %></td>
-                  <td><%= card.display_number %></td>
-                  <td><%= card.month %></td>
-                  <td><%= card.year %></td>
-                  <td>
-                    <%= radio_button_tag "order[existing_card]", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" }  %>
-                  </td>
-                </tr>
+              <% @wallet_payment_sources.each do |wallet_payment_source| %>
+                <%=
+                  render(
+                    partial: "spree/checkout/existing_payment/#{wallet_payment_source.payment_source.payment_method.method_type}",
+                    locals: {
+                      wallet_payment_source: wallet_payment_source,
+                      default: wallet_payment_source == @default_wallet_payment_source,
+                    }
+                  )
+                %>
               <% end %>
             </tbody>
           </table>
@@ -40,7 +40,7 @@
       <p>
         <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>
       </p>
       <% end %>
@@ -50,7 +50,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 %>
@@ -72,6 +72,6 @@
 <br class="space" />
 
 <div class="form-buttons" data-hook="buttons">
-  <%= submit_tag Spree.t(:save_and_continue), :class => 'continue button primary' %>
+  <%= submit_tag Spree.t(:save_and_continue), class: 'continue button primary' %>
   <script>Spree.disableSaveOnClick();</script>
 </div>

data/app/views/spree/checkout/_terms_and_conditions.en.html.erb

@@ -0,0 +1 @@
+Put your terms and conditions here

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

@@ -1,5 +1,5 @@
 <div id="checkout" data-hook>
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 
   <div class="row" data-hook="checkout_header">
     <h1 class="columns three alpha" data-hook="checkout_title"><%= Spree.t(:checkout) %></h1>
@@ -8,19 +8,19 @@
 
   <div class="row" data-hook="checkout_content">
     <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>" data-hook="checkout_form_wrapper">
-      <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
+      <%= form_for @order, url: update_checkout_path(@order.state), html: { id: "checkout_form_#{@order.state}" } do |form| %>
         <% if @order.state == 'address' || !@order.email? %>
           <p class="field" style='clear: both'>
             <%= form.label :email %><br />
             <%= form.text_field :email %>
           </p>
         <% end %>
-        <%= render @order.state, :form => form %>
+        <%= render @order.state, form: form %>
       <% end %>
     </div>
     <% if @order.state != 'confirm' %>
       <div id="checkout-summary" data-hook="checkout_summary_box" class="columns omega four">
-        <%= render :partial => 'summary', :locals => { :order => @order } %>
+        <%= render partial: 'summary', locals: { order: @order } %>
       </div>
     <% end %>
   </div>

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

@@ -0,0 +1,9 @@
+<tr id="<%= dom_id(wallet_payment_source, 'spree')%>" class="<%= cycle('even', 'odd') %>">
+  <td><%= wallet_payment_source.payment_source.name %></td>
+  <td><%= wallet_payment_source.payment_source.display_number %></td>
+  <td><%= wallet_payment_source.payment_source.month %></td>
+  <td><%= wallet_payment_source.payment_source.year %></td>
+  <td>
+    <%= radio_button_tag "order[wallet_payment_source_id]", wallet_payment_source.id, default, class: "existing-cc-radio" %>
+  </td>
+</tr>

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

@@ -1,14 +1,14 @@
-<%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image' %>
+<%= image_tag 'credit_cards/credit_card.gif', id: 'credit-card-image' %>
 <% 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}", :autocomplete => "cc-name" } %>
+  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name" } %>
 </p>
 
 <p class="field" data-hook="card_number">
   <%= label_tag "card_number", Spree.t(:card_number) %><span class="required">*</span><br />
-  <%= text_field_tag "#{param_prefix}[number]", '', {:id => 'card_number', :class => 'required cardNumber', :size => 19, :maxlength => 19, :autocomplete => "cc-number", type: "tel"} %>
+  <%= text_field_tag "#{param_prefix}[number]", '', {id: 'card_number', class: 'required cardNumber', size: 19, maxlength: 19, autocomplete: "cc-number", type: "tel"} %>
   &nbsp;
   <span id="card_type" style="display:none;">
     ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
@@ -19,19 +19,19 @@
 
 <p class="field" data-hook="card_expiration">
   <%= label_tag "card_expiry", Spree.t(:expiration) %><span class="required">*</span><br />
-  <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required cardExpiry", :placeholder => "MM / YY", type: "tel" %>
+  <%= text_field_tag "#{param_prefix}[expiry]", '', id: 'card_expiry', class: "required cardExpiry", placeholder: "MM / YY", type: "tel" %>
 </p>
 
 <p class="field" data-hook="card_code">
   <%= label_tag "card_code", Spree.t(:card_code) %><span class="required">*</span><br />
-  <%= text_field_tag "#{param_prefix}[verification_value]", '', {:id => 'card_code', :class => 'required cardCode', :size => 5, type: "tel", autocomplete: "off"} %>
-  <%= link_to "(#{Spree.t(:what_is_this)})", spree.cvv_path, :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
+  <%= text_field_tag "#{param_prefix}[verification_value]", '', {id: 'card_code', class: 'required cardCode', size: 5, type: "tel", autocomplete: "off"} %>
+  <%= link_to "(#{Spree.t(:what_is_this)})", spree.cvv_path, target: '_blank', "data-hook" => "cvv_link", id: "cvv_link" %>
 </p>
 
 <% if @order.bill_address %>
   <%= fields_for "#{param_prefix}[address_attributes]", @order.bill_address do |f| %>
-    <%= render :partial => 'spree/address/form_hidden', :locals => { :form => f } %>
+    <%= render partial: 'spree/address/form_hidden', locals: { form: f } %>
   <% end %>
 <% end %>
 
-<%= hidden_field_tag "#{param_prefix}[cc_type]", '', :id => "cc_type", :class => 'ccType' %>
+<%= hidden_field_tag "#{param_prefix}[cc_type]", '', id: "cc_type", class: 'ccType' %>

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

@@ -1,12 +1,12 @@
 <% 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/layouts/spree_application.html.erb

@@ -5,19 +5,19 @@
 <!--[if IE 9 ]>    <html class="ie ie9" lang="<%= I18n.locale %>"> <![endif]-->
 <!--[if gt IE 9]><!--><html lang="<%= I18n.locale %>"><!--<![endif]-->
   <head data-hook="inside_head">
-    <%= render :partial => 'spree/shared/head' %>
+    <%= render partial: 'spree/shared/head' %>
   </head>
   <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
 
     <div class="container">
 
-      <%= render :partial => 'spree/shared/header' %>
+      <%= render partial: 'spree/shared/header' %>
 
       <div id="wrapper" class="row" data-hook>
 
         <%= taxon_breadcrumbs(@taxon) %>
 
-        <%= render :partial => 'spree/shared/sidebar' if content_for? :sidebar %>
+        <%= render partial: 'spree/shared/sidebar' if content_for? :sidebar %>
 
         <div id="content" class="columns <%= !content_for?(:sidebar) ? "sixteen" : "twelve omega" %>" data-hook>
           <%= flash_messages %>
@@ -28,7 +28,7 @@
 
       </div>
 
-      <%= render :partial => 'spree/shared/footer' %>
+      <%= render partial: 'spree/shared/footer' %>
 
     </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 %>