spree_admin 5.3.5 → 5.4.0.beta

data/app/javascript/spree/admin/controllers/variants_form_controller.js

@@ -34,6 +34,7 @@ export default class extends CheckboxSelectAll {
     currentCurrency: String,
     currencies: Array,
     variantIds: Object,
+    variantPrefixIds: Object,
     currentStockLocationId: String,
     stockLocations: Array,
     optionValuesSelectOptions: Array,
@@ -522,12 +523,12 @@ export default class extends CheckboxSelectAll {
           const variantTarget = template.querySelector('[data-variants-form-target="variant"]')
           variantTarget.dataset.variantName = internalName
 
-          const variantId = this.variantIdsValue[internalName]
-          if (variantId) {
+          const variantPrefixId = this.variantPrefixIdsValue?.[internalName] || this.variantIdsValue[internalName]
+          if (variantPrefixId) {
             const variantEditButton = variantTarget.querySelector('[data-slot="variantEditButton"]')
 
             if (variantEditButton) {
-              variantEditButton.href = `${Spree.adminPath}/products/${this.productIdValue}/variants/${variantId}/edit`
+              variantEditButton.href = `${Spree.adminPath}/products/${this.productIdValue}/variants/${variantPrefixId}/edit`
               variantEditButton.classList.remove('invisible')
             }
           }

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

@@ -0,0 +1,51 @@
+<div class="card mb-6">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:details) %></h5>
+  </div>
+  <div class="card-body">
+    <dl class="space-y-4">
+      <div>
+        <dt class="text-sm text-gray-500"><%= Spree.t(:status) %></dt>
+        <dd class="mt-1"><%= api_key_status_badge(@api_key) %></dd>
+      </div>
+
+      <div>
+        <dt class="text-sm text-gray-500"><%= Spree.t(:type) %></dt>
+        <dd class="mt-1"><%= api_key_type_badge(@api_key) %></dd>
+      </div>
+
+      <div>
+        <dt class="text-sm text-gray-500"><%= Spree.t(:created_at) %></dt>
+        <dd class="mt-1"><%= l(@api_key.created_at, format: :long) %></dd>
+      </div>
+
+      <% if @api_key.created_by.present? %>
+        <div>
+          <dt class="text-sm text-gray-500"><%= Spree.t(:created_by) %></dt>
+          <dd class="mt-1"><%= @api_key.created_by.try(:email) || @api_key.created_by.to_s %></dd>
+        </div>
+      <% end %>
+
+      <% if @api_key.last_used_at.present? %>
+        <div>
+          <dt class="text-sm text-gray-500"><%= Spree.t('admin.api_keys.last_used_at') %></dt>
+          <dd class="mt-1"><%= l(@api_key.last_used_at, format: :long) %></dd>
+        </div>
+      <% end %>
+
+      <% if @api_key.revoked_at.present? %>
+        <div>
+          <dt class="text-sm text-gray-500"><%= Spree.t('admin.api_keys.revoked_at') %></dt>
+          <dd class="mt-1 text-red-600"><%= l(@api_key.revoked_at, format: :long) %></dd>
+        </div>
+
+        <% if @api_key.revoked_by.present? %>
+          <div>
+            <dt class="text-sm text-gray-500"><%= Spree.t('admin.api_keys.revoked_by') %></dt>
+            <dd class="mt-1"><%= @api_key.revoked_by.try(:email) || @api_key.revoked_by.to_s %></dd>
+          </div>
+        <% end %>
+      <% end %>
+    </dl>
+  </div>
+</div>

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

@@ -0,0 +1,26 @@
+<div class="card mb-6">
+  <div class="card-body">
+    <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?,
+          placeholder: Spree.t('admin.api_keys.name_placeholder') %>
+
+    <% if f.object.new_record? %>
+      <%= f.spree_select :key_type, api_key_type_options,
+            { prompt: Spree.t(:select_key_type), label: Spree.t(:type) },
+            { required: true } %>
+      <p class="text-sm text-gray-500 mt-2">
+        <strong><%= Spree.t('admin.api_keys.key_types.publishable') %>:</strong>
+        <%= Spree.t('admin.api_keys.key_type_descriptions.publishable') %>
+        <br>
+        <strong><%= Spree.t('admin.api_keys.key_types.secret') %>:</strong>
+        <%= Spree.t('admin.api_keys.key_type_descriptions.secret') %>
+      </p>
+    <% else %>
+      <div class="form-group">
+        <label class="form-label"><%= Spree.t(:type) %></label>
+        <div class="form-control-plaintext">
+          <%= api_key_type_badge(@api_key) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/api_keys/_token_card.html.erb

@@ -0,0 +1,28 @@
+<div class="card mb-6">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:api_key) %></h5>
+  </div>
+  <div class="card-body">
+    <% if @api_key.active? %>
+      <div data-controller="password-visibility" class="input-group gap-0 pr-1">
+        <input type="password" class="grow text-truncate" data-password-visibility-target="input" spellcheck="false" value="<%= @api_key.token %>" readonly>
+
+        <button type="button" class="btn hover:bg-gray-100 p-1 mr-1 rounded" data-action="password-visibility#toggle">
+          <span data-password-visibility-target="icon"><%= icon 'eye', class: 'mr-0' %></span>
+          <span data-password-visibility-target="icon" class="hidden"><%= icon 'eye-off', class: 'mr-0' %></span>
+        </button>
+
+        <%= clipboard_component(@api_key.token, 
+              button_class: 'btn hover:bg-gray-100 p-1 rounded', 
+              icon_class: 'mr-0') %>
+      </div>
+    <% else %>
+      <div class="bg-red-50 border border-red-200 rounded-md p-4">
+        <div class="flex items-center">
+          <%= icon 'alert-triangle', class: 'text-red-500 mr-2' %>
+          <span class="text-red-700"><%= Spree.t('admin.api_keys.key_revoked_message') %></span>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/api_keys/_usage_info.html.erb

@@ -0,0 +1,16 @@
+<div class="card mb-6">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t('admin.api_keys.usage') %></h5>
+  </div>
+  <div class="card-body">
+    <p class="text-sm text-gray-600 mb-4">
+      <%= Spree.t("admin.api_keys.usage_instructions.#{@api_key.key_type}") %>
+    </p>
+
+    <h6 class="font-medium text-sm mb-2"><%= Spree.t('admin.api_keys.example_request') %></h6>
+    <div class="bg-gray-900 rounded-md p-4 overflow-x-auto">
+      <pre class="text-green-400 text-sm font-mono whitespace-pre-wrap"><code>curl -X GET "https://your-store.com/api/v3/store/products" \
+  -H "X-Spree-Api-Key: <%= @api_key.token %>"</code></pre>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,9 @@
+<%= render 'spree/admin/shared/developers_nav' %>
+
+<%= content_for(:title, Spree.t(:api_keys)) %>
+
+<% content_for :page_actions do %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_api_key), new_object_url, class: "btn btn-primary" if can? :create, Spree::ApiKey %>
+<% end %>
+
+<%= render_table @collection, :api_keys %>

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

@@ -0,0 +1,26 @@
+<%= content_for :page_title do %>
+  <%= page_header_back_button(collection_url) %>
+  <%= @api_key.name %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <% if @api_key.active? && can?(:update, @api_key) %>
+    <%= link_to Spree.t(:edit), edit_object_url(@api_key), class: 'btn btn-light' %>
+    <%= button_to Spree.t('admin.api_keys.revoke'),
+          spree.revoke_admin_api_key_path(@api_key),
+          method: :put,
+          class: 'btn btn-danger',
+          data: { confirm: Spree.t('admin.api_keys.revoke_confirmation') } %>
+  <% end %>
+<% end %>
+
+<div class="grid grid-cols-12 gap-6">
+  <div class="col-span-12 lg:col-span-8">
+    <%= render 'token_card' %>
+    <%= render 'usage_info' %>
+  </div>
+
+  <div class="col-span-12 lg:col-span-4">
+    <%= render 'details' %>
+  </div>
+</div>

data/app/views/spree/admin/classifications/_classification.html.erb

@@ -1,4 +1,4 @@
-<div class="grid grid-cols-12 gap-6 mx-0 hover:bg-gray-25 rounded" id="<%= spree_dom_id(classification) %>" data-sortable-update-url="<%= spree.admin_taxon_classification_path(classification.taxon_id, classification, format: :turbo_stream) %>">
+<div class="grid grid-cols-12 gap-6 mx-0 hover:bg-gray-25 rounded" id="<%= spree_dom_id(classification) %>" data-sortable-update-url="<%= spree.admin_taxon_classification_path(classification.taxon, classification, format: :turbo_stream) %>">
   <% if classification.taxon.manual_sort_order? %>
     <div class="col-span-1 text-center self-center">
       <span class="rounded-md p-2 hover:bg-gray-100 move-handle cursor-grab">
@@ -31,7 +31,7 @@
   </div>
 
   <div class="col-span-2 text-center self-center">
-    <%= button_to spree.admin_taxon_classification_path(classification.taxon_id, classification), class: 'btn btn-danger btn-sm', method: :delete, data: { controller: 'tooltip', turbo_confirm: Spree.t(:are_you_sure) } do %>
+    <%= button_to spree.admin_taxon_classification_path(classification.taxon, classification), class: 'btn btn-danger btn-sm', method: :delete, data: { controller: 'tooltip', turbo_confirm: Spree.t(:are_you_sure) } do %>
       <%= icon 'trash', class: 'mr-0', style: 'pointer-events: none' %>
       <%= tooltip(Spree.t('actions.destroy')) %>
     <% end if classification.taxon.manual? && can?(:delete, classification) %>

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

@@ -14,7 +14,7 @@
     </p>
     <p class="text-center">
       <% if can?(:create, Spree::Classification) && @taxon.manual? %>
-        <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon.id), class: 'btn btn-secondary', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+        <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon), class: 'btn btn-secondary', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
       <% end %>
   <% end %>
 <% end %>

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

@@ -1 +1 @@
-<%= render 'spree/admin/shared/multi_product_picker', parent: @parent, url: spree.admin_taxon_classifications_path(@parent.id) %>
+<%= render 'spree/admin/shared/multi_product_picker', parent: @parent, url: spree.admin_taxon_classifications_path(@parent) %>

data/app/views/spree/admin/exports/create.turbo_stream.erb

@@ -1,5 +1,5 @@
 <%= turbo_render_alerts %>
 
 <%= turbo_stream.replace 'export-dialog' do %>
-  <%= render 'spree/admin/shared/export_modal', export_type: @object.type %>
+  <%= render 'spree/admin/shared/export_modal', export_type: @export.type %>
 <% end %>

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

@@ -1,15 +1,15 @@
 <%= turbo_frame_tag :export_dialog do %>
-  <%= form_for @object, url: spree.admin_exports_path, as: :export do |f| %>
+  <%= form_for @export, url: spree.admin_exports_path do |f| %>
     <%= f.hidden_field :type %>
     <%= f.hidden_field :search_params %>
     <div class="dialog-header">
       <h5 class="dialog-title">
-        <%= Spree.t(:export) + ' ' + plural_resource_name(@object.model_class) %>
+        <%= Spree.t(:export) + ' ' + plural_resource_name(@export.model_class) %>
       </h5>
       <button type="button" class="btn-close" data-action="click->export-dialog#close" aria-label="Close"></button>
     </div>
     <div class="dialog-body">
-      <%= render 'spree/admin/shared/error_messages', target: @object %>
+      <%= render 'spree/admin/shared/error_messages', target: @export %>
       <div class="custom-control custom-radio hover:bg-gray-50 rounded-lg p-3">
         <%= f.radio_button :record_selection, 'filtered', class: 'custom-control-input' %>
         <%= f.label :record_selection, for: :export_record_selection_filtered, class: 'custom-control-label flex-col items-start' do %>

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

@@ -3,15 +3,15 @@
   <div class="drawer-body" data-controller="highlight tabs">
     <ul class="nav nav-pills mb-3">
       <li class="nav-item">
-        <a class="nav-link active" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('apis.storefront') %></a>
+        <a class="nav-link active" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('apis.store') %></a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('apis.platform') %></a>
+        <a class="nav-link" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('apis.admin') %></a>
       </li>
     </ul>
     <div data-tabs-target="panel" class="animate-fade-in">
-      <% if storefront_serializer_exists?(@object) %>
-        <%= code_block serialize_to_json(@object, api_type: :storefront), style: 'height: calc(100dvh - 11rem);' %>
+      <% if store_serializer_exists?(@object) %>
+        <%= code_block serialize_to_json(@object, api_type: :store), style: 'height: calc(100dvh - 11rem);' %>
       <% else %>
         <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col">
           <%= icon 'map-search', class: 'mb-12 opacity-50 text-4xl' %>
@@ -22,8 +22,8 @@
       <% end %>
     </div>
     <div data-tabs-target="panel" class="animate-fade-in" hidden>
-      <% if platform_serializer_exists?(@object) %>
-        <%= code_block serialize_to_json(@object, api_type: :platform), style: 'height: calc(100dvh - 11rem);' %>
+      <% if admin_serializer_exists?(@object) %>
+        <%= code_block serialize_to_json(@object, api_type: :admin), style: 'height: calc(100dvh - 11rem);' %>
       <% else %>
         <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col">
           <%= icon 'map-search', class: 'mb-12 opacity-50 text-4xl' %>

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

@@ -0,0 +1,28 @@
+<div class="card mb-6">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:general_settings) %>
+    </h5>
+  </div>
+
+  <div class="card-body">
+    <%= f.spree_text_field :name, required: true %>
+
+    <%= f.spree_select :country_ids, @countries.map { |country| ["#{Spree::Country.iso_to_emoji_flag(country.iso)} #{country.name}", country.id] }, { include_blank: false, label: Spree.t(:default_country), autocomplete: true, multiple: true } %>
+
+    <%= f.spree_select :currency, currency_options(f.object.currency), { label: Spree.t(:currency), required: true, autocomplete: true } %>
+
+    <%= f.spree_select :default_locale,
+          options_from_collection_for_select(all_locales_options, :last, :first, f.object.default_locale || I18n.locale),
+          { required: true, autocomplete: true } %>
+
+    <%= f.spree_select :supported_locales,
+          options_from_collection_for_select(all_locales_options, :last, :first, f.object.supported_locales&.split(',')),
+          { multiple: true, autocomplete: true, hint: Spree.t('admin.markets.supported_locales_hint') } %>
+
+    <hr class="my-6">
+
+    <%= f.spree_check_box :tax_inclusive %>
+    <%= f.spree_check_box :default %>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -0,0 +1,9 @@
+<%= content_for :page_title do %>
+  <%= Spree.t('admin.markets.list') %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= link_to_with_icon 'plus', Spree.t('admin.markets.new'), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::Market) %>
+<% end %>
+
+<%= render_table @collection, :markets %>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/new_resource' %>

data/app/views/spree/admin/orders/billing_address/_form.html.erb

@@ -9,8 +9,8 @@
 <% if @order.user.present? && @order.user.addresses.many? %>
   <div data-form="existing_address" class="hidden">
     <%= label_tag :billing_address_id, Spree.t(:existing_address), class: 'sr-only' %>
-    <%= select_tag :billing_address_id, 
-                   options_for_select(@order.user.addresses.map { |a| [a.to_s.gsub('<br/>', ", "), a.id]}), 
+    <%= select_tag :billing_address_id,
+                   options_for_select(@order.user.addresses.map { |a| [a.to_s.gsub('<br/>', ", "), a.to_param]}),
                    { include_blank: Spree.t(:select_existing_address), class: "form-select", data: { action: 'auto-submit#submit' } } %>
   </div>
 <% end %>

data/app/views/spree/admin/orders/shipping_address/_form.html.erb

@@ -8,8 +8,8 @@
   <div>
     <div class="w-full text-center mb-2"><%= Spree.t(:or_select_other_address) %></div>
     <%= label_tag :shipping_address_id, Spree.t(:existing_address), class: 'sr-only' %>
-    <%= select_tag :shipping_address_id, 
-                   options_for_select(@order.user.addresses.map { |a| [a.to_s.gsub('<br/>', ", "), a.id]}), 
+    <%= select_tag :shipping_address_id,
+                   options_for_select(@order.user.addresses.map { |a| [a.to_s.gsub('<br/>', ", "), a.to_param]}),
                    { include_blank: Spree.t(:select_existing_address), class: "form-select", data: { action: 'auto-submit#submit' } } %>
   </div>
 <% end %>

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

@@ -24,18 +24,6 @@
   <div class="card-body">
     <%= f.spree_text_field :name, help: 'This name will be used to identify the payment method on the storefront' %>
 
-    <% if can?(:manage, Spree::Store) && available_stores.count > 1 %>
-      <div class="form-group">
-        <%= label_tag :payment_method_stores, Spree.t(:stores) %>
-        <%= f.collection_check_boxes :store_ids, available_stores, :id, :name do |b| %>
-          <div class="custom-control form-checkbox mb-1">
-            <%= b.check_box(class: 'custom-control-input') %>
-            <%= b.label(class: 'custom-control-label') %>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
-
     <%= f.spree_select :display_on, display_on_options, { label: Spree.t(:display) } %>
     <%= f.spree_select :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], { label: Spree.t(:auto_capture) } %>
 

data/app/views/spree/admin/price_rules/forms/_market_rule.html.erb

@@ -0,0 +1,7 @@
+<div class="form-group">
+  <%= f.label :preferred_market_ids, Spree.t(:markets) %>
+  <%= f.select :preferred_market_ids,
+              current_store.markets.order(:name).pluck(:name, :id),
+              { selected: f.object.preferred_market_ids },
+              { multiple: true, data: { controller: 'autocomplete-select' } } %>
+</div>

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

@@ -16,7 +16,6 @@
     <%= render 'spree/admin/products/form/categorization', f: f %>
     <%= render 'spree/admin/products/form/shipping', f: f %>
     <%= render 'spree/admin/products/form/tax', f: f %>
-    <%= render 'spree/admin/products/form/stores', f: f if available_stores.count > 1 %>
     <%= render_admin_partials(:product_form_sidebar_partials, f: f, product: @product) %>
 
     <%= render 'spree/admin/shared/seo',

data/app/views/spree/admin/products/form/_variants.html.erb

@@ -3,7 +3,7 @@
     <div class="card-header">
       <h5 class="card-title"><%= Spree.t(:variants) %></h5>
     </div>
-    <% option_types_for_select = @option_types.pluck(:presentation, :id) %>
+    <% option_types_for_select = @option_types.map { |ot| [ot.presentation, ot.prefixed_id] } %>
     <div class="card-body p-0">
       <div
         data-controller="variants-form"
@@ -21,13 +21,14 @@
         <% if @product_stock.present? %> data-variants-form-stock-value="<%= @product_stock.to_json %>" <% end %>
         <% if @product_prices.present? %> data-variants-form-prices-value="<%= @product_prices.to_json %>" <% end %>
         <% if @product_variant_ids.present? %> data-variants-form-variant-ids-value="<%= @product_variant_ids.to_json %>" <% end %>
+        <% if @product_variant_prefix_ids.present? %> data-variants-form-variant-prefix-ids-value="<%= @product_variant_prefix_ids.to_json %>" <% end %>
         >
         <div class="options-creator">
           <%= render 'spree/admin/products/form/variants/option_template', option_types_for_select: option_types_for_select %>
           <div data-variants-form-target="optionsContainer" class="options-creator__options_container">
             <% @product.product_option_types.includes(:option_type).reorder('spree_product_option_types.position').each do |product_option_type| %>
               <% option_type = product_option_type.option_type %>
-              <div class="options-creator__option" data-variants-form-target="option" id="option-<%= option_type.id %>">
+              <div class="options-creator__option" data-variants-form-target="option" id="option-<%= option_type.prefixed_id %>">
                 <% if can?(:manage_option_types, @product) %>
                   <button class="draggable" type="button">
                     <i class="ti ti-grip-vertical"></i>
@@ -37,7 +38,7 @@
                   <div class="flex justify-between items-center">
                     <h6 data-slot="optionName"><%= option_type.presentation %></h6>
                     <% if can?(:manage_option_types, @product) %>
-                      <button class="btn btn-light btn-sm" type="button" data-action="variants-form#editOption" data-variants-form-option-id-param="<%= option_type.id %>"><%= Spree.t(:edit) %></button>
+                      <button class="btn btn-light btn-sm" type="button" data-action="variants-form#editOption" data-variants-form-option-id-param="<%= option_type.prefixed_id %>"><%= Spree.t(:edit) %></button>
                     <% end %>
                   </div>
                   <div data-slot="optionValuesContainer">

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

@@ -2,6 +2,6 @@
   <%= f.label :preferred_country_iso, Spree.t(:country) %>
   <%= f.select :preferred_country_iso,
     available_countries_iso.map { |iso| [Spree.t(iso, scope: 'country_names', default: iso), iso] },
-    { selected: f.object.preferred_country_iso || current_store.default_country_iso },
+    { selected: f.object.preferred_country_iso || current_store.default_market&.default_country&.iso },
     { data: { controller: 'autocomplete-select' } } %>
 </div>

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

@@ -52,7 +52,7 @@
                 </div>
               <% end %>
               <div data-controller="clipboard" data-clipboard-success-content-value='<%= icon('check') + ' ' + Spree.t(:copied) %>'>
-                <%= hidden_field_tag :record_id, record.id, data: { clipboard_target: 'source' } %>
+                <%= hidden_field_tag :record_id, record.respond_to?(:prefixed_id) ? record.prefixed_id : record.id, data: { clipboard_target: 'source' } %>
                 <button data-action="clipboard#copy" class="text-left dropdown-item" data-clipboard-target="button">
                   <%= icon 'copy' %>
                   <%= Spree.t(:copy_id) %>

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

@@ -15,39 +15,6 @@
         <%= icon 'tools' %>
         <%= Spree.t('admin.edit_theme') %>
       <% end if current_store.respond_to?(:default_theme) && current_store.default_theme && can?(:manage, Spree::Theme) %>
-
-      <% if available_stores.count > 1 %>
-        <div class="dropdown-divider"></div>
-        <h6 class="dropdown-header">
-          <%= Spree.t(:switch_store) %>
-        </h6>
-        <div class="store-chooser">
-          <% available_stores.each do |store| %>
-            <% if store.id == current_store.id %>
-              <div class="store-chooser-item active">
-                <%= store_admin_icon(store, height: 32, width: 32) %>
-                <span class="flex flex-col mr-2">
-                  <%= store.name %>
-                  <small class="text-gray-600">
-                    <%= store.url_or_custom_domain %>
-                  </small>
-                </span>
-                <%= icon('check', class: 'ml-auto') %>
-              </div>
-            <% else %>
-              <%= link_to spree.admin_dashboard_url(host: store.url), class: 'store-chooser-item' do %>
-                <%= store_admin_icon(store, height: 32, width: 32) %>
-                <span class="flex flex-col">
-                  <%= store.name %>
-                  <small class="text-gray-600">
-                    <%= store.url_or_custom_domain %>
-                  </small>
-                </span>
-              <% end %>
-            <% end %>
-          <% end %>
-        </div>
-      <% end %>
     <% end %>
   <% end %>
 

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

@@ -15,7 +15,7 @@
     <%= nav_item(Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), icon: 'shopping-cart', active: params[:section] == 'checkout') if can?(:manage, current_store) %>
     <%= render_admin_partials(:store_settings_nav_partials) %>
 
-    <% if can?(:manage, Spree::CustomDomain) %>
+    <% if defined?(Spree::CustomDomain) && can?(:manage, Spree::CustomDomain) %>
       <%= nav_item(Spree.t(:domains), spree.admin_custom_domains_path, icon: 'world-www') %>
     <% end %>
 
@@ -65,7 +65,7 @@
       <% end %>
     <% end %>
 
-    <% if can?(:manage, Spree::OauthApplication) %>
+    <% if defined?(Spree::OauthApplication) && can?(:manage, Spree::OauthApplication) %>
       <%= nav_item(Spree.t(:developers), spree.admin_oauth_applications_path, icon: 'terminal', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %>
     <% end %>
 

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

@@ -27,7 +27,7 @@
   </div>
 
   <div class="flex items-center px-3 ml-3 gap-2">
-    <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link, turbo_frame: '_top' }) if can?(:edit, taxon) %>
+    <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon), data: { row_link_target: :link, turbo_frame: '_top' }) if can?(:edit, taxon) %>
 
     <%= dropdown class: 'h-full' do %>
       <%= dropdown_toggle class: 'btn-sm btn-light px-1 h-full' do %>
@@ -38,7 +38,7 @@
           <%= link_to_with_icon 'plus', Spree.t(:new_nested_taxon), spree.new_admin_taxonomy_taxon_path(taxonomy, taxon: { parent_id: taxon.id }), class: 'dropdown-item' %>
           <div class="dropdown-divider"></div>
         <% end %>
-        <%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id), class: 'dropdown-item text-red-600 hover:bg-red-100') if can?(:destroy, taxon) %>
+        <%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon), class: 'dropdown-item text-red-600 hover:bg-red-100') if can?(:destroy, taxon) %>
       <% end %>
     <% end %>
   </div>

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

@@ -22,11 +22,11 @@
     <h5 class="card-title"><%= Spree.t(:currencies) %> & <%= Spree.t(:translations) %></h5>
   </div>
   <div class="card-body">
-    <%= f.spree_select :default_currency, currency_options(@store.default_currency), { label: Spree.t(:default_currency), autocomplete: true } %>
-    <%= f.spree_select :supported_currencies, currency_options(@store.supported_currencies&.split(',')), { prompt: false, multiple: true, autocomplete: true } %>
-    <hr class="my-6" />
-    <%= f.spree_select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale || I18n.locale), { autocomplete: true } %>
-    <%= f.spree_select :supported_locales, options_from_collection_for_select(all_locales_options, :last, :first, @store.supported_locales&.split(',')), { multiple: true, autocomplete: true } %>
+    <div class="alert alert-info w-full mb-0">
+      <span>
+        Currencies and locales are now managed by <%= link_to 'Markets', spree.admin_markets_path %>.
+      </span>
+    </div>
   </div>
 </div>
 
@@ -35,9 +35,12 @@
     <h5 class="card-title"><%= Spree.t(:standards_and_formats) %></h5>
   </div>
   <div class="card-body">
-    <p class="text-gray-600">
+    <p class="text-gray-600 mb-3">
       <%= Spree.t(:standards_and_formats_help) %>
     </p>
+    <%= f.spree_select :preferred_admin_locale,
+        options_from_collection_for_select(all_locales_options, :last, :first, @store.preferred_admin_locale || I18n.default_locale),
+        { label: Spree.t(:admin_locale), help_bubble: Spree.t(:admin_locale_help), autocomplete: true } %>
     <div class="form-group mb-6">
       <%= label_tag :preferred_timezone, raw(Spree.t(:timezone) + required_span_tag) %>
       <%= time_zone_select :store, :preferred_timezone, nil, {}, { data: { controller: 'autocomplete-select' } } %>
@@ -73,7 +76,7 @@
         <%= f.spree_number_field :preferred_digital_asset_authorized_days, min: 1 %>
       </div>
     </div>
-    <hr class="my-6" />
+    <hr class="my-6">
     <div data-controller="reveal">
       <%= f.spree_check_box :preferred_limit_digital_download_count, data: { action: 'reveal#toggle' } %>
       <div data-reveal-target="item" <% unless f.object.preferred_limit_digital_download_count %>class="hidden"<% end %>>

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

@@ -8,15 +8,12 @@
   </div>
 
   <div class="card-body">
-    <%= f.spree_select :checkout_zone_id, options_for_select(@zones, @store.checkout_zone_id), { label: Spree.t(:shipping_zone), autocomplete: true } %>
-    <span class="form-text mb-4">
-      <%= Spree.t(:shipping_zone_help) %>
-      <%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %>
-    </span>
+    <p class="text-muted mb-4">
+      <%= Spree.t('admin.checkout_settings.countries_managed_by_markets_html',
+            link: link_to(Spree.t('admin.markets.list'), spree.admin_markets_path)).html_safe %>
+    </p>
 
-    <%= f.spree_select :default_country_iso, Spree::Country.pluck(:name, :iso), { include_blank: false, label: Spree.t(:default_country), autocomplete: true, help: Spree.t(:default_country_help) } %>
-
-    <hr class="my-6" />
+    <hr class="my-6">
 
     <%= f.spree_check_box :preferred_guest_checkout, label: Spree.t('admin.checkout_settings.guest_checkout.label'), help: Spree.t('admin.checkout_settings.guest_checkout.description') %>
     <%= f.spree_check_box :preferred_company_field_enabled, label: Spree.t('admin.store_form.company_field.label'), help: Spree.t('admin.store_form.company_field.description') %>

data/app/views/spree/admin/tables/columns/_api_key_status.html.erb

@@ -0,0 +1,2 @@
+<%# locals: (record:, column:, value:) %>
+<%= api_key_status_badge(record) %>

data/app/views/spree/admin/tables/columns/_api_key_type.html.erb

@@ -0,0 +1,2 @@
+<%# locals: (record:, column:, value:) %>
+<%= api_key_type_badge(record) %>

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

@@ -8,7 +8,7 @@
 <% end if can?(:create, Spree::Taxon) %>
 
 <% content_for :page_actions_dropdown do %>
-  <%= link_to_edit(@taxonomy.root, url: spree.edit_admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root.id), class: 'text-left dropdown-item') %>
+  <%= link_to_edit(@taxonomy.root, url: spree.edit_admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root), class: 'text-left dropdown-item') %>
 <% end if can?(:edit, @taxonomy) %>
 
 <div id="sortableTreeArea">

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

@@ -54,7 +54,7 @@
           </h5>
 
           <% if @taxon.manual? && can?(:create, Spree::Classification) %>
-            <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon.id), class: 'btn btn-secondary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+            <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon), class: 'btn btn-secondary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
           <% end %>
         </div>
 
@@ -67,7 +67,7 @@
 
         <div class="card-body min-h-[300px] p-0">
           <div class="block overflow-y-auto overflow-x-hidden max-h-[300px]">
-            <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon.id), loading: :lazy do %>
+            <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon), loading: :lazy do %>
               <%= render 'spree/admin/shared/spinner' %>
             <% end %>
           </div>