spree_admin 5.1.0.beta4 → 5.1.0.rc1

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

@@ -1,7 +1,7 @@
 <% content_for :page_actions_dropdown do %>
   <%= link_to_edit_translations(@product) %>
   <%= link_to_with_icon(
-    "file",
+    "files",
     Spree.t(:digital_assets),
     spree.admin_product_digital_assets_path(@product),
     class: "dropdown-item",
@@ -15,7 +15,7 @@
 
   <% if can?(:clone, @product) %>
     <%= link_to_with_icon(
-      "copy",
+      "copy-check",
       Spree.t(:clone),
       spree.clone_admin_product_path(@product),
       class: "dropdown-item",

data/app/views/spree/admin/promotion_actions/_promotion_action.html.erb

@@ -5,7 +5,7 @@
 
       <% if can?(:update, promotion_action) || can?(:destroy, promotion_action) %>
         <div class="dropdown">
-          <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">
+          <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false">
             <%= icon('dots-vertical', class: 'mr-0') %>
         </button>
         <div class="dropdown-menu">

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

@@ -1,10 +1,10 @@
 <%= turbo_frame_tag @promotion_action do %>
   <%= form_with model: @promotion_action, url: spree.admin_promotion_action_path(@promotion, @promotion_action), method: :put, scope: :promotion_action do |f| %>
-    <div class="card mb-3" id="<%= spree_dom_id(@promotion_action) %>">
+    <div class="card" id="<%= spree_dom_id(@promotion_action) %>">
       <div class="card-header d-flex justify-content-between align-items-center">
         <h5 class="card-title"><%= @promotion_action.human_name %></h5>
       </div>
-      <div class="card-body pb-0">
+      <div class="card-body">
         <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %>
         <%= render "spree/admin/promotion_actions/forms/#{@promotion_action.key}", f: f %>
       </div>

data/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb

@@ -5,7 +5,7 @@
 
       <% if can?(:update, promotion_rule) || can?(:destroy, promotion_rule) %>
         <div class="dropdown">
-          <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">
+          <button class="btn btn-light btn-sm px-1" type="button" data-toggle="dropdown" aria-expanded="false">
             <%= icon('dots-vertical', class: 'mr-0') %>
         </button>
         <div class="dropdown-menu">
@@ -22,30 +22,47 @@
         <%= render 'spree/admin/shared/preferences', object: promotion_rule %>
       <% end %>
 
+      <% if promotion_rule.respond_to?(:preferred_eligible_values) %>
+        <div class="mt-3">
+          <span><%= Spree.t(:option_values) %>:</span>
+          <div class="d-flex flex-wrap gap-2">
+            <% promotion_rule_option_values(promotion_rule.preferred_eligible_values).each do |value| %>
+              <strong><%= value %></strong>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
       <% if promotion_rule.respond_to?(:products) %>
         <div class="mt-3">
           <span><%= Spree.t(:products) %>:</span>
-          <% promotion_rule.products.pluck(:name).each do |product_name| %>
+          <div class="d-flex flex-wrap gap-2">
+            <% promotion_rule.products.pluck(:name).each do |product_name| %>
             <strong><%= product_name %></strong>
-          <% end %>
+            <% end %>
+          </div>
         </div>
       <% end %>
 
       <% if promotion_rule.respond_to?(:taxons) %>
         <div class="mt-3">
           <span><%= Spree.t(:taxons) %>:</span>
-          <% promotion_rule.taxons.pluck(:pretty_name).each do |taxon_name| %>
-            <strong><%= taxon_name %></strong>
-          <% end %>
+          <div class="d-flex flex-wrap gap-2">
+            <% promotion_rule.taxons.pluck(:pretty_name).each do |taxon_name| %>
+              <strong><%= taxon_name %></strong>
+            <% end %>
+          </div>
         </div>
       <% end %>
 
       <% if promotion_rule.respond_to?(:users) %>
         <div class="mt-3">
           <span><%= Spree.t(:users) %>:</span>
-          <% promotion_rule.users.pluck(:email).each do |user_email| %>
-            <strong><%= user_email %></strong>
-          <% end %>
+          <div class="d-flex flex-wrap gap-2">
+            <% promotion_rule.users.pluck(:email).each do |user_email| %>
+              <strong><%= user_email %></strong>
+            <% end %>
+          </div>
         </div>
       <% end %>
     </div>

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

@@ -1,10 +1,10 @@
 <%= turbo_frame_tag @promotion_rule do %>
   <%= form_with model: @promotion_rule, url: spree.admin_promotion_rule_path(@promotion, @promotion_rule), method: :put, scope: :promotion_rule do |f| %>
-    <div class="card mb-3" id="<%= spree_dom_id(@promotion_rule) %>">
+    <div class="card" id="<%= spree_dom_id(@promotion_rule) %>">
       <div class="card-header d-flex justify-content-between align-items-center">
         <h5 class="card-title"><%= @promotion_rule.human_name %></h5>
       </div>
-      <div class="card-body pb-0">
+      <div class="card-body">
         <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %>
         <%= render "spree/admin/promotion_rules/forms/#{@promotion_rule.key}", f: f %>
       </div>

data/app/views/spree/admin/promotion_rules/forms/_option_value.html.erb

@@ -1,7 +1,7 @@
 <div class="form-group">
   <%= tom_select_tag "promotion_rule[preferred_eligible_values][]",
     placeholder: Spree.t(:type_to_search),
-    url: spree.admin_promotion_rules_option_values_search_path,
+    url: spree.admin_search_option_values_path,
     remote_search: true,
     remote_search_active_option: active_options_for_option_value_promotion_rule(f.object),
     multiple: true,

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

@@ -1,5 +1,5 @@
 <div class="card mb-4 bg-transparent">
-  <div class="card-header d-flex justify-content-between border-0">
+  <div class="card-header d-flex justify-content-between border-0 px-2">
     <h5 class="card-title">
       <%= icon('bolt', class: 'mr-2') %>
       <%= Spree.t(:promotion_actions) %>
@@ -10,7 +10,7 @@
       </span>
     <% end %>
   </div>
-  <div class="card-body d-flex flex-column gap-2 px-1 pt-0 pb-1">
+  <div class="card-body d-flex flex-column gap-2 px-2 pt-0 pb-2">
     <% if @promotion.promotion_actions.empty? %>
       <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
         <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PromotionAction)) %>

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

@@ -1,5 +1,5 @@
 <div class="card mb-4 bg-transparent">
-  <div class="card-header d-flex justify-content-between">
+  <div class="card-header d-flex justify-content-between px-2">
     <h5 class="card-title">
       <%= icon('checklist', class: 'mr-2') %>
       <%= Spree.t(:rules) %>
@@ -24,7 +24,7 @@
       </div>
     </div>
   </div>
-  <div class="card-body p-1 d-flex flex-column gap-2">
+  <div class="card-body p-2 d-flex flex-column gap-2">
     <% if @promotion.promotion_rules.empty? %>
       <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
         <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PromotionRule)) %>

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

@@ -2,7 +2,6 @@
   <% coupon_codes_count = @promotion.coupon_codes.count %>
   <% if coupon_codes_count.positive? %>
     <% used_coupon_codes_count = @promotion.coupon_codes.used.count %>
-    <% remaining_coupon_codes_count = coupon_codes_count - used_coupon_codes_count %>
 
     <div class="card mb-4">
       <div class="card-header d-flex justify-content-between">
@@ -12,9 +11,7 @@
         <%= link_to_with_icon 'eye', Spree.t(:view), spree.admin_promotion_coupon_codes_path(@promotion), class: 'btn btn-sm btn-light' %>
       </div>
       <div class="card-body">
-        <div class="progress">
-          <div class="progress-bar" role="progressbar" style="width: <%= (used_coupon_codes_count.to_f / coupon_codes_count * 100).round %>%" aria-valuenow="<%= used_coupon_codes_count %>" aria-valuemin="0" aria-valuemax="<%= coupon_codes_count %>"></div>
-        </div>
+        <%= progress_bar_component(used_coupon_codes_count, max: coupon_codes_count) %>
       </div>
       <div class="card-footer d-flex justify-content-between">
         <span class="badge badge-light">
@@ -75,16 +72,11 @@
         </li>
 
         <% if @promotion.code.present? %>
-          <li class="list-group-item d-flex justify-content-between align-items-center py-2" data-controller="clipboard" data-clipboard-success-content="Copied!">
+          <li class="list-group-item d-flex justify-content-between align-items-center py-2">
             <span class="text-muted"><%= Spree.t(:coupon_code) %></span>
             <div class="d-flex align-items-center gap-1">
-              <span class="form-control form-control-sm">
-                <span data-clipboard-target="source"><%= @promotion.code.upcase %></span>
-              </span>
-
-              <button type="button" class="btn btn-light btn-sm with-tip p-1" data-action="clipboard#copy" title="<%= Spree.t(:copy) %>">
-                <%= icon 'copy', class: 'mr-0' %>
-              </button>
+              <code><%= @promotion.code.upcase %></code>
+              <%= clipboard_component(@promotion.code.upcase) %>
             </div>
           </li>
         <% end %>
@@ -121,7 +113,7 @@
         </li>
         <li class="list-group-item d-flex justify-content-between align-items-center">
           <span class="text-muted">
-            <%= I18n.t('activerecord.attributes.spree/promotion.expires_at') %>
+            <%= Spree.t(:expires_at) %>
           </span>
           <% if @promotion.expires_at %>
             <span><%= local_time(@promotion.expires_at) %></span>

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

@@ -5,11 +5,15 @@
 
 
 <%= form_for [:admin, @property] do |f| %>
-  <div class="card mb-4">
-    <div class="card-body">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
-      <%= render 'form', f: f %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-4">
+        <div class="card-body">
+          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
+          <%= render 'form', f: f %>
+        </div>
+      </div>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
     </div>
   </div>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
 <% end %>

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

@@ -4,11 +4,15 @@
 <% end %>
 
 <%= form_for [:admin, @property] do |f| %>
-  <div class="card mb-4">
-    <div class="card-body">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
-      <%= render 'form', f: f %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-4">
+        <div class="card-body">
+          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
+          <%= render 'form', f: f %>
+        </div>
+      </div>
+      <%= render 'spree/admin/shared/new_resource_links' %>
     </div>
   </div>
-  <%= render 'spree/admin/shared/new_resource_links' %>
 <% end %>

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

@@ -1,4 +1,9 @@
-<div class="row mt-4">
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.edit_admin_order_path(@order) %>
+  <%= Spree.t(:new_refund) %>
+<% end %>
+
+<div class="row">
   <div class="col-lg-6 offset-lg-3">
     <%= render 'spree/admin/shared/error_messages', target: @refund %>
 

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

@@ -3,11 +3,10 @@
   <%= @reimbursement_type.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
-
 <div class="row">
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <%= form_with model: @reimbursement_type, :url => object_url, :method => :put, scope: :reimbursement_type do |reimbursement_form| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
       <%= render partial: 'form', locals: { f: reimbursement_form } %>
       <%= render 'spree/admin/shared/edit_resource_links', f: reimbursement_form %>
     <% end %>

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

@@ -3,12 +3,10 @@
   <%= Spree.t(:new_reimbursement_type) %>
 <% end %>
 
-
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
-
 <div class="row">
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <%= form_for [:admin, @reimbursement_type] do |reimbursement_form| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
       <%= render partial: 'form', locals: { f: reimbursement_form } %>
       <%= render 'spree/admin/shared/new_resource_links' %>
     <% end %>

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

@@ -1,4 +1,4 @@
-<% record = @customer_return || @order || @product || @vendor || @user || @taxon || @object %>
+<% record = @object || @customer_return || @order || @product || @vendor || @user || @taxon || @store_credit %>
 <% record = nil if @user&.is_a?(Spree.admin_user_class) %>
 
 <% show_record_subtitle = record && record.persisted? && record.has_attribute?(:updated_at) %>
@@ -7,7 +7,7 @@
 <% end if show_record_subtitle && !content_for(:page_subtitle) %>
 
 <% if content_for?(:page_title) %>
-  <header id="page-header" class="container">
+  <header id="page-header" class="container-fluid" data-controller="sticky">
     <h3 class="page-header-title mb-0 d-flex align-items-center gap-3">
       <%= yield :page_title %>
     </h3>
@@ -45,7 +45,7 @@
                 <div data-controller="clipboard">
                   <%= hidden_field_tag :record_number, record.number, data: { clipboard_target: 'source' } %>
                   <button data-action="clipboard#copy" class="text-left dropdown-item">
-                    <%= icon 'files' %>
+                    <%= icon 'copy' %>
                     <%= 'Copy number' %>
                   </button>
                 </div>
@@ -53,10 +53,15 @@
               <div data-controller="clipboard">
                 <%= hidden_field_tag :record_id, record.id, data: { clipboard_target: 'source' } %>
                 <button data-action="clipboard#copy" class="text-left dropdown-item">
-                  <%= icon 'files.svg' %>
+                  <%= icon 'copy' %>
                   <%= Spree.t(:copy_id) %>
                 </button>
               </div>
+
+              <% if defined?(object_url) && %w[show edit].include?(action_name) && record.respond_to?(:can_be_deleted?) && record.can_be_deleted? && can?(:destroy, record) %>
+                <div class="dropdown-divider"></div>
+                <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), object_url, class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %>
+              <% end %>
             <% end %>
           </div>
         </div>

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

@@ -1,6 +1,8 @@
+<% destroy_url = defined?(destroy_url) && destroy_url ? destroy_url : object_url(f.object) %>
+
 <div class="form-actions">
   <%= turbo_save_button_tag Spree.t('actions.update') %>
   <% if f.object.can_be_deleted? && can?(:delete, f.object) %>
-    <%= link_to Spree.t('actions.destroy'), object_url(f.object), data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: defined?(turbo_frame) ? turbo_frame : nil }, class: 'btn btn-danger ml-auto' %>
+    <%= link_to Spree.t('actions.destroy'), destroy_url, data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: defined?(turbo_frame) ? turbo_frame : '_top' }, class: 'btn btn-danger ml-auto' %>
   <% end %>
 </div>

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

@@ -11,8 +11,8 @@
     </div>
 
     <% if settings_active? %>
-      <div class="store-dropdown pr-2">
-        <%= active_link_to_with_icon('arrow-back-up', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn store-dropdown-button w-100 justify-content-start mr-1') %>
+      <div class="store-dropdown px-2">
+        <%= active_link_to_with_icon('arrow-left', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn store-dropdown-button w-100 justify-content-start mx-1 py-2') %>
       </div>
     <% else %>
       <% if defined?(current_vendor) && current_vendor.present? %>

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

@@ -6,7 +6,7 @@
 <% end %>
 
 <% if collection.any? %>
-  <div class="py-2 border-top">
+  <div class="pagination-container">
     <div class="index-pagination-row d-flex align-items-center">
       <div class="col-6 col-lg-3">
         <%= per_page_dropdown %>

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

@@ -2,6 +2,7 @@
   <p class="mb-0">
   <% object.preferences.each do |key, value| %>
       <% next if value.blank? %>
+      <% next if key == :eligible_values %>
       <span><%= Spree.t(key) %>:</span>
       <strong><%= value %></strong>
     <% end %>

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

@@ -1,4 +1,4 @@
-<aside id="main-sidebar">
+<aside id="main-sidebar" class="overflow-y-auto">
   <% if defined?(current_vendor) && current_vendor.present? %>
     <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
   <% else %>

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

@@ -1,4 +1,4 @@
-<%= link_to spree.admin_user_path(user), class: 'rounded hover-light p-2 d-flex justify-content-start align-items-center', data: {turbo_frame: :_top, row_link_target: :link} do %>
+<%= link_to spree.admin_user_path(user), class: 'rounded p-2 d-flex justify-content-start align-items-center text-decoration-none hover-light', data: {turbo_frame: :_top, row_link_target: :link} do %>
   <% if user.name.present? %>
     <%= render_avatar(user, width: 48, height: 48, class: 'mr-3 avatar') %>
   <% else %>
@@ -13,12 +13,7 @@
       <span class="text-muted with-tip" title="<%= user.email %>">
         <%= user.email %>
       </span>
-      <span data-controller="clipboard">
-        <%= hidden_field_tag :user_email, user.email, data: { clipboard_target: 'source' } %>
-        <button data-action="clipboard#copy" class="btn btn-sm text-muted with-tip mx-1" title="Copy email">
-          <%= icon 'files', class: 'mr-0' %>
-        </button>
-      </span>
+      <%= clipboard_component(user.email) %>
     <% end %>
   </div>
 <% end %>

data/app/views/spree/admin/shared/named_types/_edit.html.erb

@@ -3,11 +3,10 @@
   <%= @object.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
-
 <div class="row">
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <%= form_for [:admin, @object] do |f| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
       <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
       <%= render 'spree/admin/shared/edit_resource_links', f: f %>
     <% end %>

data/app/views/spree/admin/shared/named_types/_new.html.erb

@@ -3,11 +3,10 @@
   <%= page_title %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
-
 <div class="row">
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <%= form_for [:admin, @object] do |f| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
       <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
       <%= render 'spree/admin/shared/new_resource_links' %>
     <% end %>

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -29,7 +29,7 @@
   <div class="d-flex align-items-center px-3 ml-3">
     <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link }) if can?(:edit, taxon) %>
 
-    <div class="dropdown ml-2 h-100">
+    <div class="dropdown h-100">
       <button class="btn btn-light btn-sm px-1 h-100" type="button" id="dropdownMenuButton-<%= taxon.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <%= icon('dots-vertical', class: 'mr-0') %>
       </button>

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

@@ -3,9 +3,12 @@
   <%= @shipping_category.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>
-
 <%= form_for [:admin, @shipping_category] do |f| %>
-  <%= render 'form',  f: f %>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>
+      <%= render 'form',  f: f %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+    </div>
+  </div>
 <% end %>

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

@@ -3,11 +3,12 @@
   <%= Spree.t(:new_shipping_category) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>
-
 <%= form_for [:admin, @shipping_category] do |f| %>
-  <fieldset>
-    <%= render partial: 'form', locals: { f: f } %>
-    <%= render partial: 'spree/admin/shared/new_resource_links' %>
-  </fieldset>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>
+      <%= render partial: 'form', locals: { f: f } %>
+      <%= render partial: 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </div>
 <% end %>

data/app/views/spree/admin/shipping_methods/form/_display.html.erb

@@ -21,5 +21,27 @@
         </div>
       </div>
     </div>
+
+    <div class="row">
+      <div class="col-lg-6">
+        <div class="form-group">
+          <%= f.label :admin_name, Spree.t(:internal_name) %>
+          <%= f.text_field :admin_name, class: 'form-control' %>
+          <%= f.error_message_on :admin_name %>
+        </div>
+
+        <p class="form-text text-muted small mt-2">
+          This will be displayed to admins.
+        </p>
+      </div>
+
+      <div class="col-lg-6">
+        <div class="form-group">
+          <%= f.label :code, Spree.t(:code) %>
+          <%= f.text_field :code, class: 'form-control' %>
+          <%= f.error_message_on :code %>
+        </div>
+      </div>
+    </div>
   </div>
-</div>
+</div>

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

@@ -1,56 +1,40 @@
-<div class="row">
-  <div class="col-12">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title">
-          <%= Spree.t(:general_settings) %>
-        </h5>
-      </div>
-      <div class="card-body" >
-        <div class="row">
-          <div class="col-12 col-lg-6">
-            <div class="form-group">
-              <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-              <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
-              <%= f.error_message_on :name %>
-            </div>
-          </div>
-          <div class="col-12 col-lg-6">
-            <div class="form-group">
-              <%= f.label :admin_name, Spree.t(:internal_name) %>
-              <%= f.text_field :admin_name, class: 'form-control', label: false %>
-            </div>
-          </div>
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:general_settings) %>
+    </h5>
+  </div>
+  <div class="card-body" >
+    <div class="form-group">
+      <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+      <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
+      <%= f.error_message_on :name %>
+    </div>
+    <div class="form-group">
+      <%= f.label :admin_name, Spree.t(:internal_name) %>
+      <%= f.text_field :admin_name, class: 'form-control', label: false %>
+    </div>
+    <% unless f.object.default? %>
+      <div class="form-group">
+        <div class="custom-control custom-checkbox">
+          <%= f.check_box :active, class: 'custom-control-input' %>
+          <%= f.label :active, class: 'custom-control-label' %>
         </div>
-        <% unless f.object.default? %>
-          <div class="row mt-3">
-            <div class="col-12">
-              <div class="form-group">
-                <div class="custom-control custom-checkbox">
-                  <%= f.check_box :active, class: 'custom-control-input' %>
-                  <%= f.label :active, class: 'custom-control-label' %>
-                </div>
-              </div>
-            </div>
-          </div>
-        <% end %>
       </div>
-    </div>
+    <% end %>
   </div>
-  <div class="col-12">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title">
-          <%= Spree.t(:address) %>
-        </h5>
-      </div>
-      <div class="card-body">
-        <%= render 'spree/addresses/form',
-                   address_name: 'address',
-                   address_form: f,
-                   address_type: 'stock_location',
-                   address: f.object %>
-      </div>
-    </div>
+</div>
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:address) %>
+    </h5>
+  </div>
+  <div class="card-body pb-0">
+    <%= render 'spree/addresses/form',
+                address_name: 'address',
+                address_form: f,
+                address_type: 'stock_location',
+                address: f.object %>
   </div>
 </div>

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

@@ -2,8 +2,13 @@
   <%= page_header_back_button spree.admin_stock_locations_path %>
   <%= @stock_location.name %>
 <% end %>
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>
+
 <%= form_for [:admin, @stock_location] do |f| %>
-  <%= render 'form', f: f %>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+    </div>
+  </div>
 <% end %>