spree_admin 5.3.3 → 5.4.0.beta

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

@@ -79,21 +79,16 @@ export default class extends Controller {
     this.boundHandleBeforeUnload = this.handleBeforeUnload.bind(this)
     this.boundHandleMouseUp = this.handleMouseUp.bind(this)
     this.boundHandleMouseMove = this.handleMouseMove.bind(this)
-    this.boundNormalizeBeforeSubmit = this.normalizeBeforeSubmit.bind(this)
 
     window.addEventListener('beforeunload', this.boundHandleBeforeUnload)
     document.addEventListener('mouseup', this.boundHandleMouseUp)
     document.addEventListener('mousemove', this.boundHandleMouseMove)
-
-    // Listen for form submission to normalize values
-    this.element.addEventListener('submit', this.boundNormalizeBeforeSubmit)
   }
 
   disconnect() {
     window.removeEventListener('beforeunload', this.boundHandleBeforeUnload)
     document.removeEventListener('mouseup', this.boundHandleMouseUp)
     document.removeEventListener('mousemove', this.boundHandleMouseMove)
-    this.element.removeEventListener('submit', this.boundNormalizeBeforeSubmit)
   }
 
   // ==================== Fill Handle ====================
@@ -783,85 +778,4 @@ export default class extends Controller {
     return this.dirtyInputs.size > 0
   }
 
-  // ==================== Locale-aware Number Handling ====================
-
-  /**
-   * Normalizes a locale-formatted number string to standard decimal format
-   * e.g., "1.234,56" (German) -> "1234.56"
-   * e.g., "1,234.56" (English) -> "1234.56"
-   * @param {string} value - The locale-formatted number string
-   * @returns {string} The normalized number string with "." as decimal separator
-   */
-  normalizeNumber(value) {
-    if (value === null || value === undefined) return ''
-
-    let stringValue = String(value).trim()
-    if (stringValue === '') return ''
-
-    // Detect the decimal separator by finding the last separator character
-    // This handles both "1,234.56" (en) and "1.234,56" (de/pl) formats
-    const lastComma = stringValue.lastIndexOf(',')
-    const lastDot = stringValue.lastIndexOf('.')
-
-    let decimalSeparator = '.'
-    let thousandsSeparator = ','
-
-    // If comma comes after dot, comma is the decimal separator (European format)
-    // Also treat comma as decimal if there's no dot and comma has 1-2 digits after it
-    if (lastComma > lastDot) {
-      decimalSeparator = ','
-      thousandsSeparator = '.'
-    } else if (lastDot === -1 && lastComma !== -1) {
-      // No dot present, check if comma looks like a decimal separator
-      // (has 1-3 digits after it, typical for currency)
-      const afterComma = stringValue.substring(lastComma + 1)
-      if (/^\d{1,3}$/.test(afterComma)) {
-        decimalSeparator = ','
-        thousandsSeparator = '.'
-      }
-    }
-
-    // Remove thousands separators
-    stringValue = stringValue.split(thousandsSeparator).join('')
-
-    // Replace decimal separator with standard "."
-    if (decimalSeparator !== '.') {
-      stringValue = stringValue.replace(decimalSeparator, '.')
-    }
-
-    // Remove any non-numeric characters except "." and "-"
-    stringValue = stringValue.replace(/[^0-9.\-]/g, '')
-
-    return stringValue
-  }
-
-  /**
-   * Formats a number for display using the configured locale
-   * @param {number|string} value - The number to format
-   * @returns {string} The formatted number string
-   */
-  formatNumber(value) {
-    if (value === null || value === undefined || value === '') return ''
-
-    const number = parseFloat(value)
-    if (!Number.isFinite(number)) return ''
-
-    return number.toLocaleString(this.localeValue, {
-      minimumFractionDigits: 2,
-      maximumFractionDigits: 2,
-      useGrouping: false
-    })
-  }
-
-  /**
-   * Normalizes all cell values before form submission
-   * @param {Event} event - The form submit event
-   */
-  normalizeBeforeSubmit(event) {
-    this.cellTargets.forEach((cell) => {
-      if (cell.value) {
-        cell.value = this.normalizeNumber(cell.value)
-      }
-    })
-  }
 }

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

@@ -4,11 +4,10 @@ import { Controller } from '@hotwired/stimulus'
  * MoneyFieldController
  *
  * A Stimulus controller for locale-aware money/price input fields.
- * Handles formatting for display and normalizing values before form submission.
+ * Handles formatting values for display in the user's locale format.
  *
  * Features:
  * - Displays amounts in the user's locale format (e.g., "1.234,56" for German, "1,234.56" for English)
- * - Normalizes values to standard decimal format (with "." as decimal separator) before form submission
  * - Supports optional currency symbol display
  *
  * Usage:
@@ -32,23 +31,10 @@ export default class extends Controller {
   }
 
   connect() {
-    this.form = this.element.closest('form')
-
-    if (this.form) {
-      this.boundNormalizeBeforeSubmit = this.normalizeBeforeSubmit.bind(this)
-      this.form.addEventListener('submit', this.boundNormalizeBeforeSubmit)
-    }
-
     // Format the initial value for display
     this.formatForDisplay()
   }
 
-  disconnect() {
-    if (this.form && this.boundNormalizeBeforeSubmit) {
-      this.form.removeEventListener('submit', this.boundNormalizeBeforeSubmit)
-    }
-  }
-
   /**
    * Called on blur to format the value for display
    */
@@ -139,12 +125,4 @@ export default class extends Controller {
     return stringValue
   }
 
-  /**
-   * Normalizes the value before form submission
-   * @param {Event} event - The form submit event
-   */
-  normalizeBeforeSubmit(event) {
-    const normalizedValue = this.normalizeValue(this.element.value)
-    this.element.value = normalizedValue
-  }
 }

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

@@ -106,6 +106,10 @@ export default class extends Controller {
     if (this.multipleValue) {
       settings.maxItems = null
       settings.plugins = ['remove_button']
+      settings.onItemAdd = function() {
+        this.setTextboxValue('')
+        this.refreshOptions(false)
+      }
       if (this.activeOptionValue) settings.items = JSON.parse(this.activeOptionValue)
     } else {
       if (this.activeOptionValue) settings.items = [this.activeOptionValue]

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

@@ -33,8 +33,8 @@ export default class extends CheckboxSelectAll {
     prices: Object,
     currentCurrency: String,
     currencies: Array,
-    currencyFormats: Object,
     variantIds: Object,
+    variantPrefixIds: Object,
     currentStockLocationId: String,
     stockLocations: Array,
     optionValuesSelectOptions: Array,
@@ -71,19 +71,6 @@ export default class extends CheckboxSelectAll {
     }
 
     this.inventoryFormTarget = document.querySelector('.inventory-form');
-
-    // Add form submit listener to normalize price inputs before submission
-    this.form = this.element.closest('form')
-    if (this.form) {
-      this.boundNormalizePricesBeforeSubmit = this.normalizePricesBeforeSubmit.bind(this)
-      this.form.addEventListener('submit', this.boundNormalizePricesBeforeSubmit)
-    }
-  }
-
-  disconnect() {
-    if (this.form && this.boundNormalizePricesBeforeSubmit) {
-      this.form.removeEventListener('submit', this.boundNormalizePricesBeforeSubmit)
-    }
   }
 
   toggleQuantityTracked() {
@@ -387,6 +374,16 @@ export default class extends CheckboxSelectAll {
     }
   }
 
+  formatPrice(event) {
+    const value = event.target.value
+    if (value === '' || value === null) return
+
+    const number = this.parseLocaleNumber(value)
+    if (!Number.isFinite(number)) return
+
+    event.target.value = this.formatNumber(number)
+  }
+
   replaceBlankWithZero(event) {
     if (event.target.value === '') {
       event.target.value = 0
@@ -526,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')
             }
           }
@@ -1100,13 +1097,13 @@ export default class extends CheckboxSelectAll {
     if (existingPrice) {
       return {
         ...existingPrice,
-        amount: existingPrice.amount ? parseFloat(existingPrice.amount) : existingPrice.amount
+        amount: existingPrice.amount ? this.parseLocaleNumber(existingPrice.amount) : existingPrice.amount
       }
     } else {
       const parentName = variantName.split('/')[0]
       const parentPrices = Object.entries(this.pricesValue)
         .filter(([internalName, prices]) => internalName.startsWith(parentName) && prices[currency.toLowerCase()] !== undefined)
-        .map(([_key, prices]) => parseFloat(prices[currency.toLowerCase()].amount))
+        .map(([_key, prices]) => this.parseLocaleNumber(prices[currency.toLowerCase()].amount))
         .sort((priceAmountA, priceAmountB) => priceAmountA - priceAmountB)
 
       return {
@@ -1124,7 +1121,7 @@ export default class extends CheckboxSelectAll {
         ...this.pricesValue[variantName],
         [currency.toLowerCase()]: {
           ...existingPrice,
-          amount: parseFloat(newPrice)
+          amount: this.parseLocaleNumber(newPrice)
         }
       }
     }
@@ -1148,23 +1145,13 @@ export default class extends CheckboxSelectAll {
     }
   }
 
-  formatNumber(value, currency = null) {
+  formatNumber(value) {
     if (value === null) return ''
     if (typeof value === 'string' && value.trim() === '') return ''
 
     const number = Number(value)
     if (!Number.isFinite(number)) return ''
 
-    // Use currency-specific decimal mark if available
-    const currencyCode = currency || this.currentCurrencyValue
-    const currencyFormat = this.currencyFormatsValue?.[currencyCode]
-
-    if (currencyFormat?.decimal_mark) {
-      // Format with 2 decimal places and replace . with currency's decimal mark
-      return number.toFixed(2).replace('.', currencyFormat.decimal_mark)
-    }
-
-    // Fallback to locale-based formatting
     return number.toLocaleString(this.localeValue, {
       minimumFractionDigits: 2,
       maximumFractionDigits: 2,
@@ -1172,70 +1159,22 @@ export default class extends CheckboxSelectAll {
     })
   }
 
-  /**
-   * Normalizes a locale-formatted number string to standard decimal format
-   * e.g., "1.234,56" (German) -> "1234.56"
-   * e.g., "30,99" (Polish) -> "30.99"
-   * @param {string} value - The locale-formatted number string
-   * @returns {string} The normalized number string with "." as decimal separator
-   */
-  normalizeNumber(value) {
-    if (value === null || value === undefined) return ''
-
-    let stringValue = String(value).trim()
-    if (stringValue === '') return ''
-
-    // Detect the decimal separator by finding the last separator character
-    // This handles both "1,234.56" (en) and "1.234,56" (de/pl) formats
-    const lastComma = stringValue.lastIndexOf(',')
-    const lastDot = stringValue.lastIndexOf('.')
-
-    let decimalSeparator = '.'
-    let thousandsSeparator = ','
-
-    // If comma comes after dot, comma is the decimal separator (European format)
-    // Also treat comma as decimal if there's no dot and comma has 1-3 digits after it
-    if (lastComma > lastDot) {
-      decimalSeparator = ','
-      thousandsSeparator = '.'
-    } else if (lastDot === -1 && lastComma !== -1) {
-      // No dot present, check if comma looks like a decimal separator
-      // (has 1-3 digits after it, typical for currency)
-      const afterComma = stringValue.substring(lastComma + 1)
-      if (/^\d{1,3}$/.test(afterComma)) {
-        decimalSeparator = ','
-        thousandsSeparator = '.'
-      }
-    }
+  parseLocaleNumber(value) {
+    if (value === null || value === undefined) return NaN
 
-    // Remove thousands separators
-    stringValue = stringValue.split(thousandsSeparator).join('')
+    let str = String(value).trim()
+    if (str === '') return NaN
 
-    // Replace decimal separator with standard "."
-    if (decimalSeparator !== '.') {
-      stringValue = stringValue.replace(decimalSeparator, '.')
-    }
+    const lastComma = str.lastIndexOf(',')
+    const lastDot = str.lastIndexOf('.')
 
-    // Remove any non-numeric characters except "." and "-"
-    stringValue = stringValue.replace(/[^0-9.\-]/g, '')
+    if (lastComma > lastDot) {
+      str = str.replace(/\./g, '').replace(',', '.')
+    } else if (lastDot === -1 && lastComma !== -1 && /^\d{1,3}$/.test(str.substring(lastComma + 1))) {
+      str = str.replace(',', '.')
+    }
 
-    return stringValue
+    return parseFloat(str)
   }
 
-  /**
-   * Normalizes all price inputs in the variants form before submission
-   * @param {Event} event - The form submit event
-   */
-  normalizePricesBeforeSubmit(event) {
-    // Find all price inputs in the variants container
-    const priceInputs = this.variantsContainerTarget.querySelectorAll(
-      'input[data-slot*="[prices_attributes]"][data-slot*="[amount]_input"]'
-    )
-
-    priceInputs.forEach((input) => {
-      if (input.value) {
-        input.value = this.normalizeNumber(input.value)
-      }
-    })
-  }
 }

data/app/models/spree/admin/table/column.rb

@@ -42,7 +42,7 @@ module Spree
         attribute :ransack_attribute, :string
         attribute :operators, default: -> { [] }
         attribute :value_options
-        attribute :search_url, :string
+        attribute :search_url
         attribute :sort_scope_asc
         attribute :sort_scope_desc
 

data/app/models/spree/admin/table/query_builder.rb

@@ -70,8 +70,9 @@ module Spree
         end
 
         # Get available fields for filtering based on table configuration
+        # @param view_context [ActionView::Base] optional view context for resolving dynamic URLs
         # @return [Array<Hash>]
-        def available_fields
+        def available_fields(view_context = nil)
           @table.filterable_columns.map do |column|
             {
               key: column.ransack_attribute,
@@ -79,7 +80,7 @@ module Spree
               type: column.filter_type.to_s,
               operators: column.operators.map(&:to_s),
               value_options: format_value_options(column.value_options),
-              search_url: column.search_url
+              search_url: resolve_search_url(column.search_url, view_context)
             }
           end
         end
@@ -92,6 +93,10 @@ module Spree
 
         private
 
+        def resolve_search_url(search_url, view_context)
+          search_url.is_a?(Proc) ? search_url.call(view_context) : search_url
+        end
+
         def format_value_options(options)
           return nil if options.blank?
 

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