spree_backend 4.4.1 → 4.5.0

data/app/javascript/spree/dashboard/controllers/product_edit_controller.js

@@ -0,0 +1,38 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["availableOn", "makeActiveAt", "discontinueOn", "status"]
+
+  initialize() {
+    $(this.statusTarget).on("select2:select", function (e) {
+      let event = new Event("change")
+      e.target.dispatchEvent(event)
+    })
+  }
+
+  connect() {
+    this.statusTarget.dispatchEvent(new Event("change"))
+  }
+
+  switchAvailabilityDatesFields(event) {
+    let status = event.target.value
+    if (status === "draft") {
+      this.show(this.availableOnTarget)
+      this.show(this.makeActiveAtTarget)
+    } else if (status === "active") {
+      this.show(this.availableOnTarget)
+      this.hide(this.makeActiveAtTarget)
+    } else {
+      this.hide(this.availableOnTarget)
+      this.hide(this.makeActiveAtTarget)
+    }
+  }
+
+  show(element) {
+    element.style.display = "block"
+  }
+
+  hide(element) {
+    element.style.display = "none"
+  }
+}

data/app/javascript/spree/dashboard/index.js

@@ -6,14 +6,14 @@ class Dashboard {
   }
 }
 
+if (!window.Turbo) {
+  console.warn("Please import '@hotwired/turbo-rails' before '@spree/dashboard' to use Rails Turbo within the Spree Dashboard environment.")
+}
+
 //
 // Import JavaScript packages that are required globally.
 import { Application } from "@hotwired/stimulus"
 import flatpickr from "flatpickr"
-import * as Turbo from "@hotwired/turbo"
-
-// To disable Turbo, un-comment the line below.
-// Turbo.session.drive = false
 
 //
 // Import Utility JavaScript required globally.
@@ -44,6 +44,11 @@ application.register("password-toggle", PasswordToggleController)
 import ClipboardController from "./controllers/clipboard_controller"
 application.register("clipboard", ClipboardController)
 
+import ProductEditController from "./controllers/product_edit_controller"
+application.register("product-edit", ProductEditController)
+
+import * as RequestUtility from "./utilities/request_utility"
+
 //
 // Export
-export { Dashboard, application, flatpickr, Turbo }
+export { Dashboard, application, flatpickr, RequestUtility }

data/app/javascript/spree/dashboard/utilities/bootstrap.js

@@ -6,9 +6,7 @@ const $ = jquery
 
 document.addEventListener("spree:load", function() {
   $('.with-tip').each(function() {
-    $(this).tooltip({
-      container: $(this)
-    })
+    $(this).tooltip({ container: 'body' })
   })
 
   $('.with-tip').on('show.bs.tooltip', function(event) {

data/app/javascript/spree/dashboard/utilities/request_utility.js

@@ -1,6 +1,5 @@
 import { RequestInterceptor } from "@rails/request.js"
 import { FetchRequest } from "@rails/request.js"
-import { navigator } from "@hotwired/turbo"
 
 //
 // Inject Authorization & Content-Type into @rails/request.js requests.
@@ -11,13 +10,13 @@ RequestInterceptor.register(async (request) => {
 //
 // Setup Turbo Progress bar on @rails/request.js requests.
 export function showProgressBar() {
-  navigator.delegate.adapter.progressBar.setValue(0)
-  navigator.delegate.adapter.progressBar.show()
+  Turbo.navigator.delegate.adapter.progressBar.setValue(0)
+  Turbo.navigator.delegate.adapter.progressBar.show()
 }
 
 export function hideProgressBar() {
-  navigator.delegate.adapter.progressBar.setValue(1)
-  navigator.delegate.adapter.progressBar.hide()
+  Turbo.navigator.delegate.adapter.progressBar.setValue(1)
+  Turbo.navigator.delegate.adapter.progressBar.hide()
 }
 
 export function withProgress(request) {

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

@@ -14,7 +14,7 @@
     <%= adjustment.display_amount.to_html %>
   </td>
   <td class="text-center">
-    <span class="text-lowercase badge badge-<%= adjustment.state %>">
+    <span class="text-lowercase badge badge-pill badge-<%= adjustment.state %>">
       <%= Spree.t("state_machine_states.#{adjustment.state}") %>
     </span>
   </td>

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

@@ -1,8 +1,8 @@
 <div class="card-header">
-  <h3 class="card-title mb-0 h5"><%= Spree.t(:order_adjustments) %></h3>
+  <h3 class="card-title mb-0 h6"><%= Spree.t(:order_adjustments) %></h3>
 </div>
-<div class="table-responsive">
-  <table class="table table-bordered adjustments" data-hook="adjustments">
+<div class="table-responsive border rounded bg-white">
+  <table class="table border rounded adjustments" data-hook="adjustments">
     <thead data-hook="adjustmment_head">
       <tr>
         <th><%= Spree.t(:adjustable) %></th>

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

@@ -1,9 +1,5 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :adjustments } %>
 
-<% content_for :page_title do %>
-  / <%= Spree.t(:edit) %> <%= Spree.t(:adjustment) %>
-<% end %>
-
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @adjustment } %>
 
 <%= form_for @adjustment, url: admin_order_adjustment_path(@order, @adjustment), method: :put do |f| %>

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

@@ -1,9 +1,5 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :adjustments} %>
 
-<% content_for :page_title do %>
-   / <%= Spree.t(:adjustments) %>
-<% end %>
-
 <% content_for :page_actions do %>
   <%= button_link_to(Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), class: "btn-success", icon: 'add.svg') if can? :create, Spree::Adjustment %>
 <% end %>
@@ -13,7 +9,7 @@
     <%= render partial: 'adjustments_table' %>
   </div>
 <% else %>
-  <div class="alert alert-warning">
+  <div class="text-center m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Adjustment)) %>
   </div>
 <% end %>

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

@@ -1,9 +1,5 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :adjustments } %>
 
-<% content_for :page_title do %>
-  / <%= Spree.t(:new_adjustment) %>
-<% end %>
-
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @adjustment } %>
 
 <%= form_for @adjustment, url: admin_order_adjustments_path do |f| %>
@@ -11,9 +7,9 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'save' %>
+      <%= button Spree.t(:continue), 'save.svg' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_adjustments_url(@order), icon: 'cancel' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_adjustments_url(@order), icon: 'cancel.svg' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
     <div class="col-12">
       <div class="card sp-card">
         <% unless %w[new create].include? controller.action_name %>
-        <div class="card-header col-12">
+        <div class="card-header">
           <div class="row no-gutters pb-0">
             <div class="col d-flex justify-content-start align-items-center">
               <%= f.field_container :visible, class: ['pb-0 mb-0'] do %>
@@ -15,17 +15,17 @@
               <% end %>
 
               <span id="visibilityStatus" class="d-flex align-items-center">
-                <span class="page_hidden badge badge-secondary <% if @cms_page.visible? %>d-none<% end %>">
+                <span class="page_hidden badge badge-pill badge-secondary <% if @cms_page.visible? %>d-none<% end %>">
                   <%= svg_icon name: "eye-slash-fill.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.draft_mode') %>
                 </span>
 
-                <span class="page_visible badge badge-primary <% if @cms_page.draft_mode? %>d-none<% end %>">
+                <span class="page_visible badge badge-pill badge-primary <% if @cms_page.draft_mode? %>d-none<% end %>">
                   <%= svg_icon name: "view.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.visible') %>
                 </span>
               </span>
             </div>
             <div class="col-auto d-flex align-items-center">
-              <span class="badge badge-secondary">
+              <span class="badge badge-pill badge-secondary">
                   <%= svg_icon name: "translate.svg", width: '18', height: '18' %> <%= locale_full_name(@cms_page.locale) %>
               </span>
             </div>
@@ -100,7 +100,7 @@
               <% end %>
 
               <div class="col-12 col-sm text-right pt-3 pt-sm-0">
-                <button id="toggleMorePageSettingsButton" class="btn btn-outline-secondary" type="button" data-toggle="collapse" data-target="#cmsPageSettings" aria-expanded="false" aria-controls="collapsePageSettings">
+                <button id="toggleMorePageSettingsButton" class="btn btn-light" type="button" data-toggle="collapse" data-target="#cmsPageSettings" aria-expanded="false" aria-controls="collapsePageSettings">
                   <%= raw Spree.t('admin.cms.more_page_settings') %>
                 </button>
               </div>

data/app/views/spree/admin/cms_pages/_live_preview_area.html.erb

@@ -36,7 +36,7 @@
           <% else %>
             <div class="row">
               <div class="col-12">
-                <div class="alert alert-info no-objects-found m-4">
+                <div class="text-center no-objects-found m-5 m-4">
                   <%= raw Spree.t('admin.cms.no_sections_found_please_add_one') %>
                 </div>
               </div>
@@ -49,7 +49,7 @@
             <div class="embed-responsive embed-responsive-4by3">
               <iframe class="embed-responsive-item"
                       id="pageLivePreview"
-                      src="<%= cms_page_preview_url(@cms_page) + "?no_cache=#{rand(1...10000)}" %>"
+                      src="<%= spree_storefront_resource_url(@cms_page, locale: cms_page_locale(@cms_page)) + "?no_cache=#{rand(1...10000)}" %>"
                       sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-modals">
               </iframe>
             </div>

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

@@ -41,14 +41,14 @@
 <% end %>
 
 <% if @cms_pages.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id="pagesTable">
-    <thead>
+    <thead class="text-muted">
       <th scope="col"><%= Spree.t('admin.cms.title') %></th>
-      <th scope="col"><%= Spree.t('admin.cms.visible') %></th>
       <th scope="col"><%= Spree.t('admin.cms.page_type') %></th>
       <th scope="col"><%= Spree.t('language') %></th>
-      <th scope="col"></th>
+      <th scope="col" class="text-center"><%= Spree.t('admin.cms.visible') %></th>
+      <th scope="col" class="text-center"></th>
     </thead>
     <tbody>
       <% @cms_pages.each do |page| %>
@@ -56,15 +56,15 @@
           <td>
             <%= page.title %>
           </td>
-          <td>
-            <%= active_badge(page.visible?) %>
-          </td>
           <td>
             <%= spree_humanize_type(page.type) %>
           </td>
           <td>
             <%= locale_full_name(page.locale) %>
           </td>
+          <td class="text-center">
+            <%= active_badge(page.visible?) %>
+          </td>
           <td class="actions" data-hook="admin_pages_index_row_actions">
              <span class="d-flex justify-content-end">
              <%= link_to_edit(page, no_text: true) %>
@@ -78,7 +78,7 @@
 </div>
 <%= render 'spree/admin/shared/index_table_options', collection: @cms_pages, simple: true %>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= raw Spree.t('admin.cms.you_have_no_pages') %>
   </div>
 <% end %>

data/app/views/spree/admin/cms_sections/_image_upload_form.html.erb

@@ -0,0 +1,18 @@
+<%= f.fields_for image do |ff| %>
+  <%= f.field_container image do %>
+    <% attachment = @cms_section.send(image).attachment %>
+    <% if attachment&.attached? && attachment&.variable? %>
+      <figure class="admin-img-holder">
+        <%= image_tag main_app.cdn_image_url(attachment.variant(resize_to_limit: [244, 104])) %>
+      </figure>
+    <% elsif attachment&.attached? && attachment&.image? %>
+      <figure class="admin-img-holder">
+        <%= image_tag main_app.cdn_image_url(attachment) %>
+      </figure>
+    <% end %>
+    <%= f.field_container image, class: ['mb-0'] do %>
+      <%= ff.file_field :attachment %>
+      <%= f.error_message_on image %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -7,7 +7,7 @@
 <%= button_link_to(
           Spree.t('admin.cms.go_to_fullscreen_section_manager'),
           spree.edit_admin_cms_page_path(@cms_page) + '?section_editor_full_screen_mode=true',
-          class: 'btn-outline-secondary', icon: 'fullscreen.svg', id: 'admin_preview_product'
+          class: 'btn-light', icon: 'fullscreen.svg', id: 'admin_preview_product'
         ) %>
 <% end %>
 

data/app/views/spree/admin/cms_sections/types/_hero_image.html.erb

@@ -27,20 +27,8 @@
     </div>
   </div>
   <div class="col-12 col-md-6 pt-4">
-    <%= f.field_container :image_one do %>
-      <% if @cms_section.image_one.attached? && @cms_section.image_one.variable? %>
-        <figure class="admin-img-holder">
-          <%= image_tag main_app.url_for(@cms_section.image_one.variant(resize: '244x104>')) %>
-        </figure>
-      <% elsif @cms_section.image_one.attached? && @cms_section.image_one.image? %>
-        <figure class="admin-img-holder">
-          <%= image_tag main_app.url_for(@cms_section.image_one) %>
-        </figure>
-      <% end %>
-
-      <%= f.file_field :image_one %>
-      <%= f.error_message_on :image_one %>
-    <% end %>
+    <% @cms_section.build_image_one unless @cms_section.image_one %>
+    <%= render partial: 'image_upload_form', locals: { f: f, image: :image_one } %>
     <small class="form-text text-muted"><%= Spree.t('admin.cms.hero.aspect_ratio') %></small>
   </div>
   <div class="col-12"><hr></div>

data/app/views/spree/admin/cms_sections/types/_image_gallery.html.erb

@@ -25,20 +25,8 @@
     <div id="image_a_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_a') %></h4>
-        <%= f.field_container :image_one do %>
-          <% if @cms_section.image_one.attached? && @cms_section.image_one.variable? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_one.variant(resize: '244x104>')) %>
-            </figure>
-          <% elsif @cms_section.image_one.attached? && @cms_section.image_one.image? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_one) %>
-            </figure>
-          <% end %>
-
-          <%= f.file_field :image_one %>
-          <%= f.error_message_on :image_one %>
-        <% end %>
+        <% @cms_section.build_image_one unless @cms_section.image_one %>
+        <%= render partial: 'image_upload_form', locals: { f: f, image: :image_one } %>
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.square_image') %></small>
 
@@ -69,20 +57,8 @@
     <div id="image_b_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_b') %></h4>
-        <%= f.field_container :image_two do %>
-          <% if @cms_section.image_two.attached? && @cms_section.image_two.variable? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_two.variant(resize: '244x104>')) %>
-            </figure>
-          <% elsif @cms_section.image_two.attached? && @cms_section.image_two.image? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_two) %>
-            </figure>
-          <% end %>
-
-          <%= f.file_field :image_two %>
-          <%= f.error_message_on :image_two %>
-        <% end %>
+        <% @cms_section.build_image_two unless @cms_section.image_two %>
+        <%= render partial: 'image_upload_form', locals: { f: f, image: :image_two } %>
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.tall_image') %></small>
 
@@ -113,20 +89,8 @@
     <div id="image_c_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_c') %></h4>
-        <%= f.field_container :image_three do %>
-          <% if @cms_section.image_three.attached? && @cms_section.image_three.variable? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_three.variant(resize: '244x104>')) %>
-            </figure>
-          <% elsif @cms_section.image_three.attached? && @cms_section.image_three.image? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_three) %>
-            </figure>
-          <% end %>
-
-          <%= f.file_field :image_three %>
-          <%= f.error_message_on :image_three %>
-        <% end %>
+        <% @cms_section.build_image_three unless @cms_section.image_three %>
+        <%= render partial: 'image_upload_form', locals: { f: f, image: :image_three } %>
       </div>
       <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.square_image') %></small>
 

data/app/views/spree/admin/cms_sections/types/_side_by_side_images.html.erb

@@ -3,22 +3,9 @@
     <div id="left_image_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.side_by_side.left_image') %></h4>
-        <%= f.field_container :image_one do %>
-          <% if @cms_section.image_one.attached? && @cms_section.image_one.variable? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_one.variant(resize: '244x104>')) %>
-            </figure>
-          <% elsif @cms_section.image_one.attached? && @cms_section.image_one.image? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_one) %>
-            </figure>
-          <% end %>
-          <%= f.field_container :image_one, class: ['mb-0'] do %>
-            <%= f.file_field :image_one %>
-            <%= f.error_message_on :image_one %>
-          <% end %>
-          <small class="text-muted"><%= Spree.t('admin.cms.side_by_side.image_info') %></small>
-        <% end %>
+        <% @cms_section.build_image_one unless @cms_section.image_one %>
+        <%= render partial: 'image_upload_form', locals: { f: f, image: :image_one } %>
+        <small class="text-muted"><%= Spree.t('admin.cms.side_by_side.image_info') %></small>
       </div>
 
       <%= f.field_container :title_one do %>
@@ -54,22 +41,9 @@
     <div id="right_image_details" class="card p-3">
       <div class="text-center">
         <h4 class="pb-2"><%= Spree.t('admin.cms.side_by_side.right_image') %></h4>
-        <%= f.field_container :image_two do %>
-          <% if @cms_section.image_two.attached? && @cms_section.image_two.variable? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_two.variant(resize: '244x104>')) %>
-            </figure>
-          <% elsif @cms_section.image_two.attached? && @cms_section.image_two.image? %>
-            <figure class="admin-img-holder">
-              <%= image_tag main_app.url_for(@cms_section.image_two) %>
-            </figure>
-          <% end %>
-          <%= f.field_container :image_two, class: ['mb-0'] do %>
-            <%= f.file_field :image_two %>
-            <%= f.error_message_on :image_two %>
-          <% end %>
-          <small class="text-muted"><%= Spree.t('admin.cms.side_by_side.image_info') %></small>
-        <% end %>
+        <% @cms_section.build_image_two unless @cms_section.image_two %>
+        <%= render partial: 'image_upload_form', locals: { f: f, image: :image_two } %>
+        <small class="text-muted"><%= Spree.t('admin.cms.side_by_side.image_info') %></small>
       </div>
 
       <%= f.field_container :title_two do %>

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

@@ -5,9 +5,9 @@
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_country), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_country' } %>
 <% end if can? :create, Spree::Country %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_countries' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="tax_header">
         <th><%= Spree.t(:country_name) %></th>
         <th class="text-center"><%= Spree.t(:iso3) %></th>

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

@@ -1,5 +1,5 @@
-<div class="table-responsive">
-  <table class="table table-condensed table-bordered">
+<div class="table-responsive border rounded bg-white">
+  <table class="table table-condensed border rounded">
     <thead data-hook="customer_return_header">
       <tr>
         <th><%= Spree.t(:number) %></th>

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

@@ -1,6 +1,6 @@
-<div class="table-responsive">
-  <table class="show return-items-table table table-condensed table-bordered index">
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="show return-items-table table table-condensed border rounded index">
+    <thead class="text-muted">
       <tr>
         <th><%= Spree.t(:product) %></th>
         <th><%= Spree.t(:sku) %></th>

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

@@ -1,6 +1,6 @@
-<div class="table-responsive">
-  <table class="table table-condensed table-bordered">
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="table table-condensed border rounded">
+    <thead class="text-muted">
       <tr>
         <th>
           <%= check_box_tag 'select-all' %>

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

@@ -1,9 +1,5 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :customer_returns } %>
 
-<% content_for :page_title do %>
-  / <%= Spree.t(:customer_return) %> #<%= @customer_return.number %>
-<% end %>
-
 <% if @manual_intervention_return_items.any? %>
   <fieldset data-hook="manual_intervention_return_items">
     <legend><%= Spree.t(:manual_intervention_required) %></legend>
@@ -37,7 +33,7 @@
   <% if @customer_return.reimbursements.any? %>
     <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
   <% else %>
-    <div class="alert alert-info no-objects-found">
+    <div class="text-center no-objects-found m-5">
       <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Reimbursement)) %>
     </div>
   <% end %>
@@ -53,7 +49,7 @@
         <% end %>
       <% end %>
     <% else %>
-      <div class="alert alert-info no-objects-found">
+      <div class="text-center no-objects-found m-5">
         <%= Spree.t(:unable_to_create_reimbursements) %>
       </div>
     <% end %>

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

@@ -6,14 +6,10 @@
   <% end %>
 <% end %>
 
-<% content_for :page_title do %>
-  / <%= plural_resource_name(Spree::CustomerReturn) %>
-<% end %>
-
 <% if @order.shipments.any?(&:shipped?) %>
 
   <% if @customer_returns.any? %>
-  <div class="table-responsive">
+  <div class="table-responsive border rounded bg-white">
     <table class="table">
       <thead data-hook="customer_return_header">
         <tr>
@@ -32,9 +28,9 @@
             <td><%= pretty_time(customer_return.created_at) %></td>
             <td>
               <% if customer_return.fully_reimbursed? %>
-                <strong class="badge badge-success text-uppercase"><%= Spree.t(:reimbursed) %></strong>
+                <small class="badge badge-pill badge-success"><%= Spree.t(:reimbursed) %></small>
               <% else %>
-                <strong class="badge badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></strong>
+                <small class="badge badge-pill badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></small>
               <% end %>
             </td>
             <td class='actions' data-hook="admin_orders_customer_returns_index_row_actions">
@@ -48,13 +44,13 @@
     </table>
   </div>
   <% else %>
-    <div class="alert alert-info no-objects-found">
+    <div class="text-center no-objects-found m-5">
       <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CustomerReturn)) %>,
       <%= link_to(Spree.t(:add_one), spree.new_admin_order_customer_return_path(@order)) if can?(:create, Spree::CustomerReturn) %>!
     </div>
   <% end %>
 <% else %>
-  <div data-hook="customer_return_cannot_create" class="alert alert-info no-objects-found">
+  <div data-hook="customer_return_cannot_create" class="text-center no-objects-found m-5">
     <%= Spree.t(:cannot_create_customer_returns) %>
   </div>
 <% end %>

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

@@ -16,14 +16,14 @@
           <% if @rma_return_items.any? %>
             <%= render partial: 'return_item_selection', locals: {f: f, return_items: @rma_return_items} %>
           <% else %>
-            <div class="alert alert-info no-objects-found">
+            <div class="text-center no-objects-found m-5">
               <%= Spree.t(:none) %>
             </div>
           <% end %>
         </fieldset>
 
         <%= f.field_container :stock_location do %>
-          <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
+          <%= f.label :stock_location, raw(Spree.t(:stock_location) + required_span_tag) %>
           <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location %>
         <% end %>
@@ -39,7 +39,7 @@
 
 <% else %>
 
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= 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>