spree_admin 5.1.0.beta4 → 5.1.0

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 %>

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

@@ -7,14 +7,12 @@
   <%= link_to_edit_translations(@taxonomy) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
-
 <div class="row">
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <%= form_for [:admin, @taxonomy] do |f| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
       <div class="card mb-4">
         <div class="card-body">
-          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
           <div class="form-group">
             <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
             <%= f.text_field :name, class: 'form-control' %>

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

@@ -2,11 +2,11 @@
   <%= page_header_back_button spree.admin_taxonomies_path %>
   <%= Spree.t(:new_taxonomy) %>
 <% end %>
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
 
 <div class="row">
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <%= form_for [:admin, @taxonomy] do |f| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
       <div class="card mb-4">
         <div class="card-body">
           <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>

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

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button @back_path %>
-  <span class="mr-3"><%= Spree.t(:translations_for, resource_name: @resource_name) %></span>
+  <span class="mr-3"><%= Spree.t(:translations_for, resource_name: @resource.try(:name)) %></span>
 <% end %>
 <% if @locales.any?%>
   <% if @locales.many? %>
@@ -11,35 +11,43 @@
       </div>
     <% end %>
   <% end %>
-  <%= form_with url: spree.admin_translation_path(@resource, resource_type: @resource.class.to_s), method: :put, class: 'form-horizontal' do |f| %>
-    <%= turbo_frame_tag :translations_table, class: "table-responsive border rounded bg-white my-3", refresh: "morph" do %>
-      <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
-      <table class="table">
-        <thead>
-          <tr>
-            <th scope="col" class="text-center"><%= Spree.t(:field) %></th>
-            <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: :en) %> (<%= Spree.t(:default) %>)</th>
-            <th scope="col" class="text-center"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% options = { resource: @resource, selected_translation_locale: @selected_translation_locale } %>
-          <% case @resource %>
-          <% when Spree::Product %>
-            <%= render 'spree/admin/translations/products/form', options %>
-          <% when Spree::Taxon %>
-            <%= render 'spree/admin/translations/taxons/form', options %>
-          <% when Spree::Taxonomy %>
-            <%= render 'spree/admin/translations/taxonomies/form', options %>
-          <% when Spree::Store %>
-            <%= render 'spree/admin/translations/stores/form', options %>
-          <% end %>
-        </tbody>
-      </table>
-    <% end %>
-    <div class="form-actions">
+  <%= form_with model: @resource, url: spree.admin_translation_path(@resource, resource_type: @resource.class.to_s), method: :put, class: 'form-horizontal' do |f| %>
+    <div class="card mb-4">
+      <div class="card-body p-0">
+        <%= turbo_frame_tag :translations_table, refresh: "morph" do %>
+          <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
+          <table class="table">
+            <thead>
+              <tr>
+                <th scope="col" class="w-10 text-center"><%= Spree.t(:field) %></th>
+                <th scope="col" class="w-40 text-center"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
+                <th scope="col" class="w-50 text-center"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
+              </tr>
+            </thead>
+            <tbody>
+              <% options = { f: f, resource: @resource, locale: @selected_translation_locale } %>
+              <% case @resource.class.name %>
+              <% when 'Spree::OptionType' %>
+                <%= render 'spree/admin/translations/option_types/form', options %>
+              <% when 'Spree::Product' %>
+                <%= render 'spree/admin/translations/products/form', options %>
+              <% when 'Spree::Property' %>
+                <%= render 'spree/admin/translations/properties/form', options %>
+              <% when 'Spree::Store' %>
+                <%= render 'spree/admin/translations/stores/form', options %>
+              <% when 'Spree::Taxon' %>
+                <%= render 'spree/admin/translations/taxons/form', options %>
+              <% when 'Spree::Taxonomy' %>
+                <%= render 'spree/admin/translations/taxonomies/form', options %>
+              <% end %>
+            </tbody>
+          </table>
+        <% end %>
+      </div>
+    </div>
+    <div class="form-actions d-flex justify-content-between">
       <%= turbo_save_button_tag Spree.t('actions.update') %>
-      <%= link_to Spree.t('actions.cancel'), @back_path, class: 'btn btn-light ml-auto' %>
+      <%= link_to Spree.t('actions.discard'), @back_path, class: 'btn btn-light', data: { turbo_frame: '_top' } %>
     </div>
   <% end %>
 <% else %>

data/app/views/spree/admin/translations/option_types/_form.html.erb

@@ -0,0 +1,17 @@
+<%# locals: (f:, resource:, locale:) %>
+
+<% resource.class.translatable_fields.each do |field| %>
+  <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
+<% end %>
+
+<% if resource.option_values.any? %>
+  <tr class="bg-light">
+    <th colspan="3"><%= Spree.t(:option_values) %></th>
+  </tr>
+
+  <%= f.fields_for :option_values do |ff| %>
+    <% ff.object.class.translatable_fields.each do |field| %>
+      <%= render "spree/admin/translations/translation_rows/text_field_row", f: ff, field: field, locale: locale %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/translations/products/_form.html.erb

@@ -1,23 +1,14 @@
+<%# locals: (f:, resource:, locale:) %>
+
 <% resource.class.translatable_fields.each do |field| %>
-  <% if field == :meta_keywords %>
-    <% next %>
+  <% next if field == :meta_keywords %>
+
+  <% case field%>
+  <% when :description %>
+    <%= render "spree/admin/translations/translation_rows/rich_textarea_row", f: f, field: field, locale: locale %>
+  <% when :meta_description %>
+    <%= render "spree/admin/translations/translation_rows/textarea_row", f: f, field: field, locale: locale %>
+  <% else %>
+    <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
   <% end %>
-  <tr>
-    <td class="text-left">
-      <%= Spree.t(field) %>
-    </td>
-    <% [@default_locale, selected_translation_locale].each do |translation_locale| %>
-      <% readonly = translation_locale == @default_locale %>
-      <td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
-        <% case field%>
-        <% when :description %>
-          <div class="border rounded mb-0">
-            <%= text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { rows: 10, class: "form-control spree-rte", readonly: readonly, contenteditable: !readonly } %>
-          </div>
-        <% else %>
-          <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
-        <% end %>
-      </td>
-    <% end %>
-  </tr>
 <% end %>

data/app/views/spree/admin/translations/properties/_form.html.erb

@@ -0,0 +1,5 @@
+<%# locals: (f:, resource:, locale:) %>
+
+<% resource.class.translatable_fields.each do |field| %>
+  <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
+<% end %>

data/app/views/spree/admin/translations/stores/_form.html.erb

@@ -1,23 +1,14 @@
+<%# locals: (f:, resource:, locale:) %>
+
 <% resource.class.translatable_fields.each do |field| %>
-  <% if field == :meta_keywords %>
-    <% next %>
+  <% next if field == :meta_keywords %>
+
+  <% case field %>
+  <% when :description %>
+    <%= render "spree/admin/translations/translation_rows/rich_textarea_row", f: f, field: field, locale: locale %>
+  <% when :address, :meta_description %>
+    <%= render "spree/admin/translations/translation_rows/textarea_row", f: f, field: field, locale: locale %>
+  <% else %>
+    <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
   <% end %>
-  <tr>
-    <td class="text-left">
-      <%= Spree.t(field) %>
-    </td>
-    <% [@default_locale, selected_translation_locale].each do |translation_locale| %>
-      <% readonly = translation_locale == @default_locale %>
-      <td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
-        <% case field%>
-        <% when :description %>
-          <div class="trix-container mb-0">
-            <%= rich_text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { contenteditable: !readonly } %>
-          </div>
-        <% else %>
-          <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
-        <% end %>
-      </td>
-    <% end %>
-  </tr>
 <% end %>

data/app/views/spree/admin/translations/taxonomies/_form.html.erb

@@ -1,20 +1,5 @@
+<%# locals: (f:, resource:, locale:) %>
+
 <% resource.class.translatable_fields.each do |field| %>
-  <tr>
-    <td class="text-left">
-      <%= Spree.t(field) %>
-    </td>
-    <% [@default_locale, selected_translation_locale].each do |translation_locale| %>
-      <% readonly = translation_locale == @default_locale %>
-      <td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
-        <% case field%>
-        <% when :description %>
-          <div class="trix-container mb-0">
-            <%= rich_text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { contenteditable: !readonly } %>
-          </div>
-        <% else %>
-          <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
-        <% end %>
-      </td>
-    <% end %>
-  </tr>
+  <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
 <% end %>

data/app/views/spree/admin/translations/taxons/_form.html.erb

@@ -1,37 +1,14 @@
+<%# locals: (f:, resource:, locale:) %>
+
 <% resource.class.translatable_fields.each do |field| %>
-  <% if field == :pretty_name %>
-    <% next %>
+  <% next if field == :pretty_name %>
+
+  <% case field %>
+  <% when :description %>
+    <%= render "spree/admin/translations/translation_rows/rich_textarea_row", f: f, field: field, locale: locale %>
+  <% when :permalink %>
+    <%= render "spree/admin/translations/translation_rows/permalink_field_row", f: f, field: field, locale: locale %>
+  <% else %>
+    <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
   <% end %>
-  <tr>
-    <td class="text-left">
-      <%= Spree.t(field) %>
-    </td>
-    <% [@default_locale, selected_translation_locale].each do |translation_locale| %>
-      <% readonly = translation_locale == @default_locale %>
-      <td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
-        <% case field%>
-        <% when :description %>
-          <div class="trix-container mb-0">
-            <%= rich_text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { contenteditable: !readonly } %>
-          </div>
-        <% when :permalink %>
-          <% parent_permalink = resource.parent.present? ? I18n.with_locale(translation_locale) { resource.parent.permalink } + "/" : "" %>
-          <div class="form-group">
-            <div class="input-group">
-              <% if parent_permalink.present? %>
-                <div class="input-group-prepend">
-                  <span class="input-group-text">
-                    <%= parent_permalink %>
-                  </span>
-                </div>
-              <% end %>
-              <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field)&.delete_prefix(parent_permalink), class: 'form-control', readonly: readonly %>
-            </div>
-          </div>
-        <% else %>
-          <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
-        <% end %>
-      </td>
-    <% end %>
-  </tr>
 <% end %>

data/app/views/spree/admin/translations/translation_rows/_permalink_field_row.html.erb

@@ -0,0 +1,41 @@
+<%# locals: (f:, field:, locale:) %>
+
+<%
+  parent = f.object.parent
+
+  base_permalink = parent.present? ? parent.send(field).to_s + "/" : ""
+  value = f.object.send(field)&.delete_prefix(base_permalink)
+
+  base_permalink_translated = parent.present? ? I18n.with_locale(locale) { parent.send(field) } + "/" : ""
+  translated_value = f.object.send("#{field}_#{locale}")&.delete_prefix(base_permalink_translated)
+%>
+
+<tr>
+  <td class="text-center"><%= Spree.t(field) %></td>
+  <td>
+    <div class="form-group">
+      <div class="input-group">
+        <% if base_permalink.present? %>
+          <div class="input-group-prepend">
+            <span class="input-group-text"><%= base_permalink %></span>
+          </div>
+        <% end %>
+
+        <%= value %>
+      </div>
+    </div>
+  </td>
+  <td>
+    <div class="form-group">
+      <div class="input-group">
+        <% if base_permalink_translated.present? %>
+          <div class="input-group-prepend">
+            <span class="input-group-text"><%= base_permalink_translated %></span>
+          </div>
+        <% end %>
+
+        <%= f.text_field "#{field}_#{locale}", value: translated_value, class: 'form-control' %>
+      </div>
+    </div>
+  </td>
+</tr>

data/app/views/spree/admin/translations/translation_rows/_rich_textarea_row.html.erb

@@ -0,0 +1,13 @@
+<%# locals: (f:, field:, locale:) %>
+
+<tr>
+  <td class="text-center"><%= Spree.t(field) %></td>
+  <td class="text-wrap">
+    <%= @resource.send(field)%>
+  </td>
+  <td>
+    <div class="trix-container mb-0">
+      <%= f.rich_textarea "#{field}_#{locale}" %>
+    </div>
+  </td>
+</tr>

data/app/views/spree/admin/translations/translation_rows/_text_field_row.html.erb

@@ -0,0 +1,7 @@
+<%# locals: (f:, field:, locale:) %>
+
+<tr>
+  <td class="text-center"><%= Spree.t(field) %></td>
+  <td><%= @resource.send(field) %></td>
+  <td><%= f.text_field "#{field}_#{locale}", class: 'form-control' %></td>
+</tr>

data/app/views/spree/admin/translations/translation_rows/_textarea_row.html.erb

@@ -0,0 +1,11 @@
+<%# locals: (f:, field:, locale:) %>
+
+<tr>
+  <td class="text-center"><%= Spree.t(field) %></td>
+  <td>
+    <%= @resource.send(field) %>
+  </td>
+  <td>
+    <%= f.textarea "#{field}_#{locale}", rows: 5, class: "form-control", data: { controller: 'textarea-autogrow'} %>
+  </td>
+</tr>

data/app/views/spree/admin/users/_details.html.erb

@@ -12,6 +12,7 @@
           <%= Spree.t(:email) %>
           <span>
             <%= @user.email %>
+            <%= clipboard_component(@user.email) %>
           </span>
         </li>
         <li class="list-group-item d-flex justify-content-between align-items-center">

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

@@ -10,7 +10,7 @@
   
   <%= render 'extra_actions' %>
 
-  <%= link_to_with_icon 'plus', Spree.t(:create_customer), spree.new_admin_user_path, class: "btn btn-primary" if can? :create, Spree::user_class %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_customer), spree.new_admin_user_path, class: "btn btn-primary" if can? :create, Spree::user_class %>
 <% end %>
 
 <div class="card-lg">

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

@@ -4,11 +4,15 @@
 <% end %>
 
 <%= form_for [:admin, @user], url: spree.admin_users_path, method: :post do |f| %>
-  <div class="card mb-4">
-    <div class="card-body">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
-      <%= 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: @user } %>
+          <%= 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/users/show.html.erb

@@ -1,15 +1,15 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_users_path, @user %>
   <%= customer_full_name(@user) || @user.email %>
-  <span class="font-size-base font-weight-normal ml-3">
+  <span class="font-size-base font-weight-normal">
     <%= customer_location_flag(@user) %>
     <%= customer_location(@user) %>
   </span>
 <% end %>
 
 <% content_for(:page_actions_dropdown) do %>
-  <% if spree.respond_to?(:new_admin_user_gift_card_path) && can?(:create, Spree::GiftCard) %>
-    <%= link_to_with_icon 'plus', Spree.t(:issue_gift_card), spree.new_admin_user_gift_card_path(@user), class: 'text-left dropdown-item' %>
+  <% if can?(:create, Spree::GiftCard) %>
+    <%= link_to_with_icon 'plus', Spree.t(:add_gift_card), spree.new_admin_user_gift_card_path(@user), class: 'text-left dropdown-item' %>
   <% end %>
 
   <% if can?(:create, Spree::StoreCredit) %>

data/app/views/spree/admin/variants/form/_inventory.html.erb

@@ -38,7 +38,7 @@
         <% end %>
       </tbody>
     </table>
-    <div class="card-footer border-toptext-center bg-gray-25 text-muted">
+    <div class="card-footer border-top text-center bg-gray-25 text-muted">
       <%= Spree.t('admin.variants_form.stock_locations_link', link: spree.admin_stock_locations_path).html_safe %>
     </div>
   </div>