spree_backend 2.4.10 → 3.0.0.rc1

data/app/views/spree/admin/adjustments/index.html.erb

@@ -1,22 +1,34 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: Spree.t(:adjustments)} %>
 
 <% content_for :page_title do %>
-   <i class="fa fa-arrow-right"></i> <%= Spree.t(:adjustments) %>
+   / <%= Spree::Adjustment.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'plus' %></li>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
+  <%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), class: "btn-success", icon: 'add' %>
 <% end %>
 
-<%= render :partial => 'adjustments_table' %>
+<% if @adjustments.present? %>
+  <div class="panel panel-default">    
+    <%= render :partial => 'adjustments_table' %>
+  </div>
+<% else %>
+  <div class="alert alert-warning">
+    <%= Spree.t(:no_resource_found, resource: Spree::Adjustment.model_name.human(count: :many)) %>
+  </div>
+<% end %>
 
 <% if @order.can_add_coupon? %>
-  <div data-hook="adjustments_new_coupon_code">
-    <%= text_field_tag "coupon_code", "", :placeholder => Spree.t(:coupon_code) %>
+  <div class="well" data-hook="adjustments_new_coupon_code">
+    <div class="form-group">
+      <%= text_field_tag "coupon_code", "", placeholder: Spree.t(:coupon_code), class: "form-control" %>
+    </div>
     <%= button Spree.t(:add_coupon_code), 'plus', 'submit', :id => "add_coupon_code" %>
   </div>
 <% end %>
+
 <%= javascript_tag do -%>
   var order_number = '<%= @order.number %>';
 <% end -%>
+
+<%= render partial: 'spree/admin/shared/order_summary' %>

data/app/views/spree/admin/adjustments/new.html.erb

@@ -1,23 +1,19 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:adjustments) } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_adjustment) %>
+  / <%= Spree.t(:new_adjustment) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'arrow-left' %></li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @adjustment } %>
 
 <%= form_for @adjustment, :url => admin_order_adjustments_path do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
 
-    <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'arrow-right' %>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t(:continue), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'delete' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/countries/_form.html.erb

@@ -1,22 +1,18 @@
-<div data-hook="admin_country_form_fields" class="row">
-  <div class="alpha four columns">
-    <div data-hook="name" class="field">
-      <%= f.label :name, Spree.t(:name) %>
-      <%= f.text_field :name, :class => 'fullwidth' %>
-    </div>
+<div data-hook="admin_country_form_fields">
+  <div data-hook="name" class="form-group">
+    <%= f.label :name, Spree.t(:name) %>
+    <%= f.text_field :name, :class => 'form-control' %>
   </div>
-  <div class="four columns">
-    <div data-hook="iso_name" class="field">
-      <%= f.label :iso_name, Spree.t(:iso_name) %>
-      <%= f.text_field :iso_name, :class => 'fullwidth' %>
-    </div>
+
+  <div data-hook="iso_name" class="form-group">
+    <%= f.label :iso_name, Spree.t(:iso_name) %>
+    <%= f.text_field :iso_name, :class => 'form-control' %>
   </div>
-  <div class="omega four columns">
-    <div data-hook="states_required" class="field checkbox">
-      <label>
-        <%= f.check_box :states_required %>
-        <%= Spree.t(:states_required) %>
-      </label>
-    </div>
+
+  <div data-hook="states_required" class="checkbox">
+    <label>
+      <%= f.check_box :states_required %>
+      <%= Spree.t(:states_required) %>
+    </label>
   </div>
-</div>
+</div>

data/app/views/spree/admin/countries/edit.html.erb

@@ -1,21 +1,13 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_country) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_countries_list), spree.admin_countries_path, :icon => 'arrow-left' %>
-  </li>
+  <%= Spree.t(:editing_resource, resource: Spree::Country.model_name.human) %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @country } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @country } %>
 
 <%= form_for [:admin, @country] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
-    <div class="clear"></div>
+
     <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/countries/index.html.erb

@@ -1,24 +1,12 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:listing_countries) %>
+  <%= Spree::Country.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <ul class="actions inline-menu">
-    <li>
-      <%= button_link_to Spree.t(:new_country), new_object_url, { :icon => 'plus', :id => 'admin_new_country' } %>
-    </li>
-  </ul>
+  <%= button_link_to Spree.t(:new_country), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_country' } %>
 <% end %>
 
-<table class="index" id='listing_countries' data-hook>
-  <colgroup>
-    <col style="width: 35%" />
-    <col style="width: 35%" />
-    <col style="width: 20%" />
-    <col style="width: 10%" />
-  </colgroup>
+<table class="table" id='listing_countries' data-hook>
   <thead>
     <tr data-hook="tax_header">
       <th><%= Spree.t(:country_name) %></th>
@@ -29,11 +17,11 @@
   </thead>
   <tbody>
     <% @countries.each do |country| %>
-      <tr id="<%= spree_dom_id country %>" data-hook="country_row" class="<%= cycle('odd', 'even')%>">
+      <tr id="<%= spree_dom_id country %>" data-hook="country_row">
         <td><%= country.name %></td>
         <td><%= country.iso_name %></td>
-        <td class="align-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="actions">
+        <td class="text-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <td class="actions actions-2 text-right">
           <%= link_to_edit country, :no_text => true %>
           <%= link_to_delete country, :no_text => true %>
         </td>

data/app/views/spree/admin/countries/new.html.erb

@@ -1,17 +1,15 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_country) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_countries_list), admin_countries_path, :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::Country.model_name.human), admin_countries_path, class: 'btn btn-default' %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @countries } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @countries } %>
 
 <%= form_for [:admin, @country] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
   </fieldset>

data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb

@@ -1,16 +1,16 @@
-<table class="index">
+<table class="table table-condensed table-bordered">
   <thead data-hook="customer_return_header">
     <tr>
       <th><%= Spree.t(:number) %></th>
       <th><%= Spree.t(:total) %></th>
       <th><%= Spree.t(:status) %></th>
       <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-      <th class="actions"></th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
     <% reimbursements.each do |reimbursement| %>
-      <tr id="<%= spree_dom_id(reimbursement) %>" data-hook="reimbursement_row" class="<%= cycle('odd', 'even')%>">
+      <tr id="<%= spree_dom_id(reimbursement) %>" data-hook="reimbursement_row">
         <td>
           <% if reimbursement.reimbursed? %>
             <%= link_to reimbursement.number, url_for([:admin, @order, reimbursement]) %>
@@ -25,7 +25,7 @@
           </span>
         </td>
         <td><%= pretty_time(reimbursement.created_at) %></td>
-        <td class="actions">
+        <td class="actions actions-1">
           <% if !reimbursement.reimbursed? %>
             <%= link_to_edit_url url_for([:edit, :admin, @order, reimbursement]), title: "admin_edit_#{dom_id(reimbursement)}", no_text: true %>
           <% end %>

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -1,4 +1,4 @@
-<table class="show return-items-table">
+<table class="show return-items-table table table-condensed table-bordered index">
   <thead>
     <tr>
       <th><%= Spree.t(:product) %></th>
@@ -8,7 +8,7 @@
       <th><%= Spree.t(:exchange_for) %></th>
       <th><%= Spree.t(:acceptance_errors) %></th>
       <% if show_decision %>
-        <th class="actions"></th>
+        <th></th>
       <% end %>
     </tr>
   </thead>
@@ -22,25 +22,24 @@
         <td>
           <%= return_item.inventory_unit.variant.sku %>
         </td>
-        <td class="align-center">
+        <td>
           <%= return_item.display_pre_tax_amount %>
         </td>
-        <td class="align-center">
+        <td>
           <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
         </td>
-        <td class="align-center">
-          <%= return_item.exchange_variant.try(:exchange_name) %>
         <td>
+          <%= return_item.exchange_variant.try(:exchange_name) %>
         </td>
-        <td class="align-center">
+        <td>
           <%= return_item.acceptance_status_errors %>
         </td>
         <% if show_decision %>
-          <td class='actions'>
-            <%= button_to [:admin, return_item], { class: 'fa fa-thumbs-up icon_link no-text with-tip', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
+          <td class='actions actions-2'>
+            <%= button_to [:admin, return_item], { class: 'icon icon-thumbs-up icon_link no-text with-tip display-inline', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
               Spree.t(:accept)
             <% end %>
-            <%= button_to [:admin, return_item], { class: 'fa fa-thumbs-down icon_link no-text with-tip', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
+            <%= button_to [:admin, return_item], { class: 'icon icon-thumbs-down icon_link no-text with-tip display-inline', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
               Spree.t(:reject)
             <% end %>
           </td>

data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb

@@ -1,4 +1,4 @@
-<table class="index return-items-table">
+<table class="table table-condensed table-bordered">
   <thead>
     <tr>
       <th>
@@ -8,12 +8,12 @@
       <th><%= Spree.t(:sku) %></th>
       <th><%= Spree.t(:pre_tax_amount) %></th>
       <th><%= Spree.t(:exchange_for) %></th>
+      <th><%= Spree.t(:resellable) %></th>
     </tr>
   </thead>
   <tbody>
     <%= f.fields_for :return_items, return_items do |item_fields| %>
       <% return_item = item_fields.object %>
-
       <tr>
         <td class="align-center" class="inventory-unit-checkbox">
           <div style="display:none">
@@ -21,7 +21,6 @@
             <%= item_fields.hidden_field :return_authorization_id %>
             <%= item_fields.hidden_field :pre_tax_amount %>
           </div>
-
           <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '1', '0' %>
         </td>
         <td>
@@ -37,6 +36,9 @@
         <td class="align-center">
           <%= return_item.exchange_variant.try(:exchange_name) %>
         </td>
+        <td class="align-center">
+          <%= item_fields.check_box :resellable, { checked: return_item.resellable } %>
+        </td>
       </tr>
     <% end %>
   </tbody>

data/app/views/spree/admin/customer_returns/edit.html.erb

@@ -1,65 +1,61 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:customer_returns) } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:customer_return) %> #<%= @customer_return.number %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li>
+  / <%= Spree.t(:customer_return) %> #<%= @customer_return.number %>
 <% end %>
 
 <% if @manual_intervention_return_items.any? %>
-  <fieldset data-hook="manual_intervention_return_items" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:manual_intervention_required) %></legend>
+  <fieldset data-hook="manual_intervention_return_items">
+    <legend><%= Spree.t(:manual_intervention_required) %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @manual_intervention_return_items, show_decision: true} %>
   </fieldset>
 <% end %>
 
 <% if @pending_return_items.any? %>
-  <fieldset data-hook="accepted_return_items" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:pending) %></legend>
+  <fieldset data-hook="accepted_return_items">
+    <legend><%= Spree.t(:pending) %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @pending_return_items, show_decision: true} %>
   </fieldset>
 <% end %>
 
 <% if @accepted_return_items.any? %>
-  <fieldset data-hook="accepted_return_items" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:accepted) %></legend>
+  <fieldset data-hook="accepted_return_items">
+    <legend><%= Spree.t(:accepted) %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @accepted_return_items, show_decision: false} %>
   </fieldset>
 <% end %>
 
 <% if @rejected_return_items.any? %>
-  <fieldset data-hook="rejected_return_items" class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:rejected) %></legend>
+  <fieldset data-hook="rejected_return_items">
+    <legend><%= Spree.t(:rejected) %></legend>
     <%= render partial: 'return_item_decision', locals: {return_items: @rejected_return_items, show_decision: false} %>
   </fieldset>
 <% end %>
 
 <% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? %>
-  <fieldset data-hook="reimbursements" class="no-border-bottom no-border-top align-center">
+  <fieldset data-hook="reimbursements" class="marginb">
     <% if @customer_return.completely_decided? %>
       <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
         <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>
-        <%= f.button class: 'button fa fa-reply' do %>
+        <%= f.button class: 'btn btn-primary' do %>
           <%= Spree.t(:create_reimbursement) %>
         <% end %>
       <% end %>
     <% else %>
-      <div class="no-objects-found">
+      <div class="alert alert-info no-objects-found">
         <%= Spree.t(:unable_to_create_reimbursements) %>
       </div>
     <% end %>
   </fieldset>
 <% end %>
 
-<fieldset data-hook="reimbursements" class="no-border-bottom align-center">
-  <legend align="center"><%= Spree.t(:reimbursements) %></legend>
+<fieldset data-hook="reimbursements">
+  <legend><%= Spree::Reimbursement.model_name.human(count: :many) %></legend>
   <% if @customer_return.reimbursements.any? %>
     <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
   <% else %>
-    <div class="no-objects-found">
-      <%= Spree.t(:none) %>
+    <div class="alert alert-info no-objects-found">
+      <%= Spree.t(:no_resource_found, resource: Spree::Reimbursement.model_name.human(count: :many)) %>
     </div>
   <% end %>
 </fieldset>

data/app/views/spree/admin/customer_returns/index.html.erb

@@ -1,45 +1,42 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:customer_returns) } %>
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) %>
-    <li>
-      <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'plus' %>
-    </li>
+    <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'add', class: 'btn-success' %>
   <% end %>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), spree.admin_orders_path, :icon => 'arrow-left' %></li>
 <% end %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:customer_returns) %>
+  / <%= Spree::CustomerReturn.model_name.human(count: :many) %>
 <% end %>
 
 <% if @order.shipments.any?(&:shipped?) %>
 
   <% if @customer_returns.any? %>
-    <table class="index">
+    <table class="table">
       <thead data-hook="customer_return_header">
         <tr>
           <th><%= Spree.t(:return_number) %></th>
           <th><%= Spree.t(:pre_tax_total) %></th>
           <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
           <th><%= Spree.t(:reimbursement_status) %></th>
-          <th class="actions"></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
         <% @customer_returns.each do |customer_return| %>
-          <tr id="<%= spree_dom_id(customer_return) %>" data-hook="customer_return_row" class="<%= cycle('odd', 'even')%>">
+          <tr id="<%= spree_dom_id(customer_return) %>" data-hook="customer_return_row">
             <td><%= link_to customer_return.number, edit_admin_order_customer_return_path(@order, customer_return) %></td>
             <td><%= customer_return.display_pre_tax_total.to_html %></td>
             <td><%= pretty_time(customer_return.created_at) %></td>
             <td>
               <% if customer_return.fully_reimbursed? %>
-                <span class="state success"><%= Spree.t(:reimbursed) %></span>
+                <span class="label label-success"><%= Spree.t(:reimbursed) %></span>
               <% else %>
-                <span class="state notice"><%= Spree.t(:incomplete) %></span>
+                <span class="label label-info"><%= Spree.t(:incomplete) %></span>
               <% end %>
             </td>
-            <td class='actions align-center' data-hook="admin_orders_customer_returns_index_row_actions">
+            <td class='actions actions-1' data-hook="admin_orders_customer_returns_index_row_actions">
               <%= link_to_edit_url edit_admin_order_customer_return_path(@order, customer_return), title: "admin_edit_#{dom_id(customer_return)}", no_text: true %>
             </td>
           </tr>
@@ -47,14 +44,13 @@
       </tbody>
     </table>
   <% else %>
-    <div class="alpha twelve columns no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/customer_return')) %>,
+    <div class="alert alert-info no-objects-found">
+      <%= Spree.t(:no_resource_found, resource: Spree::CustomerReturn.model_name.human(count: :many)) %>,
       <%= link_to Spree.t(:add_one), spree.new_admin_order_customer_return_path(@order) %>!
     </div>
   <% end %>
-
 <% else %>
-  <div data-hook="customer_return_cannot_create" class="no-objects-found">
+  <div data-hook="customer_return_cannot_create" class="alert alert-info no-objects-found">
     <%= Spree.t(:cannot_create_customer_returns) %>
   </div>
 <% end %>

data/app/views/spree/admin/customer_returns/new.html.erb

@@ -1,50 +1,59 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:customer_returns) } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_customer_return) %>
+  / <%= Spree.t(:new_customer_return) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li>
-<% end %>
+<% if @rma_return_items.any? || @new_return_items.any? %>
 
-<% if @rma_return_items.any? %>
+  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @customer_return } %>
 
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %>
   <%= form_for [:admin, @order, @customer_return] do |f| %>
     <fieldset class="no-border-top">
       <div data-hook="admin_customer_return_form_fields">
-        <fieldset class='no-border-bottom'>
-          <legend align='center'><%= Spree.t(:items_in_rmas) %></legend>
+        <fieldset>
+          <legend><%= Spree.t(:items_in_rmas) %></legend>
           <% if @rma_return_items.any? %>
             <%= render partial: 'return_item_selection', locals: {f: f, return_items: @rma_return_items} %>
           <% else %>
-            <div class="alpha twelve columns no-objects-found"><%= Spree.t(:none) %></div>
+            <div class="alert alert-info no-objects-found">
+              <%= Spree.t(:none) %>
+            </div>
+          <% end %>
+        </fieldset>
+
+        <fieldset>
+          <legend><%= Spree.t(:other_items_in_other) %></legend>
+          <% if @new_return_items.any? %>
+            <%= render partial: 'return_item_selection', locals: {f: f, return_items: @new_return_items} %>
+          <% else %>
+            <div class="alert alert-info no-objects-found">
+              <%= Spree.t(:none) %>
+            </div>
           <% end %>
         </fieldset>
 
-        <%= f.field_container :stock_location do %>
+        <%= f.field_container :stock_location, class: ['form-group'] do %>
           <%= f.label :stock_location, Spree.t(:stock_location) %>
-          <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+          <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location_id %>
         <% end %>
+
       </div>
 
-      <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t(:create), 'ok' %>
+      <div class="form-actions" data-hook="buttons">
+        <%= button Spree.t(:create), 'save' %>
         <span class="or"><%= Spree.t(:or) %></span>
-        <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order), :icon => 'remove' %>
+        <%= button_link_to Spree.t('actions.cancel'), admin_order_customer_returns_url(@order), :icon => 'delete' %>
       </div>
     </fieldset>
   <% end %>
 
 <% else %>
 
-  <div class="twelve columns">
-    <div class="alpha twelve columns no-objects-found">
-      <%= Spree.t(:all_items_have_been_returned) %>,
-      <%= link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_path(@order) %>.
-    </div>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:all_items_have_been_returned) %>,
+    <%= link_to Spree.t(:back_to_resource_list, resource: Spree::CustomerReturn.model_name.human), spree.admin_order_customer_returns_path(@order) %>.
   </div>
 
 <% end %>