spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -1,11 +1,9 @@
-<%= render partial: 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:reimbursement_types) %>
+  <%= Spree::ReimbursementType.model_name.human(count: :many) %>
 <% end %>
 
 <% if @reimbursement_types.any? %>
-  <table class="index" id='listing_reimbursement_types' data-hook>
+  <table class="table" id='listing_reimbursement_types' data-hook>
     <thead>
       <tr data-hook="reimbursement_types_header">
         <th><%= Spree.t(:name) %></th>
@@ -14,7 +12,7 @@
     </thead>
     <tbody>
       <% @reimbursement_types.each do |reimbursement_type| %>
-        <tr id="<%= spree_dom_id reimbursement_type %>" data-hook="reimbursement_type_row" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id reimbursement_type %>" data-hook="reimbursement_type_row">
           <td class="align-center">
             <%= reimbursement_type.name.humanize %>
           </td>
@@ -26,7 +24,8 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/reimbursement_type')) %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::ReimbursementType.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -1,19 +1,15 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:editing_reimbursement) %> #<%= @reimbursement.number %>
+  / <%= Spree.t(:editing_resource, resource: Spree::Reimbursement.model_name.human) %> #<%= @reimbursement.number %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]), :icon => 'arrow-left' %></li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @reimbursement } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @reimbursement } %>
 
 <%= form_for [:admin, @order, @reimbursement] do |f| %>
   <fieldset class='no-border-bottom'>
-    <legend align='center'><%= Spree.t(:items_to_be_reimbursed) %></legend>
-    <table class="index reimbursement-return-items-table">
+    <legend><%= Spree.t(:items_to_be_reimbursed) %></legend>
+    <table class="table table-condensed table-bordered reimbursement-return-items-table">
       <thead>
         <tr>
           <th><%= Spree.t(:product) %></th>
@@ -27,53 +23,48 @@
       <tbody>
         <%= f.fields_for :return_items, @reimbursement.return_items.sort_by(&:id) do |item_fields| %>
           <% return_item = item_fields.object %>
-
           <tr>
             <td>
               <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
               <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
             </td>
-            <td class="align-center">
+            <td>
               <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
             </td>
-            <td class='align-center'>
+            <td>
               <%= item_fields.select(:override_reimbursement_type_id,
                 reimbursement_types.collect { |r| [r.name.humanize, r.id] },
                 {include_blank: true},
-                {class: 'select2 fullwidth'}
+                {class: 'select2'}
               ) %>
             </td>
-            <td class="align-center">
-              <%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input' } %>
+            <td>
+              <%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input form-control' } %>
             </td>
-            <td class="align-center">
+            <td>
               <%= return_item.display_total %>
             </td>
-            <td class="align-center">
+            <td>
               <% if return_item.exchange_processed? %>
                 <%= return_item.exchange_variant.exchange_name %>
               <% else %>
-                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
+                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2 return-item-exchange-selection" } %>
               <% end %>
             </td>
           </tr>
-
         <% end %>
       </tbody>
     </table>
   </fieldset>
 
-  <div class="form-buttons filter-actions actions" data-hook="buttons">
-    <%= f.button do %>
-      <%= Spree.t(:update) %>
-    <% end %>
+  <div class="form-actions filter-actions actions" data-hook="buttons">
+    <%= button Spree.t('actions.update'), 'update' %>
   </div>
-  <br/>
 <% end %>
 
-<fieldset>
-  <legend align='center'><%= Spree.t(:calculated_reimbursements) %></legend>
-  <table class="index">
+<fieldset class="margint">
+  <legend><%= Spree.t(:calculated_reimbursements) %></legend>
+  <table class="table table-condensed table-bordered">
     <thead data-hook="customer_return_header">
       <tr>
         <th><%= Spree.t(:reimbursement_type) %></th>
@@ -83,7 +74,7 @@
     </thead>
     <tbody>
       <% @reimbursement_objects.each do |reimbursement_object| %>
-        <tr id="<%= spree_dom_id(reimbursement_object) %>" data-hook="reimbursement_reimbursement_object_row" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id(reimbursement_object) %>" data-hook="reimbursement_reimbursement_object_row">
           <td><%= reimbursement_object.class.name.demodulize %></td>
           <td><%= reimbursement_object.description %></td>
           <td><%= reimbursement_object.display_amount %></td>
@@ -91,18 +82,21 @@
       <% end %>
     </tbody>
   </table>
+
   <% if @order.has_non_reimbursement_related_refunds? %>
-    <span class="red">
+    <span class="alert alert-danger">
       <%= "#{Spree.t('note')}: #{Spree.t('this_order_has_already_received_a_refund')}. #{Spree.t('make_sure_the_above_reimbursement_amount_is_correct')}." %>
     </span>
   <% end %>
-  <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons">
+
+  <div class="form-actions" data-hook="reimburse-buttons">
     <% if !@reimbursement.reimbursed? %>
-      <%= button_to [:perform, :admin, @order, @reimbursement], {class: 'button fa fa-reply', method: 'post'} do %>
+      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'btn btn-primary', method: 'post' } do %>
+        <span class="icon icon-save"></span>
         <%= Spree.t(:reimburse) %>
       <% end %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), :icon => 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), :icon => 'remove-sign' %>
     <% end %>
   </div>
 </fieldset>

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

@@ -1,33 +1,27 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Reimbursements' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:edit_reimbursement) %>
+  / <%= Spree.t(:edit_reimbursement) %>
 <% 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 %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @customer_return } %>
 
-<table class="index">
+<table class="table">
   <thead data-hook="customer_return_header">
     <tr>
       <th><%= Spree.t(:id) %></th>
       <th><%= Spree.t(:total) %></th>
       <th><%= Spree.t(:status) %></th>
       <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-      <th class="actions"></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><%= reimbursement.id %></td>
         <td><%= reimbursement.total %></td>
         <td><%= reimbursement.reimbursement_status %></td>
         <td><%= pretty_time(reimbursement.created_at) %></td>
-        <td></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/spree/admin/reimbursements/show.html.erb

@@ -1,18 +1,14 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:reimbursement) %> #<%= @reimbursement.number %>
+  / <%= Spree::Reimbursement.model_name.human %> #<%= @reimbursement.number %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]), :icon => 'arrow-left' %></li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @reimbursement } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @reimbursement } %>
 
 <fieldset class='no-border-bottom'>
-  <legend align='center'><%= Spree.t(:items_reimbursed) %></legend>
-  <table class="index reimbursement-reimbursement-items-table">
+  <legend><%= Spree.t(:items_reimbursed) %></legend>
+  <table class="table table-condensed table-bordered reimbursement-reimbursement-items-table">
     <thead>
       <tr>
         <th><%= Spree.t(:product) %></th>
@@ -25,37 +21,35 @@
     </thead>
     <tbody>
       <% @reimbursement.return_items.each do |return_item| %>
-
         <tr>
           <td>
             <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
             <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
           </td>
-          <td class="align-center">
+          <td>
             <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
           </td>
-          <td class='align-center'>
+          <td>
             <%= reimbursement_type_name(return_item.override_reimbursement_type) %>
           </td>
           <td>
             <%= return_item.exchange_variant.try(:exchange_name) %>
           </td>
-          <td class="align-center">
+          <td>
             <%= return_item.display_pre_tax_amount %>
           </td>
-          <td class="align-center">
+          <td>
             <%= return_item.display_total %>
           </td>
         </tr>
-
       <% end %>
     </tbody>
   </table>
 </fieldset>
 
-<fieldset class="no-border-bottom">
-  <legend align='center'><%= Spree.t(:refunds) %></legend>
-  <table class="index">
+<fieldset>
+  <legend><%= Spree.t(:refunds) %></legend>
+  <table class="table table-condensed table-bordered">
     <thead data-hook="customer_return_header">
       <tr>
         <th><%= Spree.t(:description) %></th>
@@ -64,7 +58,7 @@
     </thead>
     <tbody>
       <% @reimbursement.refunds.each do |refund| %>
-        <tr id="<%= spree_dom_id(refund) %>" data-hook="reimbursement_refund_row" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id(refund) %>" data-hook="reimbursement_refund_row">
           <td><%= refund.description %></td>
           <td><%= refund.display_amount %></td>
         </tr>
@@ -73,22 +67,24 @@
   </table>
 </fieldset>
 
-<fieldset class="no-border-bottom">
-  <legend align='center'><%= Spree.t(:credits) %></legend>
-  <table class="index">
-    <thead data-hook="customer_return_header">
-      <tr>
-        <th><%= Spree.t(:description) %></th>
-        <th><%= Spree.t(:amount) %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @reimbursement.credits.each do |credit| %>
-        <tr id="<%= spree_dom_id(credit) %>" data-hook="reimbursement_refund_row" class="<%= cycle('odd', 'even')%>">
-          <td><%= credit.description %></td>
-          <td><%= credit.display_amount %></td>
+<% if @reimbursement.credits.any? %>
+  <fieldset>
+    <legend><%= Spree.t(:credits) %></legend>
+    <table class="table table-condensed table-bordered">
+      <thead data-hook="customer_return_header">
+        <tr>
+          <th><%= Spree.t(:description) %></th>
+          <th><%= Spree.t(:amount) %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-</fieldset>
+      </thead>
+      <tbody>
+        <% @reimbursement.credits.each do |credit| %>
+          <tr id="<%= spree_dom_id(credit) %>" data-hook="reimbursement_refund_row">
+            <td><%= credit.description %></td>
+            <td><%= credit.display_amount %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </fieldset>
+<% end %>

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

@@ -1,8 +1,8 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:listing_reports) %>
+  <%= Spree.t(:reports) %>
 <% end %>
 
-<table class="index">
+<table class="table">
   <thead>
     <tr data-hook="reports_header">
       <th><%= Spree.t(:name) %></th>
@@ -12,8 +12,8 @@
   <tbody>
     <% @reports.each do |key, value| %>
     <tr data-hook="reports_row">
-      <td class="align-center"><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
-      <td style="padding-left:1em"><%= value[:description] %></td>
+      <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
+      <td><%= value[:description] %></td>
     </tr>
     <% end %>
   </tbody>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -3,19 +3,14 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree.t(:report)), spree.admin_reports_url, class: 'btn btn-default' %>
 <% end %>
 
+<div class="well">
+  <%= render :partial => 'spree/admin/shared/report_order_criteria' %>
+</div>
 
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:date_range) %>
-<% end %>
-
-<% content_for :table_filter do %>
-  <%= render :partial => 'spree/admin/shared/report_order_criteria', :locals => {} %>
-<% end %>
-
-<table class="admin-report" data-hook="sales_total">
+<table class="table table-bordered admin-report" data-hook="sales_total">
   <thead>
     <tr>
       <th><%= Spree.t(:currency) %></th>
@@ -26,7 +21,7 @@
   </thead>
   <tbody>
     <% @totals.each do |key, row| %>
-      <tr class="align-center">
+      <tr>
         <td><%= key %></td>
         <td><%= row[:item_total].format %></td>
         <td><%= row[:adjustment_total].format %></td>

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

@@ -1,5 +1,5 @@
 <%= render partial: 'spree/admin/shared/named_types/index', locals: {
-  page_title: Spree.t(:return_authorization_reasons),
+  page_title: Spree::ReturnAuthorizationReason.model_name.human(count: :many),
   new_button_text: Spree.t(:new_rma_reason),
-  resource_name: I18n.t(:other, scope: 'activerecord.models.spree/return_authorization_reason')
+  resource_name: Spree::ReturnAuthorizationReason.model_name.human(count: :many)
 } %>

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

@@ -1,7 +1,7 @@
 <% allow_return_item_changes = !@return_authorization.customer_returned_items? %>
 
 <div data-hook="admin_return_authorization_form_fields">
-  <table class="index return-items-table">
+  <table class="table table-condensed table-bordered index return-items-table">
     <thead>
       <tr data-hook="rma_header">
         <th>
@@ -23,7 +23,7 @@
         <% inventory_unit = return_item.inventory_unit %>
         <% editable = inventory_unit.shipped? && allow_return_item_changes && return_item.reimbursement.nil? %>
         <tr>
-          <td class="align-center" class="inventory-unit-checkbox">
+          <td class="inventory-unit-checkbox">
             <% if editable %>
               <%= item_fields.hidden_field :inventory_unit_id %>
               <%= item_fields.check_box :_destroy, {checked: return_item.persisted?, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '0', '1' %>
@@ -33,29 +33,29 @@
             <div class="variant-name"><%= inventory_unit.variant.name %></div>
             <div class="variant-options"><%= inventory_unit.variant.options_text %></div>
           </td>
-          <td class="align-center"><%= inventory_unit.state.humanize %></td>
-          <td class="align-center">
+          <td><%= inventory_unit.state.humanize %></td>
+          <td>
             <%= return_item.display_pre_tax_amount %>
           </td>
-          <td class="align-center">
+          <td>
             <% if editable %>
-              <%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input' } %>
+              <%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input form-control' } %>
             <% else %>
               <%= return_item.display_pre_tax_amount %>
             <% end %>
           </td>
           <td>
             <% if editable %>
-              <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2 fullwidth'} %>
-            <% else %>
-              <%= return_item.preferred_reimbursement_type.try(:name) %>
+              <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2'} %>
             <% end %>
           </td>
-          <td class="align-center">
+          <td>
             <% if editable %>
-              <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :options_text, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
-            <% elsif return_item.exchange_processed? %>
-              <%= return_item.exchange_variant.options_text %>
+              <% if return_item.exchange_processed? %>
+                <%= return_item.exchange_variant.options_text %>
+              <% else %>
+                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :options_text, { include_blank: true }, { class: "select2 return-item-exchange-selection" } %>
+              <% end %>
             <% end %>
           </td>
         </tr>
@@ -63,25 +63,25 @@
     </tbody>
   </table>
 
-  <%= f.field_container :amount do %>
+  <%= f.field_container :amount, class: ['form-group'] do %>
     <%= Spree.t(:total_pre_tax_refund) %>: <span id="total_pre_tax_refund">0.00</span>
   <% end %>
 
-  <%= 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, 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, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location_id %>
   <% end %>
 
-  <%= f.field_container :reason do %>
+  <%= f.field_container :reason, class: ['form-group'] do %>
     <%= f.label :reason, Spree.t(:reason) %>
-    <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
+    <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
     <%= f.error_message_on :reason %>
   <% end %>
 
-  <%= f.field_container :memo do %>
+  <%= f.field_container :memo, class: ['form-group'] do %>
     <%= f.label :memo, Spree.t(:memo) %>
-    <%= f.text_area :memo, {:style => 'height:100px;', :class => 'fullwidth'} %>
+    <%= f.text_area :memo, :class => 'form-control' %>
     <%= f.error_message_on :memo %>
   <% end %>
 </div>

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

@@ -1,7 +1,7 @@
 <% content_for :page_actions do %>
   <% if @return_authorization.can_cancel? %>
     <li>
-      <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, :icon => "delete" %>
     </li>
   <% end %>
   <li>
@@ -12,19 +12,19 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
+  / <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
 <% end %>
 
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @return_authorization } %>
 <%= form_for [:admin, @order, @return_authorization] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
 
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
+    <div class="form-actions" data-hook="buttons">
       <%= button Spree.t('actions.update'), 'repeat' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'delete' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -2,48 +2,48 @@
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any? &:shipped? %>
-    <li>
-      <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :icon => 'plus' %>
-    </li>
+    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :class => "btn-success", :icon => 'add' %>
   <% 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(:return_authorizations) %>
+  / <%= Spree.t(:return_authorizations) %>
 <% end %>
 
-<% if @order.shipments.any?(&:shipped?) || @order.return_authorizations.any? %>
-  <table class="index">
+<% if @order.shipments.any?(&:shipped?) && @order.return_authorizations.any? %>
+  <table class="table">
     <thead data-hook="rma_header">
       <tr>
         <th><%= Spree.t(:rma_number) %></th>
         <th><%= Spree.t(:status) %></th>
         <th><%= Spree.t(:pre_tax_total) %></th>
         <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-        <th class="actions"></th>
+        <th></th>
       </tr>
     </thead>
     <tbody>
       <% @return_authorizations.each do |return_authorization| %>
-        <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row">
           <td><%= return_authorization.number %></td>
           <td><%= Spree.t(return_authorization.state.downcase) %></td>
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
-          <td class="actions">
+          <td class="actions actions-2">
             <%= link_to_edit return_authorization, :no_text => true, :class => 'edit' %>
             <% unless return_authorization.customer_returned_items? %>
               <%= link_to_delete return_authorization, :no_text => true %>
             <% end %>
           </td>
-
         </tr>
       <% end %>
     </tbody>
   </table>
+<% elsif @order.shipments.any?(&:shipped?) %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::ReturnAuthorization.model_name.human(count: :many)) %>
+  </div>
 <% else %>
-  <div data-hook="rma_cannont_create" class="no-objects-found">
+  <div data-hook="rma_cannont_create" class="alert alert-info no-objects-found">
     <%= Spree.t(:cannot_create_returns) %>
   </div>
 <% end %>

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

@@ -1,22 +1,18 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_return_authorization) %>
+  / <%= Spree.t(:new_return_authorization) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_return_authorizations_list), spree.admin_order_return_authorizations_url, :icon => 'arrow-left' %></li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @return_authorization } %>
 <%= form_for [:admin, @order, @return_authorization] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
 
-    <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_return_authorizations_url(@order), :icon => 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'delete' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/search/products.rabl

@@ -0,0 +1,9 @@
+object false
+node(:count) { @products.count }
+node(:total_count) { @products.total_count }
+node(:current_page) { params[:page] ? params[:page].to_i : 1 }
+node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
+node(:pages) { @products.num_pages }
+child(@products => :products) do
+  attributes :id, :name
+end