spree_admin 5.0.0.rc1 → 5.0.1

data/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb

@@ -1,29 +1,22 @@
 <% if can?(:manage, Spree::Theme) %>
-  <li class="nav-item">
-    <% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>
-    <%= active_link_to_with_icon('building-store', Spree.t('admin.storefront'), spree.admin_themes_path, class: 'nav-link', active: storefront_active) %>
+  <% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>
+  <%= nav_item(Spree.t('admin.storefront'), spree.admin_themes_path, icon: 'building-store', active: storefront_active) %>
 
-    <% if storefront_active %>
-      <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:themes), spree.admin_themes_path, class: 'nav-link' %>
-        </li>
-        <% if can?(:manage, Spree::Page) %>
-          <li class="nav-item">
-            <%= active_link_to Spree.t(:pages), spree.admin_pages_path, class: 'nav-link' %>
-          </li>
-        <% end %>
-        <% if can?(:manage, Spree::Post) %>
-          <li class="nav-item">
-          <%= active_link_to Spree.t(:posts), spree.admin_posts_path, class: 'nav-link', active: %w[posts post_categories].include?(controller_name) %>
-          </li>
-        <% end %>
-        <% if can?(:manage, current_store) %>
-          <li class="nav-item">
-            <%= active_link_to Spree.t(:settings), spree.edit_admin_storefront_path, class: 'nav-link' %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </li>
+  <% if storefront_active %>
+    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+      <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
+      
+      <% if can?(:manage, Spree::Page) %>
+        <%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>
+      <% end %>
+      
+      <% if can?(:manage, Spree::Post) %>
+        <%= nav_item(Spree.t(:posts), spree.admin_posts_path, active: %w[posts post_categories].include?(controller_name)) %>
+      <% end %>
+      
+      <% if can?(:manage, current_store) %>
+        <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>
+      <% end %>
+    </ul>
+  <% end %>
 <% end %>

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

@@ -10,29 +10,9 @@
   <div class="flex-grow-1 cursor-pointer" data-action="click->row-link#openLink">
     <div class="d-flex align-items-center overflow-hidden w-100 <% if taxon.square_image&.attached? || taxon.image&.attached? %>py-2<% else %>py-3<% end %>">
       <% if taxon.square_image&.attached? && taxon.square_image.variable? %>
-        <%= image_tag(
-              main_app.cdn_image_url(
-                taxon.square_image.variant(
-                  spree_image_variant_options(resize_to_fill: [96, 96])
-                )
-              ),
-              class: 'rounded mr-3',
-              width: 48,
-              height: 48,
-              loading: :lazy
-        ) %>
+        <%= spree_image_tag(taxon.square_image, class: 'rounded mr-3', width: 48, height: 48, loading: :lazy) %>
       <% elsif taxon.image&.attached? && taxon.image.variable? %>
-        <%= image_tag(
-              main_app.cdn_image_url(
-                taxon.image.variant(
-                  spree_image_variant_options(resize_to_fill: [96, 96])
-                )
-              ),
-              class: 'rounded mr-3',
-              width: 48,
-              height: 48,
-              loading: :lazy
-        ) %>
+        <%= spree_image_tag(taxon.image, class: 'rounded mr-3', width: 48, height: 48, loading: :lazy) %>
       <% end %>
       <div class="overflow-hidden">
         <%= taxon.name %>
@@ -47,7 +27,7 @@
   </div>
 
   <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 }) %>
+    <%= 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">
       <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">

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

@@ -3,34 +3,36 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-primary", icon: 'plus.svg' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_shipping_category), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::ShippingCategory %>
 
 <%= render partial: 'spree/admin/shared/shipping_nav' %>
 
-<% if @shipping_categories.any? %>
-  <div class="table-responsive border rounded bg-white shadow-xs">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% @shipping_categories.each do |shipping_category| %>
-          <tr id="<%= spree_dom_id shipping_category %>" class="cursor-pointer" data-controller="row-link">
-            <td data-action="click->row-link#openLink"><%= shipping_category.name %></td>
-            <td class="actions">
-              <span class="d-flex justify-content-end">
-                <%= link_to_edit(shipping_category, data: { row_link_target: :link }) if can? :edit, shipping_category %>
-              </span>
-            </td>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+        </thead>
+        <tbody>
+          <% @collection.each do |shipping_category| %>
+            <tr id="<%= spree_dom_id shipping_category %>" class="cursor-pointer" data-controller="row-link">
+              <td data-action="click->row-link#openLink"><%= shipping_category.name %></td>
+              <td class="actions">
+                <span class="d-flex justify-content-end">
+                  <%= link_to_edit(shipping_category, data: { row_link_target: :link }) if can? :edit, shipping_category %>
+                </span>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

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

@@ -1,5 +1,5 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingMethod) %>
-    <%= button_link_to Spree.t(:new_shipping_method), new_object_url, class: "btn-primary", icon: 'plus' %>
+    <%= link_to_with_icon 'plus', Spree.t(:new_shipping_method), new_object_url, class: "btn btn-primary" %>
   <% end %>
 <% end %>

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

@@ -11,24 +11,26 @@
   </div>
 <% end %>
 
-<% if @shipping_methods.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_shipping_methods'>
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:zone) %></th>
-          <th><%= Spree.t(:estimated_delivery_time) %></th>
-          <th><%= Spree.t(:amount) %></th>
-          <th><%= Spree.t(:visibility) %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <%= render partial: 'spree/admin/shipping_methods/shipping_method', collection: @shipping_methods.includes(:zones, :calculator), as: :shipping_method %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:zone) %></th>
+            <th><%= Spree.t(:estimated_delivery_time) %></th>
+            <th><%= Spree.t(:amount) %></th>
+            <th><%= Spree.t(:visibility) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <%= render partial: 'spree/admin/shipping_methods/shipping_method', collection: @collection.includes(:zones, :calculator), as: :shipping_method %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

data/app/views/spree/admin/stock_items/_filters.html.erb

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: { controller: "filters reveal", reveal_hidden_class: "d-none" } do |f| %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters reveal", reveal_hidden_class: "d-none" } do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>
 
@@ -25,12 +25,7 @@
 
     </div>
 
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
-    </div>
+    <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -6,10 +6,10 @@
   <%= render "spree/admin/shared/stock_nav" %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "filters" %>
 
-  <% if @stock_items.any? %>
+  <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table" id="listing_products">
         <thead class="text-muted">
@@ -24,15 +24,12 @@
           </tr>
         </thead>
         <tbody>
-          <%= render partial: "stock_item", collection: @stock_items %>
+          <%= render collection: @collection, partial: "stock_item" %>
         </tbody>
       </table>
     </div>
+    <%= render "spree/admin/shared/index_table_options", collection: @collection %>
   <% else %>
-    <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-      <%= Spree.t(:no_resource_found, resource: Spree.t(:stock)) %>
-    </div>
+    <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
   <% end %>
-
-  <%= render "spree/admin/shared/index_table_options", collection: @stock_items, simple: true if @stock_items.any? %>
 </div>

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

@@ -4,25 +4,28 @@
     <%= flag_emoji(stock_location.country_iso) %>
     <%= stock_location.country_name %>
   </td>
-  <td data-action="click->row-link#openLink"><%= active_badge(stock_location.active?) %></td>
+  <td data-action="click->row-link#openLink">
+    <%= active_badge(stock_location.active?) %>
+  </td>
   <td data-action="click->row-link#openLink"><%= active_badge(stock_location.default?) %></td>
   <td class="actions">
     <% if can? :edit, stock_location %>
       <div class="d-flex justify-content-end align-items-center">
         <div><%= link_to_edit stock_location, data: { row_link_target: 'link' } %></div>
 
-        <div class="dropdown">
-          <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <%= icon('dots', class: 'mr-0') %>
-          </button>
-
-          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
-            <%= link_to_with_icon 'check',
-              Spree.t(:mark_as_default),
-              spree.mark_as_default_admin_stock_location_path(stock_location),
-              class: 'dropdown-item',
-              data: { turbo_method: :put } %>
-          </div>
+        <% unless stock_location.default? %>
+          <div class="dropdown">
+            <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <%= icon('dots', class: 'mr-0') %>
+            </button>
+            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+              <%= link_to_with_icon 'check',
+                Spree.t(:mark_as_default),
+                spree.mark_as_default_admin_stock_location_path(stock_location),
+                class: 'dropdown-item',
+                data: { turbo_method: :put } %>
+            </div>
+          <% end %>
         </div>
       </div>
     <% end %>

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

@@ -2,25 +2,28 @@
   <%= Spree.t(:stock_locations) %>
 <% end %>
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_location), new_object_url, class: "btn-primary", icon: 'plus' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_stock_location), new_object_url, class: "btn btn-primary" %> 
 <% end if can? :create, Spree::StockLocation %>
-<% if @stock_locations.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_tax_rates'>
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:country) %></th>
-          <th><%= Spree.t(:status) %></th>
-          <th><%= Spree.t(:default) %></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        <%= render partial: 'spree/admin/stock_locations/stock_location', collection: @stock_locations, cached: spree_base_cache_scope %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:country) %></th>
+            <th><%= Spree.t(:active) %>?</th>
+            <th><%= Spree.t(:default) %>?</th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <%= render partial: 'spree/admin/stock_locations/stock_location', collection: @collection, cached: spree_base_cache_scope %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

data/app/views/spree/admin/stock_transfers/_filters.html.erb

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>
     <%= render 'spree/admin/shared/filters_button' %>

data/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb

@@ -1,10 +1,7 @@
 <div class="modal fade" id="stock_transfer_modal" tabindex="-1" aria-labelledby="stock_transfer_modal_label" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content" data-controller="search-picker">
-      <div class="modal-header">
-        <h5 class="modal-title" id="stock_transfer_modal_label"><%= Spree.t(:add_variant) %></h5>
-        <button type="button" class="btn-close" data-action="search-picker#closeAndClear" data-dismiss="modal" aria-label="Close" />
-      </div>
+      <%= modal_header(Spree.t(:add_variant)) %>
       <div class="modal-body">
         <%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %>
           <%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>
@@ -22,7 +19,8 @@
           </p>
         </div>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= button_tag Spree.t(:add_selected_variant), class: "btn btn-primary text-center", disabled: true, data: { search_picker_target: :submit, action: 'stock-transfer#add search-picker#closeAndClear', dismiss: 'modal' } %>
       </div>
     </div>

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

@@ -5,14 +5,14 @@
   <%= render "spree/admin/shared/stock_nav" %>
 <% end %>
 <% content_for :page_actions do %>
-  <%= if can?(:create, Spree::StockTransfer.new)
-    link_to Spree.t(:new_stock_transfer), spree.new_admin_stock_transfer_path, class: "btn btn-primary"
+  <%= if can?(:create, Spree::StockTransfer)
+    link_to_with_icon 'plus', Spree.t(:new_stock_transfer), new_object_url, class: "btn btn-primary"
   end %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "filters" %>
-  <% if @stock_transfers.any? %>
+  <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table" id="listing_products">
         <thead class="text-muted">
@@ -27,12 +27,12 @@
           </tr>
         </thead>
         <tbody>
-          <%= render partial: 'stock_transfer', collection: @stock_transfers %>
+          <%= render collection: @collection, partial: 'stock_transfer' %>
         </tbody>
       </table>
     </div>
+    <%= render 'spree/admin/shared/index_table_options', collection: @collection %>
   <% else %>
     <%= render 'spree/admin/shared/no_resource_found' %>
   <% end %>
-  <%= render 'spree/admin/shared/index_table_options', collection: @stock_transfers, simple: true if @stock_transfers.any? %>
 </div>

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

@@ -2,4 +2,4 @@
   <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
   <%= f.text_field :name, class: 'form-control' %>
   <%= f.error_message_on :name %>
-<% end %>
+</div>

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

@@ -6,8 +6,10 @@
 <%= render 'spree/admin/shared/error_messages', target: @store_credit_category %>
 
 <%= form_for [:admin, @store_credit_category] do |f| %>
-  <fieldset>
-    <%= render 'form', f: f %>
-    <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-  </fieldset>
+  <div class="card mb-4">
+    <div class="card-body">
+      <%= render 'form', f: f %>
+    </div>
+  </div>
+  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
 <% end %>

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

@@ -3,30 +3,34 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-primary", icon: 'plus', id: 'admin_new_store_credit_category_link' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_store_credit_category), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::StoreCreditCategory %>
 
-<% if @store_credit_categories.any? %>
-<div class="table-responsive card-lg p-0">
-  <table class="table">
-    <thead class="text-muted">
-      <tr>
-        <th><%= Spree.t(:name) %></th>
-        <th class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @store_credit_categories.each do |store_credit_category| %>
-        <tr id="<%= spree_dom_id store_credit_category %>">
-          <td><%= store_credit_category.name %></td>
-          <td class="actions">
-            <%= link_to_edit(store_credit_category, no_text: true) if can? :edit, store_credit_category %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @collection.each do |store_credit_category| %>
+            <tr id="<%= spree_dom_id store_credit_category %>">
+              <td>
+                <%= store_credit_category.name %>
+              </td>
+              <td class="actions">
+                <%= link_to_edit(store_credit_category, no_text: true) if can? :edit, store_credit_category %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
 </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>

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

@@ -5,11 +5,11 @@
   <% end %>
 
   <% content_for :page_actions do %>
-    <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-primary", icon: 'plus' if can?(:create, Spree::StoreCredit) %>
+    <%= link_to_with_icon 'plus', Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn btn-primary" if can?(:create, Spree::StoreCredit) %>
   <% end %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <% if params[:frame_name].present? %>
     <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
       <%= render 'list' %>

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

@@ -46,21 +46,19 @@
             <%= Spree.t(:security) %>
           </h5>
         </div>
-        <div class="card-body">
+        <div class="card-body" data-controller="reveal" data-reveal-hidden-class="d-none">
           <div class="custom-control custom-checkbox mb-2">
-            <%= f.check_box :preferred_password_protected, class: 'custom-control-input' %>
+            <%= f.check_box :preferred_password_protected, class: 'custom-control-input', data: { action: 'reveal#toggle' } %>
             <%= f.label :preferred_password_protected, Spree.t(:password_protected), class: 'custom-control-label' %>
           </div>
           <p class="text-muted small pl-4">
             Checking this box will put your storefront behind a password.
           </p>
-
-          <% if @store.prefers_password_protected? %>
-            <div class="form-group">
-              <%= f.label :storefront_password, Spree.t(:password) %>
-              <%= f.text_field :storefront_password, class: 'form-control' %>
-            </div>
-          <% end %>
+          
+          <div class="form-group <%= @store.prefers_password_protected? ? '' : 'd-none' %>" data-reveal-target="item">
+            <%= f.label :storefront_password, Spree.t(:password) %>
+            <%= f.text_field :storefront_password, class: 'form-control' %>
+          </div>
         </div>
       </div>
 

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

@@ -155,6 +155,6 @@
       </div>
     </div>
   </div>
-
-  <%= render "spree/admin/stores/form/custom", f: f %>
 </div>
+
+<%= render_admin_partials(:store_form_partials, f: f) %>

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

@@ -8,7 +8,7 @@
   </div>
 <% end %>
 
-<div class="card-lg">
+<div class="card-lg p-4">
   <h5 class="mb-3"><%= Spree.t(:terms_of_service) %></h5>
   <div class="row">
     <div class="col-lg-4">

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

@@ -3,10 +3,7 @@
     <%= turbo_frame_tag :dialog_modal_lg do %>
       <%= form_for @store, url: spree.admin_stores_path, data: { turbo_frame: '_top', controller: 'store-form enable-button' } do |f| %>
         <div class="modal-content">
-          <div class="modal-header">
-            <h5 class="modal-title" id="newStoreModalLabel"><%= Spree.t(:new_store) %></h5>
-            <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
-          </div>
+          <%= modal_header(Spree.t(:new_store)) %>
           <div class="modal-body">
             <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store } %>
             <div class="row">
@@ -27,6 +24,11 @@
                     <%= f.collection_select :default_country_iso, Spree::Country.order(:name), :iso, :name, { }, { data: { controller: 'autocomplete-select', enable_button_target: 'input', action: 'store-form#updateCurrency' } } %>
                   </div>
 
+                  <div class="form-group">
+                    <%= f.label :default_locale %>
+                    <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, current_store.default_locale || I18n.locale), { }, { data: { controller: 'autocomplete-select', enable_button_target: 'input', action: 'store-form#updateCurrency' } } %>
+                  </div>
+
                   <div class="form-group">
                     <%= f.label :default_currency, Spree.t(:currency) %>
                     <%= f.currency_select :default_currency, preferred_currencies, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
@@ -123,8 +125,8 @@
                 </div>
               </div>
             </div>
-            <div class="modal-footer justify-content-between">
-              <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+            <div class="modal-footer">
+              <%= modal_discard_button %>
               <%= turbo_save_button_tag Spree.t('actions.create') %>
             </div>
           </div>