spree_admin 5.1.0.beta4 → 5.1.0.rc1

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

@@ -2,10 +2,13 @@
   <%= page_header_back_button spree.admin_stock_locations_path %>
   <%= Spree.t(:new_stock_location) %>
 <% end %>
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>
+
 <%= form_for [:admin, @stock_location] do |f| %>
-  <fieldset>
-    <%= render 'form', f: f %>
-    <%= render '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: @stock_location } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </div>
 <% end %>

data/app/views/spree/admin/store_credit_events/_store_credit_event.html.erb

@@ -0,0 +1,29 @@
+<tr id="<%= spree_dom_id(store_credit_event) %>">
+  <td class="w-15">
+    <span class="badge badge-<%= store_credit_event.action %>">
+      <%= store_credit_event.display_action %>
+    </span>
+  </td>
+  <td class="w-15">
+    <%= store_credit_event.display_amount %>
+  </td>
+  <td class="w-30">
+    <% if defined?(Spree::GiftCard) && store_credit_event.originator.is_a?(Spree::GiftCard) %>
+      <%= link_to store_credit_event.originator.code.upcase, spree.admin_gift_card_path(store_credit_event.originator) %>
+    <% elsif store_credit_event.originator.is_a?(Spree.admin_user_class) %>
+      <%= link_to store_credit_event.originator.email, spree.admin_admin_user_path(store_credit_event.originator) %>
+    <% end %>
+  </td>
+  <td class="w-20">
+    <% if store_credit_event.order %>
+      <%= link_to store_credit_event.order.number, spree.edit_admin_order_path(store_credit_event.order) %>
+    <% else %>
+      <span class="text-muted">
+        <%= Spree.t(:not_available) %>
+      </span>
+    <% end %>
+  </td>
+  <td class="w-20">
+    <%= local_date(store_credit_event.created_at) %>
+  </td>
+</tr>

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

@@ -1,24 +1,16 @@
-<div data-hook='admin_store_credit_form_fields'>
-  <div class="row mb-3">
-    <div class="col-6">
-      <div class="form-group">
-        <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
-        <%= f.number_field :amount, class: 'form-control', step: 0.01, required: true, disabled: !f.object.editable? %>
-        <%= f.error_message_on :amount %>
-      </div>
-    </div>
+<div class="form-group">
+  <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
+  <%= f.number_field :amount, class: 'form-control', min: 0.01, step: 0.01, required: true, disabled: !f.object.editable? %>
+  <%= f.error_message_on :amount %>
+</div>
 
-    <div class="col-6">
-      <div class="form-group">
-        <%= f.label :currency, raw(Spree.t(:currency) + required_span_tag), class: 'form-label' %>
-        <%= f.select :currency, preferred_currencies_select_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
-      </div>
-    </div>
-  </div>
+<div class="form-group">
+  <%= f.label :currency, raw(Spree.t(:currency) + required_span_tag), class: 'form-label' %>
+  <%= f.select :currency, preferred_currencies_select_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
+</div>
 
-  <div class="form-group">
-    <%= f.label :memo, Spree.t(:memo) %>
-    <%= f.text_area :memo, class: 'form-control' %>
-    <%= f.error_message_on :memo %>
-  </div>
+<div class="form-group">
+<%= f.label :memo, Spree.t(:memo) %>
+<%= f.text_area :memo, class: 'form-control' %>
+<%= f.error_message_on :memo %>
 </div>

data/app/views/spree/admin/store_credits/_list.html.erb

@@ -9,33 +9,13 @@
         <th><%= Spree.t('store_credit.remaining') %></th>
         <th><%= Spree.t(:created_by) %></th>
         <th><%= Spree.t(:issued_on) %></th>
-        <th></th>
       </thead>
       <tbody>
-        <% @store_credits.each do |store_credit| %>
-          <tr>
-            <td><%= store_credit.currency %></td>
-            <td><%= store_credit.display_amount.to_html %></td>
-            <td><%= store_credit.display_amount_authorized.to_html %></td>
-            <td><%= store_credit.display_amount_used.to_html %></td>
-            <td><%= store_credit.display_amount_remaining.to_html %></td>
-            <td><%= store_credit.created_by_email %></td>
-            <td><%= local_date(store_credit.created_at) %></td>
-            <td class="actions">
-              <% if store_credit.editable? && can?(:edit, store_credit) %>
-                <%= link_to_edit store_credit, url: spree.edit_admin_user_store_credit_path(@user, store_credit), no_text: true, data: { 'turbo-frame': '_top' } %>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
+        <%= render partial: 'spree/admin/store_credits/store_credit', collection: @store_credits, as: :store_credit, cached: spree_base_cache_scope %>
       </tbody>
     </table>
   </div>
+  <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @store_credits } %>
 <% else %>
-  <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::StoreCredit)) %>
-    <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_user_store_credit_path(@user), class: 'btn btn-link ml-3', data: { 'turbo-frame': '_top' } if can?(:create, Spree::StoreCredit) %>
-  </div>
-<% end %>
-
-<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
+  <%= render 'spree/admin/shared/no_resource_found', model_class: Spree::StoreCredit, new_object_url: spree.new_admin_user_store_credit_path(@user) %>
+<% end %>

data/app/views/spree/admin/store_credits/_store_credit.html.erb

@@ -0,0 +1,11 @@
+<tr data-controller="row-link" id="<%= spree_dom_id(store_credit) %>">
+  <td>
+    <%= link_to store_credit.display_amount.to_html, spree.admin_user_store_credit_path(@user, store_credit), data: { row_link_target: :link } %>
+  </td>
+  <td class="cursor-pointer" data-action="click->row-link#openLink"><%= store_credit.display_amount_authorized.to_html %></td>
+  <td class="cursor-pointer" data-action="click->row-link#openLink"><%= store_credit.display_amount_used.to_html %></td>
+  <td class="cursor-pointer" data-action="click->row-link#openLink"><%= store_credit.display_amount_remaining.to_html %></td>
+  <td class="cursor-pointer" data-action="click->row-link#openLink"><%= store_credit.currency %></td>
+  <td class="cursor-pointer" data-action="click->row-link#openLink"><%= store_credit.created_by_email %></td>
+  <td class="cursor-pointer" data-action="click->row-link#openLink"><%= local_date(store_credit.created_at) %></td>
+</tr>

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

@@ -1,36 +1,21 @@
-<% content_for :title do %>
-  <%= Spree.t(:store_credits) %>
-<% end %>
+<%= turbo_frame_tag :store_credit_details do %>
+  <%= form_for @store_credit, url: spree.admin_user_store_credit_path(@user, @store_credit), method: :put do |f| %>
+    <div class="card">
+      <div class="card-header d-flex justify-content-between align-items-center">
+        <h5 class="card-title">
+          <%= Spree.t(:details) %>
+        </h5>
 
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_user_path(@user) %>
-  <%= @user.email %>
-<% end %>
+        <%= link_to Spree.t('actions.discard'), spree.admin_user_store_credit_path(@user, @store_credit), class: 'btn btn-sm btn-light' %>
+      </div>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store_credit } %>
-
-<%= form_for @store_credit, url: spree.admin_user_store_credit_path(@user, @store_credit) do |f| %>
-  <div class="card mb-4">
-    <div class="card-header">
-      <h5 class="card-title">
-        <%= Spree.t(:store_credits) %>
-      </h5>
-    </div>
-
-    <div class="card-body">
-      <%= render 'form', f: f %>
-    </div>
-  </div>
-
-  <% if can? :update, @store_credit %>
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t('actions.update') %>
-
-      <% if @store_credit.can_be_deleted? && can?(:delete, @store_credit) %>
-        <%= link_to Spree.t('actions.destroy'), spree.admin_user_store_credit_path(@user),
-          data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) },
-          class: 'btn btn-danger ml-auto' %>
-      <% end %>
+      <div class="card-body">
+        <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store_credit } %>
+        <%= render 'form', f: f %>
+      </div>
+      <div class="card-footer">
+        <%= render 'spree/admin/shared/edit_resource_links', f: f, destroy_url: spree.admin_user_store_credit_path(@user, @store_credit) %>
+      </div>
     </div>
   <% end %>
 <% end %>

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

@@ -7,20 +7,22 @@
   <%= Spree.t(:new_store_credit) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store_credit } %>
-
 <%= form_for @store_credit, url: spree.admin_user_store_credits_path(@user, @store_credit) do |f| %>
-  <div class="card mb-4">
-    <div class="card-header">
-      <h5 class="card-title">
-        <%= Spree.t(:store_credits) %>
-      </h5>
-    </div>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store_credit } %>
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5 class="card-title">
+            <%= Spree.t(:store_credits) %>
+          </h5>
+        </div>
 
-    <div class="card-body">
-      <%= render 'form', f: f %>
+        <div class="card-body">
+          <%= render 'form', f: f %>
+        </div>
+      </div>
+      <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: spree.admin_user_store_credits_path(@user) } %>
     </div>
   </div>
-
-  <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: spree.admin_user_store_credits_path(@user) } %>
 <% end %>

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

@@ -0,0 +1,145 @@
+<%= content_for :page_title do %>
+  <%= page_header_back_button(spree.admin_user_path(@user)) %>
+  <%= Spree.t(:store_credit_name) %>
+  <%= @store_credit.display_amount %>
+<% end %>
+
+<div class="row">
+  <div class="col-lg-8">
+    <div class="card">
+      <div class="card-header">
+        <h5 class="card-title">
+          <%= Spree.t(:store_credit_events) %>
+        </h5>
+      </div>
+      <div class="card-body p-0">
+        <table class="table">
+          <thead>
+            <tr>
+              <th><%= Spree.t(:action) %></th>
+              <th><%= Spree.t(:amount) %></th>
+              <th><%= Spree.t(:source) %></th>
+              <th><%= Spree.t(:order) %></th>
+              <th><%= Spree.t(:created_at) %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <%= render partial: 'spree/admin/store_credit_events/store_credit_event', collection: @store_credit_events, as: :store_credit_event, cached: spree_base_cache_scope %>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-lg-4">
+    <%= turbo_frame_tag :store_credit_details do %>
+      <div class="card">
+        <div class="card-header d-flex justify-content-between align-items-center">
+          <h5 class="card-title">
+            <%= Spree.t(:details) %>
+          </h5>
+
+          <% if @store_credit.editable? %>
+            <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_user_store_credit_path(@user, @store_credit), class: 'btn btn-sm btn-light' %>
+          <% end %>
+        </div>
+        <div class="card-body p-0">
+          <ul class="list-group list-group-flush">
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <span class="text-muted">
+                <%= Spree.t(:customer) %>
+              </span>
+              <span>
+                <%= link_to @store_credit.user.email, spree.admin_user_path(@store_credit.user) %>
+              </span>
+            </li>
+
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <span class="text-muted">
+                <%= Spree.t(:created_by) %>
+              </span>
+              <% if @store_credit.created_by %>
+                <span>
+                  <%= link_to @store_credit.created_by.email, spree.admin_admin_user_path(@store_credit.created_by) %>
+                </span>
+              <% else %>
+                <span class="text-muted">
+                  <%= Spree.t(:not_available) %>
+                </span>
+              <% end %>
+            </li>
+
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <span class="text-muted">
+                <%= Spree.t(:created_at) %>
+              </span>
+
+              <span>
+                <%= local_time(@store_credit.created_at) %>
+              </span>
+            </li>
+
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <span class="text-muted">
+                <%= Spree.t(:amount) %>
+              </span>
+
+              <span>
+                <%= @store_credit.display_amount %>
+              </span>
+            </li>
+
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <span class="text-muted">
+                <%= Spree.t(:authorized) %>
+              </span>
+
+              <span>
+                <%= @store_credit.display_amount_authorized %>
+              </span>
+            </li>
+
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <span class="text-muted">
+                <%= Spree.t(:used) %>
+              </span>
+
+              <span>
+                <%= @store_credit.display_amount_used %>
+              </span>
+            </li>
+
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <span class="text-muted">
+                <%= Spree.t('store_credit.remaining') %>
+              </span>
+
+              <span>
+                <%= @store_credit.display_amount_remaining %>
+              </span>
+            </li>
+
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <span class="text-muted">
+                <%= Spree.t(:currency) %>
+              </span>
+
+              <span>
+                <%= @store_credit.currency %>
+              </span>
+            </li>
+
+            <li class="list-group-item d-flex flex-column justify-content-between align-items-start">
+              <span class="text-muted mb-2">
+                <%= Spree.t(:memo) %>
+              </span>
+
+              <span>
+                <%= @store_credit.memo %>
+              </span>
+          </ul>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/admin/stores/form/_basic.html.erb

@@ -14,7 +14,7 @@
       </div>
       <div class="card-body">
         <p class="text-muted">
-          This is the name of your store. It will be displayed in the header and in the footer.
+          <%= Spree.t(:store_name_help) %>
         </p>
         <div class="form-group">
           <%= f.label :name, Spree.t(:name) %>
@@ -31,13 +31,30 @@
       </div>
     </div>
 
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title"><%= Spree.t(:phone) %> & <%= Spree.t(:address) %></h5>
+      </div>
+      <div class="card-body">
+        <div class="form-group">
+          <%= f.label :contact_phone, Spree.t(:contact_phone) %>
+          <%= f.text_field :contact_phone, class: 'form-control' %>
+        </div>
+
+        <div class="form-group">
+          <%= f.label :address, Spree.t(:address) %>
+          <%= f.text_area :address, class: 'form-control', data: { controller: 'textarea-autogrow' } %>
+        </div>
+      </div>
+    </div>
+
     <div class="card mb-4">
       <div class="card-header">
         <h5 class="card-title"><%= Spree.t(:standards_and_formats) %></h5>
       </div>
       <div class="card-body">
         <p class="text-muted">
-          Set the timezone, default unit system and weight unit for your store.
+          <%= Spree.t(:standards_and_formats_help) %>
         </p>
         <div class="form-group mb-3">
           <%= label_tag :preferred_timezone, raw(Spree.t(:timezone) + required_span_tag) %>
@@ -48,14 +65,14 @@
             <%= label_tag :preferred_unit_system, raw(Spree.t(:unit_system) + required_span_tag) %>
             <%= select_tag 'store[preferred_unit_system]', options_for_select(unit_systems, @store.preferred_unit_system), {class: 'custom-select', data: {unit_system_target: "body", action: "change->unit-system#unitSystemHandler"}} %>
             <p class="text-muted form-text mt-2 mb-0">
-              This will be used as the default unit system for your store. You can override this on a per-product basis.
+              <%= Spree.t(:unit_system_help) %>
             </p>
           </div>
           <div class="form-group">
             <%= label_tag :preferred_weight_unit, raw(Spree.t(:weight_unit) + required_span_tag) %>
             <%= select_tag 'store[preferred_weight_unit]', options_for_select(weight_units(@store), @store.preferred_weight_unit), {class: 'custom-select', data: {unit_system_target: "weightUnit"}} %>
             <p class="text-muted form-text mt-2 mb-0">
-              This will be used as the default weight unit for your store. You can override this on a per-product basis.
+              <%= Spree.t(:weight_unit_help) %>
             </p>
           </div>
         </div>
@@ -70,10 +87,10 @@
       </div>
       <div class="card-body">
         <p class="text-muted">
-          This determines which vendors you can connect with and what customers see on your store.
+          <%= Spree.t(:currency_and_country_help) %>
         </p>
         <div class="form-group">
-          <%= f.label :default_currency %>
+          <%= f.label :default_currency, Spree.t(:default_currency) %>
           <%= f.currency_select :default_currency, preferred_currencies, {}, data: { controller: 'autocomplete-select' } %>
           <%= f.error_message_on :default_currency %>
         </div>
@@ -95,14 +112,14 @@
           <%= f.label :checkout_zone_id, Spree.t(:shipping_zone) %>
           <%= f.select :checkout_zone_id, options_for_select(@zones, @store.checkout_zone_id), { }, { data: { controller: 'autocomplete-select' } } %>
           <small class="form-text text-muted mt-2">
-            Zone will limit to which Countries or States products are shipped.
+            <%= Spree.t(:shipping_zone_help) %>
             <%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path %>
           </small>
           <%= f.error_message_on :checkout_zone_id %>
         </div>
 
         <div class="form-group">
-          <%= f.label :default_locale %>
+          <%= f.label :default_locale, Spree.t(:default_locale) %>
           <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale || I18n.locale), {}, { data: { controller: 'autocomplete-select' } } %>
           <%= f.error_message_on :default_locale %>
         </div>
@@ -122,8 +139,7 @@
       </div>
       <div class="card-body">
         <p class="text-muted">
-          Digital assets are files that can be downloaded by customers after
-          purchase.
+          <%= Spree.t(:digital_assets_help) %>
         </p>
         <div class="custom-control custom-checkbox mb-3">
           <%= f.check_box :preferred_limit_digital_download_days,

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

@@ -14,7 +14,7 @@
 
     <div class="form-group">
       <%= f.label :description, Spree.t(:description) %><br>
-      <%= f.text_field :description, class: 'form-control' %>
+      <%= f.text_area :description, class: 'form-control' %>
     </div>
 
     <div class="custom-control custom-checkbox">

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

@@ -3,9 +3,12 @@
   <%= @tax_category.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_category } %>
-
 <%= form_for [:admin, @tax_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: @tax_category } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+    </div>
+  </div>
 <% end %>

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

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

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

@@ -6,40 +6,42 @@
   </div>
 
   <div class="card-body">
-    <div class="row">
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= f.label :name, Spree.t(:name) %>
-          <%= 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 :amount, Spree.t(:rate) %>
-          <%= f.number_field :amount, class: 'form-control', min: 0, step: 0.0001, required: true %>
-          <%= f.error_message_on :amount %>
-          <small class="form-text text-muted">
-            <%= Spree.t(:tax_rate_amount_explanation) %>
-          </small>
-        </div>
-        <div class="custom-control custom-checkbox mb-3">
-          <%= f.check_box :included_in_price, class: 'custom-control-input' %>
-          <%= f.label :included_in_price, class: 'custom-control-label' %>
-        </div>
+    <div class="form-group">
+      <%= f.label :name, Spree.t(:name) %>
+      <%= 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 :amount, Spree.t(:rate) %>
+      <%= f.number_field :amount, class: 'form-control', min: 0, step: 0.0001, required: true %>
+      <%= f.error_message_on :amount %>
+      <small class="form-text text-muted">
+        <%= Spree.t(:tax_rate_amount_explanation) %>
+      </small>
+    </div>
+
+    <div class="form-group">
+      <%= f.label :zone_id, Spree.t(:zone) %>
+      <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, { class: 'custom-select' }) %>
+    </div>
+    <div class="form-group">
+      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+      <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, { class: 'custom-select' }) %>
+    </div>
+
+    <hr class="my-4" />
+
+    <div class="form-group">
+      <div class="custom-control custom-checkbox">
+        <%= f.check_box :included_in_price, class: 'custom-control-input' %>
+        <%= f.label :included_in_price, class: 'custom-control-label' %>
       </div>
+    </div>
 
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= f.label :zone_id, Spree.t(:zone) %>
-          <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, { class: 'custom-select' }) %>
-        </div>
-        <div class="form-group">
-          <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-          <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, { class: 'custom-select' }) %>
-        </div>
-        <div class="custom-control custom-checkbox">
-          <%= f.check_box :show_rate_in_label, class: 'custom-control-input' %>
-          <%= f.label :show_rate_in_label, class: 'custom-control-label' %>
-        </div>
+    <div class="form-group">
+      <div class="custom-control custom-checkbox">
+        <%= f.check_box :show_rate_in_label, class: 'custom-control-input' %>
+        <%= f.label :show_rate_in_label, class: 'custom-control-label' %>
       </div>
     </div>
   </div>

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

@@ -3,9 +3,12 @@
   <%= @tax_rate.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_rate } %>
-
 <%= form_for [:admin, @tax_rate] 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: @tax_rate } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+    </div>
+  </div>
 <% end %>

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

@@ -3,12 +3,12 @@
   <%= Spree.t(:new_tax_rate) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_rate } %>
-
 <%= form_for [:admin, @tax_rate] do |f| %>
-  <fieldset>
-    <%= render 'form', f: f %>
-
-    <%= render '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: @tax_rate } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </div>
 <% end %>