solidus_backend 2.3.1 → 2.4.0.beta1

data/app/views/spree/admin/prices/_master_variant_table.html.erb

@@ -20,10 +20,10 @@
           </tr>
         </thead>
         <% master_prices.each do |price| %>
-          <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %> <%= cycle('odd', 'even')%>">
+          <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %>">
             <td><%= price.display_country %></td>
             <td><%= price.currency %></td>
-            <td class="align-right"><%= price.money.to_html %></td>
+            <td><%= price.money.to_html %></td>
             <td class="actions">
               <% if can?(:update, price) %>
                 <%= link_to_edit(price, no_text: true) unless price.deleted? %>

data/app/views/spree/admin/prices/_table.html.erb

@@ -14,11 +14,11 @@
     </thead>
     <tbody>
       <% variant_prices.each do |price| %>
-        <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %> <%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %>">
           <td><%= price.variant.descriptive_name %></td>
           <td><%= price.display_country %></td>
           <td><%= price.currency %></td>
-          <td class="align-right"><%= price.money.to_html %></td>
+          <td><%= price.money.to_html %></td>
           <td class="actions">
             <% if can?(:update, price) %>
               <%= link_to_edit(price, no_text: true) unless price.deleted? %>

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -1,5 +1,5 @@
 <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
-  <td class="no-border">
+  <td>
     <% if f.object.persisted? && can?(:update_positions, f.object) %>
       <span class="handle"></span>
       <%= f.hidden_field :id %>

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

@@ -21,7 +21,8 @@
     <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
       <thead>
         <tr data-hook="product_properties_header">
-          <th colspan="2"><%= Spree::Property.model_name.human %></th>
+          <th></th>
+          <th><%= Spree::Property.model_name.human %></th>
           <th><%= Spree::ProductProperty.human_attribute_name(:value) %></th>
           <th class="actions"></th>
         </tr>
@@ -70,7 +71,8 @@
         <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_variant_property_rule_values_url %>">
           <thead>
             <tr data-hook="variant_property_values_header">
-              <th colspan="2"><%= Spree::Property.model_name.human %></th>
+              <th></th>
+              <th><%= Spree::Property.model_name.human %></th>
               <th><%= Spree::ProductProperty.human_attribute_name(:value) %></th>
               <th class="actions"></th>
             </tr>

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

@@ -56,26 +56,27 @@
   <table class="index" id="listing_products">
     <colgroup>
        <col style="width: 15%;">
-       <col style="width: 10%;">
-       <col style="width: 48%;">
-       <col style="width: 10%;">
-       <col style="width: 17%;">
+       <col style="width: 5%;">
+       <col style="width: 50%;">
+       <col style="width: 15%;">
+       <col style="width: 15%;">
     </colgroup>
     <thead>
       <tr data-hook="admin_products_index_headers">
         <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
-        <th colspan="2"><%= sort_link @search,:name, Spree::Product.human_attribute_name(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %></th>
-        <th><%= sort_link @search,:master_default_price_amount, Spree::Product.human_attribute_name(:price), {}, {title: 'admin_products_listing_price_title'} %></th>
+        <th></th>
+        <th><%= sort_link @search,:name, Spree::Product.human_attribute_name(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %></th>
+        <th class="align-right"><%= sort_link @search,:master_default_price_amount, Spree::Product.human_attribute_name(:price), {}, {title: 'admin_products_listing_price_title'} %></th>
         <th data-hook="admin_products_index_header_actions" class="actions"></th>
       </tr>
     </thead>
     <tbody>
       <% @collection.each do |product| %>
-          <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
-            <td class="align-center"><%= product.sku %></td>
+          <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows">
+            <td><%= product.sku %></td>
             <td class="align-center"><%= render 'spree/admin/shared/image', image: product.display_image, size: :mini %></td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
-            <td class="align-center"><%= product.display_price.to_html %></td>
+            <td class="align-right"><%= product.display_price.to_html %></td>
             <td class="actions" data-hook="admin_products_index_row_actions">
               <%= link_to_edit product, no_text: true, class: 'edit' if can?(:edit, product) && !product.deleted? %>
               &nbsp;

data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb

@@ -1,6 +1,6 @@
 <%= render(
   "spree/admin/promotions/actions/promotion_calculators_with_custom_fields",
-  calculators: Spree::Promotion::Actions::CreateItemAdjustments.calculators,
+  calculators: Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments,
   promotion_action: promotion_action,
   param_prefix: param_prefix
 ) %>

data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb

@@ -12,7 +12,7 @@
     </div>
 
     <div class="col-6">
-      <div class="settings field">
+      <div class="settings">
         <% calculators.each do |calculator_class| %>
           <% calculator = promotion_action.calculator.class == calculator_class ? promotion_action.calculator : calculator_class.new %>
           <div class="js-calculator-preferences" data-calculator-type="<%= calculator_class %>">

data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb

@@ -1,8 +1,5 @@
 <% calculator.preferences.keys.map do |key| %>
-  <% field_name = "#{prefix}[calculator_attributes][preferred_#{key}]" %>
-  <%= label_tag field_name, Spree.t(key.to_s) %>
-  <%= preference_field_tag(
-    field_name,
-    calculator.get_preference(key),
-    type: calculator.preference_type(key)) %>
+  <%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(key)}",
+     name: "#{prefix}[calculator_attributes][preferred_#{key}]",
+     value: calculator.get_preference(key), label: Spree.t(key.to_s) %>
 <% end %>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -1,11 +1,6 @@
-<div class="field">
-  <%= label_tag "#{prefix}[calculator_attributes][preferred_base_amount]",
-    Spree.t(:base_amount) %>
-  <%= preference_field_tag(
-    "#{prefix}[calculator_attributes][preferred_base_amount]",
-    calculator.preferred_base_amount,
-    type: calculator.preference_type(:base_amount)) %>
-</div>
+<%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(:base_amount)}",
+  name: "#{prefix}[calculator_attributes][preferred_base_amount]",
+  value: calculator.preferred_base_amount, label: Spree.t(:base_amount) %>
 
 <div class="field">
   <%= label_tag(

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -1,11 +1,6 @@
-<div class="field">
-  <%= label_tag "#{prefix}[calculator_attributes][preferred_base_percent]",
-    Spree.t(:base_percent) %>
-  <%= preference_field_tag(
-    "#{prefix}[calculator_attributes][preferred_base_percent]",
-    calculator.preferred_base_percent,
-    type: calculator.preference_type(:base_percent)) %>
-</div>
+<%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(:base_percent)}",
+  name: "#{prefix}[calculator_attributes][preferred_base_percent]",
+  value: calculator.preferred_base_percent, label: Spree.t(:base_percent) %>
 
 <div class="field">
   <%= label_tag(

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

@@ -61,35 +61,42 @@
 
 <% if @promotions.any? %>
   <table class="index">
-    <colgroup>
-      <col style="width: 20%">
-      <col style="width: 10%">
-      <col style="width: 30%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-    </colgroup>
     <thead>
       <tr>
         <th><%= Spree::Promotion.human_attribute_name(:name) %></th>
         <th><%= Spree::Promotion.human_attribute_name(:code) %></th>
-        <th><%= Spree::Promotion.human_attribute_name(:description) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:status) %></th>
         <th><%= Spree::Promotion.human_attribute_name(:usage_limit) %></th>
-        <th><%= Spree::Promotion.human_attribute_name(:promotion_uses) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:uses) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:starts_at) %></th>
         <th><%= Spree::Promotion.human_attribute_name(:expires_at) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
     <tbody>
       <% @promotions.each do |promotion| %>
-        <tr id="<%= spree_dom_id promotion %>" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id promotion %>">
           <td><%= promotion.name %></td>
-          <td class="align-center"><%= (promotion.codes.size == 1) ? promotion.codes.first.try!(:value) : Spree.t(:number_of_codes, count: promotion.codes.size) %></td>
-          <td><%= promotion.description %></td>
-          <td class="align-center"><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
-          <td class="align-center"><%= Spree.t(:current_promotion_usage, count: promotion.usage_count) %></td>
-          <td class="align-center"><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
+          <td>
+            <%= (promotion.codes.size == 1) ? promotion.codes.first.try!(:value) : Spree.t(:number_of_codes, count: promotion.codes.size) %>
+          </td>
+          <td>
+            <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">
+              <%= Spree.t(promotion.active?? :active : :inactive) %>
+            </span>
+          </td>
+          <td>
+            <%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %>
+          </td>
+          <td>
+            <%= promotion.usage_count %>
+          </td>
+          <td>
+            <%= promotion.starts_at.to_date.to_s(:short_date) if promotion.starts_at %>
+          </td>
+          <td>
+            <%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %>
+          </td>
           <td class="actions">
             <% if can?(:edit, promotion) %>
               <%= link_to_edit promotion, no_text: true %>

data/app/views/spree/admin/promotions/rules/_user_role.html.erb

@@ -1,11 +1,11 @@
-<div class="field alpha omega eight columns">
+<div class="form-group">
   <%= label_tag "#{param_prefix}_preferred_role_ids", Spree.t('user_role_rule.choose_roles') %>
   <%= select_tag "#{param_prefix}[preferred_role_ids]",
     options_from_collection_for_select(
       Spree::Role.all, :id, :name, promotion_rule.preferred_role_ids
     ), class: 'custom-select fullwidth', multiple: true %>
 </div>
-<div class="field alpha omega eight columns">
+<div class="form-group">
   <label>
     <%= Spree.t('user_role_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::UserRole::MATCH_POLICIES.map{ |s| [Spree.t("user_role_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), { class: 'custom-select'})).html_safe %>
   </label>

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

@@ -59,9 +59,9 @@
   </thead>
   <tbody>
     <% @properties.each do |property| %>
-      <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row" class="<%= cycle('odd', 'even')%>">
-        <td style="padding-left:1em"><%= property.name %></td>
-        <td style="padding-left:1em"><%= property.presentation %></td>
+      <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row">
+        <td><%= property.name %></td>
+        <td><%= property.presentation %></td>
         <td class="actions">
           <% if can?(:update, property) %>
             <%= link_to_edit(property, no_text: true) %>

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

@@ -25,18 +25,20 @@
     <thead>
       <tr data-hook="named_types_header">
         <th><%= Spree::RefundReason.human_attribute_name(:name) %></th>
-        <th><%= Spree::RefundReason.human_attribute_name(:active) %></th>
+        <th><%= Spree::RefundReason.human_attribute_name(:state) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
     <tbody>
       <% @collection.each do |named_type| %>
-        <tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center">
+        <tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row">
+          <td>
             <%= named_type.name %>
           </td>
-          <td class="align-center">
-            <%= Spree.t(named_type.active? ? :say_yes : :say_no) %>
+          <td>
+            <span class="pill pill-<%= named_type.active? ? 'active' : 'inactive' %>">
+              <%= Spree.t(named_type.active? ? :active : :inactive) %>
+            </span>
           </td>
           <td class="actions">
             <% if can?(:update, named_type) && named_type.mutable? %>

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

@@ -23,7 +23,7 @@
       <div class="col-3">
         <div class="field">
           <%= f.label :amount %><br/>
-          <%= f.text_field :amount, class: 'fullwidth' %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :amount, currency: @refund.currency, required: true %>
         </div>
       </div>
       <div class="col-3">

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

@@ -14,8 +14,8 @@
   </thead>
   <tbody>
     <% @reimbursement_types.each do |reimbursement_type| %>
-      <tr id="<%= spree_dom_id reimbursement_type %>" data-hook="reimbursement_type_row" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center">
+      <tr id="<%= spree_dom_id reimbursement_type %>" data-hook="reimbursement_type_row">
+        <td>
           <%= reimbursement_type.name.humanize %>
         </td>
         <td>

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

@@ -32,23 +32,23 @@
               <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: 'custom-select fullwidth'}
               ) %>
             </td>
-            <td class="align-center">
+            <td>
               <%= item_fields.text_field :amount, { class: 'refund-amount-input' } %>
             </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 %>
@@ -82,7 +82,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>

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

@@ -19,10 +19,17 @@
   </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>
+          <span class="pill pill-<%= reimbursement.reimbursement_status %>">
+            <%= Spree.t(
+              reimbursement.reimbursement_status,
+              scope: :reimbursement_states
+            ) %>
+          </span>
+        </td>
         <td><%= pretty_time(reimbursement.created_at) %></td>
       </tr>
     <% end %>

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

@@ -30,19 +30,19 @@
             <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_amount %>
           </td>
-          <td class="align-center">
+          <td>
             <%= return_item.display_total %>
           </td>
         </tr>
@@ -63,7 +63,7 @@
     </thead>
     <tbody>
       <% @reimbursement.refunds.each do |refund| %>
-        <tr id="<%= spree_dom_id(refund) %>" data-hook="reimbursement_refund_row" class="reimbursement-refund <%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id(refund) %>" data-hook="reimbursement_refund_row" class="reimbursement-refund">
           <td class="reimbursement-refund-description"><%= refund.description %></td>
           <td class="reimbursement-refund-amount"><%= refund.display_amount %></td>
         </tr>
@@ -83,7 +83,7 @@
     </thead>
     <tbody>
       <% @reimbursement.credits.each do |credit| %>
-        <tr id="<%= spree_dom_id(credit) %>" data-hook="reimbursement_refund_row" class="reimbursement-credit <%= cycle('odd', 'even')%>">
+        <tr id="<%= spree_dom_id(credit) %>" data-hook="reimbursement_refund_row" class="reimbursement-credit">
           <td class="reimbursement-credit-description"><%= credit.description %></td>
           <td class="reimbursement-credit-amount"><%= credit.display_amount %></td>
         </tr>

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

@@ -11,8 +11,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

@@ -24,7 +24,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_authorizations/_form.html.erb

@@ -24,7 +24,7 @@
         <% inventory_unit = return_item.inventory_unit %>
         <% editable = inventory_unit.shipped? && !inventory_unit.exchange_requested? && allow_return_item_changes && return_item.reimbursement.nil? %>
         <tr>
-          <td class="return-item-checkbox align-center inventory-unit-checkbox">
+          <td class="return-item-checkbox 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.amount}, '0', '1' %>
@@ -34,11 +34,15 @@
             <div class="variant-name"><%= inventory_unit.variant.name %></div>
             <div class="variant-options"><%= inventory_unit.variant.options_text %></div>
           </td>
-          <td class="return-item-state align-center"><%= inventory_unit.state.humanize %></td>
-          <td class="return-item-charged align-center">
+          <td class="return-item-state">
+            <span class="pill pill-<%= inventory_unit.state %>">
+              <%= Spree.t(inventory_unit.state, scope: :inventory_states) %>
+            </span>
+          </td>
+          <td class="return-item-charged">
             <%= return_item.display_amount %>
           </td>
-          <td class="return-item-pre-tax-refund-amount align-center">
+          <td class="return-item-pre-tax-refund-amount">
             <% if editable %>
               <%= item_fields.text_field :amount, { class: 'refund-amount-input' } %>
             <% else %>
@@ -52,7 +56,7 @@
               <%= return_item.preferred_reimbursement_type.try(:name) %>
             <% end %>
           </td>
-          <td class="return-item-exchange-for align-center">
+          <td class="return-item-exchange-for">
             <% if editable %>
               <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants(@stock_locations), :id, :exchange_name, { include_blank: true }, { class: "custom-select fullwidth return-item-exchange-selection" } %>
             <% elsif return_item.exchange_processed? %>

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

@@ -9,8 +9,15 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ReturnAuthorization), spree.admin_order_return_authorizations_url) %>
-<% admin_breadcrumb("#{@return_authorization.number} (#{Spree.t(@return_authorization.state.downcase)})") %>
-
+<% admin_breadcrumb(
+  """
+    #{ @return_authorization.number }
+    (#{ Spree.t(
+      @return_authorization.state,
+      scope: :return_authorization_states
+    ) })
+  """
+) %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @return_authorization } %>
 

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

@@ -19,17 +19,24 @@
       <tr>
         <th><%= Spree::ReturnAuthorization.human_attribute_name(:number) %></th>
         <th><%= Spree::ReturnAuthorization.human_attribute_name(:state) %></th>
-        <th><%= Spree::ReturnAuthorization.human_attribute_name(:pre_tax_total) %></th>
+        <th><%= Spree::ReturnAuthorization.human_attribute_name(:total_excluding_vat) %></th>
         <th><%= Spree::ReturnAuthorization.human_attribute_name(:created_at) %></th>
         <th class="actions"></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>
+            <span class="pill pill-<%= return_authorization.state %>">
+              <%= Spree.t(
+                return_authorization.state,
+                scope: :return_authorization_states
+              ) %>
+            </span>
+          </td>
+          <td><%= return_authorization.display_total_excluding_vat.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
           <td class="actions">
             <% if can? :update, return_authorization %>

data/app/views/spree/admin/search/products.json.jbuilder

@@ -0,0 +1,10 @@
+json.products(@products) do |product|
+  json.id product.id
+  json.name product.name
+end
+
+json.count @products.count
+json.total_count @products.total_count
+json.current_page params[:page] ? params[:page].to_i : 1
+json.per_page params[:per_page] || Kaminari.config.default_per_page
+json.pages @products.total_pages

data/app/views/spree/admin/search/users.json.jbuilder

@@ -0,0 +1,37 @@
+json.array!(@users) do |user|
+  json.id user.id
+  json.email user.email
+
+  address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id, :company]
+  json.ship_address do
+    if user.ship_address
+      json.(user.ship_address, *address_fields)
+      if user.ship_address.state
+        json.state do
+          json.name user.ship_address.state.name
+        end
+      end
+      if user.ship_address.country
+        json.country do
+          json.name user.ship_address.country.name
+        end
+      end
+    end
+  end
+
+  json.bill_address do
+    if user.bill_address
+      json.(user.bill_address, *address_fields)
+      if user.bill_address.state
+        json.state do
+          json.name user.bill_address.state.name
+        end
+      end
+      if user.bill_address.country
+        json.country do
+          json.name user.bill_address.country.name
+        end
+      end
+    end
+  end
+end

data/app/views/spree/admin/shared/_calculator_fields.html.erb

@@ -11,7 +11,10 @@
       <% calculator = f.object.calculator.class == calculator_class ? f.object.calculator : calculator_class.new %>
       <div class="js-calculator-preferences" data-calculator-type="<%= calculator_class %>">
         <%= f.fields_for :calculator, calculator do |calculator_form| %>
-          <%= preference_fields(calculator, calculator_form) %>
+          <% calculator.preferences.keys.each do |key| %>
+            <%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(key)}",
+               form: calculator_form, attribute: "preferred_#{key}", label: Spree.t(key) %>
+          <% end %>
         <% end %>
       </div>
     <% end %>

data/app/views/spree/admin/shared/_modal.html.erb

@@ -0,0 +1,18 @@
+<div class="modal fade" id="<%= target %>" role="dialog" aria-labelledby="<%= target %>" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="<%= target %>"><%= title %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <%= content %>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/shared/_number_field_update_actions.html.erb

@@ -1,5 +1,5 @@
 <% if can?(:update, resource) %>
   <%= link_to_with_icon 'edit', Spree.t('actions.edit'), '#', no_text: true, data: { action: 'edit', id: resource.id } %>
-  <%= link_to_with_icon 'check', Spree.t('actions.update'), '#', no_text: true, data: update_data.merge(action: 'green', id: resource.id) %>
-  <%= link_to_with_icon 'void', Spree.t('actions.cancel'), '#', no_text: true, data: { action: 'red', id: resource.id } %>
+  <%= link_to_with_icon 'check', Spree.t('actions.update'), '#', no_text: true, data: update_data.merge(action: 'save', id: resource.id) %>
+  <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), '#', no_text: true, data: { action: 'cancel', id: resource.id } %>
 <% end %>

data/app/views/spree/admin/shared/_number_field_update_cell.html.erb

@@ -1,4 +1,4 @@
-<td class="align-center" id="number-update-<%= resource_id %>">
+<td id="number-update-<%= resource_id %>">
   <span class="js-number-update-text"><%= number_value %></span>
   <%= number_field_tag field_tag, number_value, id: "#{field_tag.to_s}_#{resource_id}", class: 'fullwidth js-number-update-input' %>
 </td>