solidus_frontend 2.4.2 → 2.5.0.beta1

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

@@ -2,7 +2,7 @@
   <%= 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>
+    <h1 class="columns three alpha" data-hook="checkout_title"><%= t('spree.checkout') %></h1>
     <div class="columns thirteen omega" data-hook="checkout_progress"><%= checkout_progress %></div>
   </div>
 
@@ -12,7 +12,7 @@
         <% if @order.state == 'address' || !@order.email? %>
           <p class="field" style='clear: both'>
             <%= form.label :email %><br />
-            <%= form.email_field :email %>
+            <%= form.email_field :email, required: true %>
           </p>
         <% end %>
         <%= render @order.state, form: form %>
@@ -30,7 +30,3 @@
 Spree.current_order_id = "<%= @order.number %>"
 Spree.current_order_token = "<%= @order.guest_token %>"
 </script>
-
-<% if I18n.locale != :en %>
-  <%= javascript_include_tag 'jquery.validate/localization/messages_' + I18n.locale.to_s.downcase.gsub('-', '') %>
-<% end %>

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

@@ -2,30 +2,30 @@
 <% 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 />
+  <%= label_tag "name_on_card_#{payment_method.id}", t('spree.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" } %>
 </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"} %>
+  <%= label_tag "card_number", t('spree.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" } %>
   &nbsp;
   <span id="card_type" style="display:none;">
-    ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
-      <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
+    ( <span id="looks_like" ><%= t('spree.card_type_is') %> <span id="type"></span></span>
+      <span id="unrecognized"><%= t('spree.unrecognized_card_type') %></span>
     )
   </span>
 </p>
 
 <p class="field" data-hook="card_expiration">
-  <%= label_tag "card_expiry", Spree.t(:expiration) %><span class="required">*</span><br />
+  <%= label_tag "card_expiry", t('spree.expiration') %><span class="required">*</span><br />
   <%= 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" %>
+  <%= label_tag "card_code", t('spree.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 "(#{t('spree.what_is_this')})", spree.cvv_path, target: '_blank', "data-hook" => "cvv_link", id: "cvv_link" %>
 </p>
 
 <% if @order.bill_address %>

data/app/views/spree/content/cvv.html.erb

@@ -1,5 +1,5 @@
 <div class="cvv" data-hook>
-  <h1><%= Spree.t(:what_is_a_cvv) %></h1>
+  <h1><%= t('spree.what_is_a_cvv') %></h1>
   <p>For Visa, MasterCard, and Discover cards, the card code is the last 3 digit number located on the back of your card on or above your signature line. For an American Express card, it is the 4 digits on the FRONT above the end of your card number.</p>
   <p>To help reduce fraud in the card-not-present environment, credit card companies have introduced a card code program. Visa calls this code Card Verification Value (CVV); MasterCard calls it Card Validation Code (CVC); Discover calls it Card ID (CID). The card code is a three- or four- digit security code that is printed on the back of cards. The number typically appears at the end of the signature panel.</p>
   <div class="cid-caption">Visa</div>

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

@@ -1,17 +1,17 @@
 <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: t('spree.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: t('spree.tax') %>
   <% end %>
 
   <% @order.shipments.each do |shipment| %>
     <tr>
-      <td colspan="4" align='right'><h5><%= Spree.t(:shipping) %>: <%= shipment.shipping_method.name %></h5></td>
+      <td colspan="4" align='right'><h5><%= t('spree.shipping') %>: <%= shipment.shipping_method.name %></h5></td>
       <td colspan='2'>
         <h5><%= shipment.display_total_before_tax %></h5>
       </td>
@@ -19,6 +19,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: t('spree.adjustment') %>
   <% end %>
 </tbody>

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

@@ -3,10 +3,10 @@
 <table id="cart-detail" data-hook>
   <thead>
     <tr data-hook="cart_items_headers">
-      <th class="cart-item-description-header" colspan="2"><%= Spree.t(:item) %></th>
-      <th class="cart-item-price-header"><%= Spree.t(:price) %></th>
-      <th class="cart-item-quantity-header"><%= Spree.t(:qty) %></th>
-      <th class="cart-item-total-header"><%= Spree.t(:total) %></th>
+      <th class="cart-item-description-header" colspan="2"><%= t('spree.item') %></th>
+      <th class="cart-item-price-header"><%= t('spree.price') %></th>
+      <th class="cart-item-quantity-header"><%= t('spree.qty') %></th>
+      <th class="cart-item-total-header"><%= t('spree.total') %></th>
       <th class="cart-item-delete-header"></th>
     </tr>
   </thead>
@@ -15,14 +15,14 @@
   </tbody>
   <% if order.adjustments.nonzero.exists? || order.line_item_adjustments.nonzero.exists? || order.shipment_adjustments.nonzero.exists? || order.shipments.any? %>
     <tr class="cart-subtotal">
-      <td colspan="4" align='right'><h5><%= Spree.t(:cart_subtotal, count: order.line_items.sum(:quantity)) %></h5></th>
+      <td colspan="4" align='right'><h5><%= t('spree.cart_subtotal', count: order.line_items.sum(:quantity)) %></h5></th>
       <td colspan><h5><%= order.display_item_total %></h5></td>
       <td></td>
     </tr>
     <%= render "spree/orders/adjustments" %>
   <% end %>
   <tr class="cart-total">
-    <td colspan="4" align='right'><h5><%= Spree.t(:total) %></h5></th>
+    <td colspan="4" align='right'><h5><%= t('spree.total') %></h5></th>
     <td colspan><h5><%= order.display_total %></h5></td>
     <td></td>
   </tr>

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

@@ -2,10 +2,10 @@
 <%= order_form.fields_for :line_items, line_item do |item_form| -%>
   <tr class="<%= cycle('', 'alt') %> line-item">
     <td class="cart-item-image" data-hook="cart_item_image">
-      <% if variant.images.length == 0 %>
-        <%= link_to image_tag(variant.product.display_image.attachment(:small)), variant.product %>
+      <% if variant.images.empty? %>
+        <%= link_to(render('spree/shared/image', image: variant.product.display_image, size: :small), variant.product) %>
       <% else %>
-        <%= link_to image_tag(variant.images.first.attachment.url(:small)), variant.product %>
+        <%= link_to(render('spree/shared/image', image: variant.images.first, size: :small), variant.product) %>
       <% end %>
     </td>
     <td class="cart-item-description" data-hook="cart_item_description">
@@ -13,7 +13,7 @@
       <%= variant.options_text %>
       <% if line_item.insufficient_stock? %>
         <span class="out-of-stock">
-          <%= Spree.t(:out_of_stock) %>&nbsp;&nbsp;<br />
+          <%= t('spree.out_of_stock') %>&nbsp;&nbsp;<br />
         </span>
       <% end %>
       <span class="line-item-description" data-hook="line_item_description">

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

@@ -1,12 +1,12 @@
 <% @body_id = 'cart' %>
 <div data-hook="cart_container">
-  <h1><%= Spree.t(:shopping_cart) %></h1>
+  <h1><%= t('spree.shopping_cart') %></h1>
 
   <% if @order.line_items.empty? %>
 
     <div data-hook="empty_cart">
-      <p><%= Spree.t(:your_cart_is_empty) %></p>
-      <p><%= link_to Spree.t(:continue_shopping), products_path, class: 'button continue' %></p>
+      <p><%= t('spree.your_cart_is_empty') %></p>
+      <p><%= link_to t('spree.continue_shopping'), products_path, class: 'button continue' %></p>
     </div>
 
   <% else %>
@@ -20,12 +20,12 @@
           </div>
 
           <div class="links columns sixteen alpha omega" data-hook="cart_buttons">
-            <%= order_form.text_field :coupon_code, size: 10, placeholder: Spree.t(:coupon_code) %>
+            <%= order_form.text_field :coupon_code, size: 10, placeholder: t('spree.coupon_code') %>
             <%= button_tag class: 'primary', id: 'update-button' do %>
-              <%= Spree.t(:update) %>
+              <%= t('spree.update') %>
             <% end %>
             <%= button_tag class: 'button checkout primary', id: 'checkout-link', name: 'checkout' do %>
-              <%= Spree.t(:checkout) %>
+              <%= t('spree.checkout') %>
             <% end %>
           </div>
 
@@ -36,9 +36,9 @@
     <div id="empty-cart" data-hook>
       <%= form_tag empty_cart_path, method: :put do %>
         <p id="clear_cart_link" data-hook>
-        <%= submit_tag Spree.t(:empty_cart), class: 'button gray' %>
-        <%= Spree.t(:or) %>
-        <%= link_to Spree.t(:continue_shopping), products_path, class: 'continue button gray' %>
+        <%= submit_tag t('spree.empty_cart'), class: 'button gray' %>
+        <%= t('spree.or') %>
+        <%= link_to t('spree.continue_shopping'), products_path, class: 'continue button gray' %>
         </p>
       <% end %>
     </div>

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

@@ -1,8 +1,8 @@
 <fieldset id="order_summary" data-hook>
-  <legend><%= Spree.t(:order_number, number: @order.number) %></legend>
+  <legend><%= t('spree.order_number', number: @order.number) %></legend>
   <h1><%= accurate_title %></h1>
   <% if order_just_completed?(@order) %>
-    <strong><%= Spree.t(:thank_you_for_your_order) %></strong>
+    <strong><%= t('spree.thank_you_for_your_order') %></strong>
   <% end %>
 
   <div id="order" data-hook>
@@ -11,10 +11,10 @@
     <br class="clear" />
 
     <p data-hook="links">
-      <%= link_to Spree.t(:back_to_store), spree.root_path, class: "button" %>
+      <%= link_to t('spree.back_to_store'), spree.root_path, class: "button" %>
       <% unless order_just_completed?(@order) %>
         <% if try_spree_current_user && respond_to?(:account_path) %>
-          <%= link_to Spree.t(:my_account), spree.account_path, class: "button" %>
+          <%= link_to t('spree.my_account'), spree.account_path, class: "button" %>
         <% end %>
       <% end %>
     </p>

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

@@ -5,7 +5,7 @@
       <%= image_tag "credit_cards/icons/#{cc_type}.png" %>
     <% end %>
     <% if source.last_digits %>
-      <%= Spree.t(:ending_in) %> <%= source.last_digits %>
+      <%= t('spree.ending_in') %> <%= source.last_digits %>
     <% end %>
   </span>
   <br />

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

@@ -3,7 +3,7 @@
 
     <% if @product.variants_and_option_values_for(current_pricing_options).any? %>
       <div id="product-variants" class="columns five alpha">
-        <h6 class="product-section-title"><%= Spree.t(:variants) %></h6>
+        <h6 class="product-section-title"><%= t('spree.variants') %></h6>
         <ul>
           <% @product.variants_and_option_values_for(current_pricing_options).each_with_index do |variant, index| %>
             <li>
@@ -17,11 +17,11 @@
                 <% end %>
 
                 <% unless variant.can_supply? %>
-                  <span class="out-of-stock"><%= Spree.t(:out_of_stock) %></span>
+                  <span class="out-of-stock"><%= t('spree.out_of_stock') %></span>
                 <% end %>
               <% end %>
             </li>
-          <% end%>
+          <% end %>
         </ul>
       </div>
     <% else %>
@@ -32,7 +32,7 @@
       <div data-hook="product_price" class="columns five <%= !@product.has_variants? ? 'alpha' : 'omega' %>">
 
         <div id="product-price">
-          <h6 class="product-section-title"><%= Spree.t(:price) %></h6>
+          <h6 class="product-section-title"><%= t('spree.price') %></h6>
           <div>
             <span class="price selling" itemprop="price" content="<%= @product.price_for(current_pricing_options).to_d %>">
               <%= display_price(@product) %>
@@ -44,21 +44,21 @@
             <link itemprop="availability" href="http://schema.org/InStock" />
           <% elsif @product.variants.empty? %>
             <br />
-            <span class="out-of-stock"><%= Spree.t(:out_of_stock) %></span>
+            <span class="out-of-stock"><%= t('spree.out_of_stock') %></span>
           <% end %>
         </div>
 
         <div class="add-to-cart">
           <%= number_field_tag :quantity, 1, class: 'title', min: 1 %>
           <%= button_tag class: 'large primary', id: 'add-to-cart-button', type: :submit do %>
-            <%= Spree.t(:add_to_cart) %>
+            <%= t('spree.add_to_cart') %>
           <% end %>
         </div>
       </div>
     <% else %>
         <div id="product-price">
           <br>
-          <div><span class="price selling" itemprop="price"><%= Spree.t('product_not_available_in_this_currency') %></span></div>
+          <div><span class="price selling" itemprop="price"><%= t('spree.product_not_available_in_this_currency') %></span></div>
         </div>
     <% end %>
   </div>

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

@@ -1,5 +1,5 @@
 <% if defined?(image) && image %>
-  <%= image_tag image.attachment.url(:product), itemprop: "image" %>
+  <%= render 'spree/shared/image', image: image, size: :product, itemprop: "image" %>
 <% else %>
-  <%= image_tag @product.display_image.attachment(:product), itemprop: "image" %>
+  <%= render 'spree/shared/image', image: @product.display_image, size: :product, itemprop: "image" %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <% promotions = @product.possible_promotions %>
 <% if promotions.any? %>
   <div id="promotions">
-    <h3><%= Spree.t(:promotions) %></h3>
+    <h3><%= t('spree.promotions') %></h3>
     <% promotions.each do |promotion| %>
     <div>
       <h4><%= promotion.name %></h4>

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

@@ -1,5 +1,5 @@
 <% unless @product_properties.empty? %>  
-  <h6 class="product-section-title"><%= Spree.t('properties')%></h6>
+  <h6 class="product-section-title"><%= t('spree.properties')%></h6>
   <table id="product-properties" class="table-display" data-hook>
     <tbody>
       <% @product_properties.each do |product_property| %>

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

@@ -1,6 +1,6 @@
 <% if !@product.taxons.blank? %>
   <div id="taxon-crumbs" data-hook class="alpha columns five omega">
-    <h6 class="product-section-title"><%= Spree.t(:look_for_similar_items) %></h6>
+    <h6 class="product-section-title"><%= t('spree.look_for_similar_items') %></h6>
 
     <div data-hook="product_taxons">
       <ul id="similar_items_by_taxon" data-hook>

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

@@ -13,7 +13,7 @@
 
   <div data-hook="search_results">
     <% if @products.empty? %>
-      <h6 class="search-results-title"><%= Spree.t(:no_products_found) %></h6>
+      <h6 class="search-results-title"><%= t('spree.no_products_found') %></h6>
     <% else %>
       <%= render partial: 'spree/shared/products', locals: { products: @products, taxon: @taxon } %>
     <% end %>

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

@@ -33,7 +33,7 @@
           <h1 class="product-title" itemprop="name"><%= @product.name %></h1>
 
           <div itemprop="description" data-hook="description">
-            <%= product_description(@product) rescue Spree.t(:product_has_no_description) %>
+            <%= product_description(@product) rescue t('spree.product_has_no_description') %>
           </div>
 
           <div id="cart-form" data-hook="cart_form">

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

@@ -25,13 +25,13 @@
   </div>
   <% unless address.phone.blank? %>
     <div class="tel">
-      <span class="type"><%= Spree.t(:phone) %></span>
+      <span class="type"><%= t('spree.phone') %></span>
       <%= address.phone %>
     </div>
   <% end %>
   <% unless address.alternative_phone.blank? %>
     <div class="alternative-phone tel">
-      <span class="type"><%= Spree.t(:alternative_phone) %></span>
+      <span class="type"><%= t('spree.alternative_phone') %></span>
       <%= address.alternative_phone %>
     </div>
   <% end %>

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

@@ -1,4 +1,4 @@
-<% filters = @taxon ? @taxon.applicable_filters : [Spree::Core::ProductFilters.all_taxons] %>
+<% filters = @taxon.applicable_filters %>
 <% unless filters.empty? %>
   <%= form_tag '', method: :get, id: 'sidebar_products_search' do %>
     <%= hidden_field_tag 'per_page', params[:per_page] %>
@@ -22,6 +22,6 @@
         </ul>
       </div>
     <% end %>
-    <%= submit_tag Spree.t(:search), name: nil %>
+    <%= submit_tag t('spree.search'), name: nil %>
   <% end %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <footer id="footer" class="sixteen columns" data-hook>
   <div id="footer-left" class="columns alpha eight" data-hook>
-    <p><%= Spree.t :powered_by  %> <%= link_to 'Solidus', 'http://solidus.io/' %></p>
+    <p><%= t 'spree.powered_by' %> <%= link_to 'Solidus', 'http://solidus.io/' %></p>
   </div>
   <div id="footer-right" class="columns omega eight" data-hook></div>
 </footer>

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

@@ -0,0 +1,12 @@
+<% size ||= :mini %>
+<% itemprop ||= nil %>
+
+<% if image && image.attachment? %>
+  <% if itemprop %>
+    <%= image_tag image.attachment(size), itemprop: itemprop %>
+  <% else %>
+    <%= image_tag image.attachment(size) %>
+  <% end %>
+<% else %>
+  <span class="image-placeholder <%= size %>"></span>
+<% end %>

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

@@ -0,0 +1 @@
+<%# solidus_auth_devise or a custom auth system can replace this partial %>

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

@@ -1,9 +1,9 @@
 <nav class="columns sixteen">
   <ul id="main-nav-bar" class="inline" data-hook>
-    <li id="home-link" data-hook><%= link_to Spree.t(:home), spree.root_path %></li>
+    <li id="home-link" data-hook><%= link_to t('spree.home'), spree.root_path %></li>
     <li id="link-to-cart" data-hook>
       <noscript>
-        <%= link_to Spree.t(:cart), spree.cart_path %>
+        <%= link_to t('spree.cart'), spree.cart_path %>
       </noscript>
       &nbsp;
     </li>

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

@@ -1,5 +1,6 @@
 <nav id="top-nav-bar" class="columns ten">
   <ul id="nav-bar" class="inline" data-hook>
+    <%= render 'spree/shared/login_bar_items' %>
     <li id="search-bar" data-hook>
       <%= render partial: 'spree/shared/search' %>
     </li>

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

@@ -3,23 +3,23 @@
   <% if order.has_checkout_step?("address") %>
 
     <div class="columns alpha four" data-hook="order-bill-address">
-      <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:address) unless order.completed? %></h6>
+      <h6><%= t('spree.billing_address') %> <%= link_to "(#{t('spree.actions.edit')})", checkout_state_path(:address) unless order.completed? %></h6>
       <%= render partial: 'spree/shared/address', locals: { address: order.bill_address } %>
     </div>
 
     <% if order.has_checkout_step?("delivery") %>
       <div class="columns alpha four" data-hook="order-ship-address">
-        <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:address) unless order.completed? %></h6>
+        <h6><%= t('spree.shipping_address') %> <%= link_to "(#{t('spree.actions.edit')})", checkout_state_path(:address) unless order.completed? %></h6>
         <%= render partial: 'spree/shared/address', locals: { address: order.ship_address } %>
       </div>
 
       <div class="columns alpha four" data-hook="order-shipment">
-        <h6><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:delivery) unless order.completed? %></h6>
+        <h6><%= t('spree.shipments') %> <%= link_to "(#{t('spree.actions.edit')})", checkout_state_path(:delivery) unless order.completed? %></h6>
         <div class="delivery">
           <% order.shipments.each do |shipment| %>
             <div>
               <i class='fa fa-truck'></i>
-              <%= Spree.t(:shipment_details, stock_location: shipment.stock_location.name, shipping_method: shipment.selected_shipping_rate.name) %>
+              <%= t('spree.shipment_details', stock_location: shipment.stock_location.name, shipping_method: shipment.selected_shipping_rate.name) %>
             </div>
           <% end %>
         </div>
@@ -30,7 +30,7 @@
 
   <% if order.has_checkout_step?("payment") %>
     <div class="columns omega four">
-      <h6><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t('actions.edit')})", checkout_state_path(:payment) unless order.completed? %></h6>
+      <h6><%= t('spree.payment_information') %> <%= link_to "(#{t('spree.actions.edit')})", checkout_state_path(:payment) unless order.completed? %></h6>
       <div class="payment-info">
         <% order.payments.valid.each do |payment| %>
           <%= render payment %><br/>
@@ -51,10 +51,10 @@
 
   <thead data-hook>
     <tr data-hook="order_details_line_items_headers">
-      <th colspan="2"><%= Spree.t(:item) %></th>
-      <th class="price"><%= Spree.t(:price) %></th>
-      <th class="qty"><%= Spree.t(:qty) %></th>
-      <th class="total"><span><%= Spree.t(:total) %></span></th>
+      <th colspan="2"><%= t('spree.item') %></th>
+      <th class="price"><%= t('spree.price') %></th>
+      <th class="qty"><%= t('spree.qty') %></th>
+      <th class="total"><span><%= t('spree.total') %></span></th>
     </tr>
   </thead>
 
@@ -62,10 +62,10 @@
     <% order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row">
         <td data-hook="order_item_image">
-          <% if item.variant.images.length == 0 %>
-            <%= link_to image_tag(item.variant.product.display_image.attachment(:small)), item.variant.product %>
+          <% if item.variant.images.empty? %>
+            <%= link_to(render('spree/shared/image', image: item.variant.product.display_image, size: :small), item.variant.product) %>
           <% else %>
-            <%= link_to image_tag(item.variant.images.first.attachment.url(:small)), item.variant.product %>
+            <%= link_to(render('spree/shared/image', image: item.variant.images.first, size: :small), item.variant.product) %>
           <% end %>
         </td>
         <td data-hook="order_item_description">
@@ -81,24 +81,24 @@
   </tbody>
   <tfoot id="order-total" data-hook="order_details_total">
     <tr class="total">
-      <td colspan="4"><b><%= Spree.t(:order_total) %>:</b></td>
+      <td colspan="4"><b><%= t('spree.order_total') %>:</b></td>
       <td class="total"><span id="order_total"><%= order.display_order_total_after_store_credit.to_html %></span></td>
     </tr>
   </tfoot>
 
   <tfoot id="subtotal" data-hook="order_details_subtotal">
     <tr class="total" id="subtotal-row">
-      <td colspan="4"><b><%= Spree.t(:subtotal) %>:</b></td>
+      <td colspan="4"><b><%= t('spree.subtotal') %>:</b></td>
       <td class="total"><span><%= order.display_item_total.to_html %></span></td>
     </tr>
   </tfoot>
 
   <% if order.line_item_adjustments.exists? %>
-    <% if order.all_adjustments.promotion.eligible.exists? %>
+    <% if order.line_item_adjustments.promotion.eligible.exists? %>
       <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
-        <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+        <% order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
           <tr class="total">
-            <td colspan="4"><%= Spree.t(:promotion) %>: <strong><%= label %></strong></td>
+            <td colspan="4"><%= t('spree.promotion') %>: <strong><%= label %></strong></td>
             <td class="total"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %></span></td>
           </tr>
         <% end %>
@@ -109,7 +109,7 @@
   <tfoot id='shipment-total'>
     <% order.shipments.group_by { |s| s.selected_shipping_rate.name }.each do |name, shipments| %>
       <tr class="total" data-hook='shipment-row'>
-        <td colspan="4"><%= Spree.t(:shipping) %>: <strong><%= name %></strong></td>
+        <td colspan="4"><%= t('spree.shipping') %>: <strong><%= name %></strong></td>
         <td class="total"><span><%= Spree::Money.new(shipments.sum(&:total_before_tax), currency: order.currency).to_html %></span></td>
       </tr>
     <% end %>
@@ -119,7 +119,7 @@
     <tfoot id="tax-adjustments" data-hook="order_details_tax_adjustments">
       <% order.all_adjustments.tax.group_by(&:label).each do |label, adjustments| %>
         <tr class="total">
-          <td colspan="4"><%= Spree.t(:tax) %>: <strong><%= label %></strong></td>
+          <td colspan="4"><%= t('spree.tax') %>: <strong><%= label %></strong></td>
           <td class="total"><span><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %></span></td>
         </tr>
       <% end %>
@@ -129,7 +129,7 @@
   <% if order.total_applicable_store_credit > 0.0 %>
     <tfoot id="store-credit" data-hook="order_details_store_credit">
       <tr class="total">
-        <td colspan='4'><%= Spree.t("store_credit.store_credit") %>:</td>
+        <td colspan='4'><%= t('spree.store_credit.store_credit') %>:</td>
         <td class='total'><span><%= order.display_total_applicable_store_credit.to_html %></span></td>
       </tr>
     </tfoot>