spree_admin 5.4.0.rc5 → 5.4.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4dcdb0dbb58f3fc9dbded5e7f0869dac57779665a2f38ad0a2c9805e338047
-  data.tar.gz: fbec9e836b4c310fefd56d82016ba697ede7498be0f68097715f2f606aac353c
+  metadata.gz: 50570f56dda55aad96c630a301c60c4f23a793d334cd72670697bd7dd535301c
+  data.tar.gz: c2422ff165f838cab717fdbbc287b90e678c7c0fd36ed4abdc5278f4430b111f
 SHA512:
-  metadata.gz: e0c87915f09a8dda042e8745e876877a0c0087910ae293f2d9ceb8dc2b2cb071a7dc40b475d46b1ad933308f42c80043787a352c0c7d3aadb8a015e81583bd6a
-  data.tar.gz: 9334252c421fff0751298d07df351ca54b81a5869b5156b3b5da298ffa820d061997ce12c038802b6e95bd41a07fb7140ac280e7f66db5ad9db2edf7dbe2a94a
+  metadata.gz: 5ffcae807ccdf08a77684bde3a9f61da11f04ffe8efe901572bffc27feff7ea21477ff49992f2b3cd3cdaf8ccdbd88ea9d614fdc256180c4e4f45ccde7197945
+  data.tar.gz: fdedbeee10fc76796f0355e3958eb4fdfbd438831fb458aefff328b0b36655fd6f7b73cb2018ee9af413e5c7ca13eccc206ae802afb44435e980528fd409cf37

data/app/assets/tailwind/spree/admin/base/_theme.css

@@ -14,7 +14,8 @@
   --color-info: var(--color-blue-900);
 
   /* Typography */
-  --font-sans: "Inter", ui-sans-serif, system-ui, sans-serif;
+  --font-sans: "Geist", ui-sans-serif, system-ui, sans-serif;
+  --font-mono: "Geist Mono", ui-monospace, monospace;
 
   /* Override Tailwind's text-* scale to match Spree design system */
   --text-2xs: 0.625rem;

data/app/assets/tailwind/spree/admin/components/_bulk-panel.css

@@ -66,7 +66,7 @@
   }
 
   .bulk-panel-container .btn-close {
-    @apply w-10;
+    @apply w-10 rounded-xl;
   }
 
   #bulk-panel {

data/app/assets/tailwind/spree/admin/components/_buttons.css

@@ -11,7 +11,7 @@
   .btn {
     @apply inline-flex items-center justify-center text-center align-middle gap-2;
     @apply cursor-pointer select-none no-underline;
-    @apply px-3 py-1.5 text-base font-medium leading-normal border border-transparent rounded-xl;
+    @apply px-2.5 py-1.5 text-base font-medium leading-normal border border-transparent rounded-xl;
     @apply transition-colors duration-100 ease-linear;
   }
 

data/app/assets/tailwind/spree/admin/components/_cards.css

@@ -13,10 +13,6 @@
     @apply p-0 mb-3;
   }
 
-  .card .card {
-    @apply rounded-xl;
-  }
-
   /* Card with table */
   .card > .table,
   .card .table-responsive > .table {
@@ -74,7 +70,7 @@
   }
 
   .card-body {
-    @apply flex-auto p-5;
+    @apply flex-auto p-3;
   }
 
   .card-body .form-group:last-child {
@@ -87,7 +83,7 @@
   }
 
   .card-header {
-    @apply flex items-center mb-0 p-5 pr-3 h-14 border-b border-gray-100 rounded-t-[calc(var(--radius-xl)-1px)];
+    @apply flex items-center mb-0 px-3 h-12 border-b border-gray-100 rounded-t-[calc(var(--radius-xl)-1px)];
   }
 
   .card-header .card-title {
@@ -107,7 +103,7 @@
   }
 
   .card-footer {
-    @apply p-5;
+    @apply p-3;
   }
 
   .card-footer:last-child {

data/app/assets/tailwind/spree/admin/components/_forms.css

@@ -23,7 +23,7 @@
   .select-input, 
   .form-control-sm, 
   .custom-select-sm {
-    @apply block w-full py-2 px-3 text-base font-normal leading-normal;
+    @apply block w-full py-1.5 px-2.5 text-base font-normal leading-normal;
     @apply text-gray-950 bg-white border border-gray-200 rounded-lg shadow-xs;
     @apply focus:outline-offset-2 focus:outline-blue-500 focus:border-gray-200 focus:ring-0;
     @apply transition-all duration-100 ease-in-out;

data/app/assets/tailwind/spree/admin/components/_list-groups.css

@@ -8,7 +8,7 @@
   }
 
   .list-group-item {
-    @apply relative block py-3 px-5 text-gray-950 no-underline border border-gray-200 hover:bg-gray-25;
+    @apply relative block py-2.5 px-3 text-gray-950 no-underline border border-gray-200 hover:bg-gray-25;
   }
 
   .list-group-item:first-child {

data/app/assets/tailwind/spree/admin/components/_variants-form.css

@@ -72,6 +72,7 @@
   }
 
   .variants-form .variants-table .column-checkbox,
+  .variants-form .variants-table .column-thumbnail,
   .variants-form .variants-table .column-variant,
   .variants-form .variants-table .column-price,
   .variants-form .variants-table .column-quantity,
@@ -83,6 +84,11 @@
     @apply justify-center grow-0 basis-8;
   }
 
+  .variants-form .variants-table .column-thumbnail {
+    @apply grow-0 shrink-0;
+    flex-basis: 36px;
+  }
+
   .variants-form .variants-table .column-variant {
     @apply select-none grow-[3] basis-0;
   }
@@ -136,6 +142,7 @@
   }
 
   .variants-form .variants-table__body__row.nested .column-checkbox,
+  .variants-form .variants-table__body__row.nested .column-thumbnail,
   .variants-form .variants-table__body__row.nested .column-variant {
     @apply left-5 relative;
   }

data/app/controllers/spree/admin/products_controller.rb

@@ -179,10 +179,16 @@ module Spree
 
         @product_variant_ids = {}
         @product_variant_prefix_ids = {}
+        @product_variant_images = {}
 
-        @product.variants.includes(:option_values).each do |variant|
+        @product.variants.includes(:option_values, primary_media: { attachment_attachment: :blob }).each do |variant|
           @product_variant_ids[variant.human_name] = variant.id.to_s
           @product_variant_prefix_ids[variant.human_name] = variant.to_param
+
+          image = variant.primary_media
+          if image.present? && image.attached? && image.variable?
+            @product_variant_images[variant.human_name] = helpers.spree_image_url(image, variant: :mini)
+          end
         end
       end
 

data/app/helpers/spree/admin/table_helper.rb

@@ -359,7 +359,7 @@ module Spree
       private
 
       def sort_dropdown_toggle(current_direction, current_label)
-        dropdown_toggle(class: 'btn-light btn-sm h-[2.125rem]') do
+        dropdown_toggle(class: 'btn-light btn-sm') do
           safe_join([
             icon(current_direction == 'asc' ? 'sort-ascending' : 'sort-descending'),
             content_tag(:span, current_label),

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

@@ -35,6 +35,7 @@ export default class extends CheckboxSelectAll {
     currencies: Array,
     variantIds: Object,
     variantPrefixIds: Object,
+    variantImages: Object,
     currentStockLocationId: String,
     stockLocations: Array,
     optionValuesSelectOptions: Array,
@@ -533,6 +534,14 @@ export default class extends CheckboxSelectAll {
             }
           }
 
+          const variantImageUrl = this.variantImagesValue?.[internalName]
+          if (variantImageUrl) {
+            const thumbnailContainer = variantTarget.querySelector('[data-slot="variantThumbnail"]')
+            if (thumbnailContainer) {
+              thumbnailContainer.innerHTML = `<div class="overflow-hidden rounded-md border border-gray-300" style="width: 36px; height: 36px;"><img src="${variantImageUrl}" width="36" height="36" alt="" class="object-cover transition-transform duration-300 ease-out hover:scale-120" loading="lazy"></div>`
+            }
+          }
+
           let previousVariant = null
 
           if (i > 0) {

data/app/models/spree/admin/form_builder.rb

@@ -389,7 +389,7 @@ module Spree
 
         @template.content_tag(:div, class: 'input-group') do
           prepend_html = if prepend.present?
-                           @template.content_tag(:div, prepend, class: 'pl-3 text-gray-400')
+                           @template.content_tag(:div, prepend, class: 'pl-2 text-gray-400')
                          else
                            ''.html_safe
                          end

data/app/presenters/spree/admin/order_summary_presenter.rb

@@ -13,6 +13,7 @@ module Spree
         [
           *metadata_rows,
           :separator,
+          market_row,
           locale_row,
           currency_row,
           subtotal_row,
@@ -72,6 +73,16 @@ module Spree
         rows
       end
 
+      def market_row
+        return nil if order.market.blank?
+
+        {
+          label: Spree.t(:market),
+          value: order.market.name,
+          id: 'market'
+        }
+      end
+
       def locale_row
         return nil if order.locale.blank?
 

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

@@ -12,6 +12,13 @@
           <%= f.spree_text_field :name, label: Spree.t(:internal_name), data: { slug_form_target: :url }, help_text: raw("This is used internally to identify the option type. <strong>It must be unique.</strong>") %>
         </div>
       </div>
+      <div class="grid grid-cols-12 gap-6 mb-6">
+        <div class="col-span-12 md:col-span-6">
+          <%= f.spree_select :kind,
+              Spree::OptionType::KINDS.map { |k| [Spree.t("option_type_kinds.#{k}"), k] },
+              { label: Spree.t(:kind), help: Spree.t(:option_type_kind_info) } %>
+        </div>
+      </div>
       <div class="grid grid-cols-12 gap-6">
         <div class="col-span-12 md:col-span-6">
           <%= f.spree_check_box :filterable, help_text: raw(Spree.t('option_type_filterable_info')) %>
@@ -38,6 +45,7 @@
               <th scope="col"></th>
               <th scope="col"><%= raw(Spree.t(:presentation) + required_span_tag) %></th>
               <th scope="col"><%= raw(Spree.t(:internal_name) + required_span_tag) %></th>
+              <th scope="col"><%= Spree.t(:color_code) %></th>
               <th scope="col"></th>
             </tr>
           </thead>
@@ -51,7 +59,7 @@
             <tr data-nested-form-target="target"></tr>
 
             <tr class="hover-none">
-              <td colspan="4" class="text-center p-2">
+              <td colspan="5" class="text-center p-2">
                 <button type="button" data-action="nested-form#add" class="btn btn-secondary py-3 w-full" id="add_option_value_button">
                   <%= icon('plus') %>
                   <%= Spree.t(:add_one) %>

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -14,12 +14,26 @@
     <% end %>
     <%= f.hidden_field :id %>
   </td>
-  <td class="w-45 presentation">
+  <td class="w-40 presentation">
     <%= f.text_field :presentation, class: "form-input", data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %>
   </td>
   <td class="w-40 name">
     <%= f.text_field :name, class: "form-input", data: { slug_form_target: :url } %>
   </td>
+  <td class="w-5 color_code">
+    <div data-controller="color-picker" data-color-picker-clear-value="true" data-color-picker-default-color-value="#000000">
+      <div class="flex items-center gap-2">
+        <button type="button"
+                data-color-picker-target="picker"
+                class="w-8 h-8 rounded border border-gray-300 cursor-pointer shrink-0"
+                style="background: <%= f.object.color_code.presence || 'white' %>;">
+        </button>
+        <span data-color-picker-target="value" class="text-sm text-gray-500"><%= f.object.color_code %></span>
+      </div>
+      <%= f.hidden_field :color_code, data: { color_picker_target: :input } %>
+      <span data-color-picker-target="display" class="hidden"></span>
+    </div>
+  </td>
   <td class="w-10 actions">
     <button type="button" class="btn btn-danger btn-sm remove_option_value_button" data-action="nested-form#remove">
       <%= icon('trash', class: 'mr-0') %>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -1,5 +1,5 @@
 <% order ||= shipment.order %>
-<%= turbo_frame_tag dom_id(shipment), class: "card rounded-lg" do %>
+<%= turbo_frame_tag dom_id(shipment), class: "card" do %>
   <div class="card-header items-center justify-between">
     <div class="flex items-center gap-2">
       <span class="flex items-center"><%= shipment_state(shipment.state) %></span>

data/app/views/spree/admin/payments/_payment.html.erb

@@ -1,4 +1,4 @@
-<div class="card rounded-lg" id="<%= dom_id(payment) %>">
+<div class="card" id="<%= dom_id(payment) %>">
   <div class="card-header flex items-center gap-2">
     <span class="badge badge-<%= payment.state %> gap-1">
       <% if payment.completed? %>

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

@@ -19,7 +19,7 @@
           <ul class="list-group mb-6">
             <% @payment_methods.each do |payment_method| %>
               <li class="list-group-item p-0 overflow-hidden">
-                <%= link_to spree.new_admin_order_payment_path(@order, payment_method_id: payment_method.id), class: "form-check-label flex items-center gap-4 px-6 py-6 w-full cursor-pointer hover:bg-gray-25 text-gray-900 no-underline" do %>
+                <%= link_to spree.new_admin_order_payment_path(@order, payment_method_id: payment_method.id), class: "form-check-label flex items-center gap-4 px-3 py-3 w-full cursor-pointer hover:bg-gray-25 text-gray-900 no-underline" do %>
                   <div class="form-check flex items-center">
                     <%= f.radio_button :payment_method_id, payment_method.id, class: "form-check-input" %>
                   </div>

data/app/views/spree/admin/payments/source_forms/_previous_cards.html.erb

@@ -3,7 +3,7 @@
     <%= f.fields_for :source, @payment.source do |source_form| %>
       <% previous_cards.each do |card| %>
         <li class="list-group-item p-0">
-          <%= source_form.label :id, value: card.id, class: "form-check-label flex items-center gap-4 px-6 py-6 w-full cursor-pointer hover:bg-gray-25" do %>
+          <%= source_form.label :id, value: card.id, class: "form-check-label flex items-center gap-4 px-3 py-3 w-full cursor-pointer hover:bg-gray-25" do %>
             <div class="form-check flex items-center">
               <%= source_form.radio_button :id, card.id, class: "form-check-input" %>
             </div>

data/app/views/spree/admin/payments/source_forms/_store_credit.html.erb

@@ -3,7 +3,7 @@
     <%= f.fields_for :source, @payment.source do |source_form| %>
       <% @store_credits.each do |credit| %>
         <li class="list-group-item p-0">
-          <%= source_form.label :id, value: credit.id, class: "form-check-label flex items-center gap-4 px-6 py-6 w-full cursor-pointer hover:bg-gray-25" do %>
+          <%= source_form.label :id, value: credit.id, class: "form-check-label flex items-center gap-4 px-3 py-3 w-full cursor-pointer hover:bg-gray-25" do %>
             <div class="form-check flex items-center">
               <%= source_form.radio_button :id, credit.id, class: "form-check-input", checked: @payment.source.id == credit.id || @store_credits.first.id == credit.id %>
             </div>

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

@@ -22,6 +22,7 @@
         <% 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 %>
+        <% if @product_variant_images.present? %> data-variants-form-variant-images-value="<%= @product_variant_images.to_json %>" <% end %>
         >
         <div class="options-creator">
           <%= render 'spree/admin/products/form/variants/option_template', option_types_for_select: option_types_for_select %>
@@ -145,6 +146,8 @@
                 </div>
               </div>
             <% end%>
+            <div class="variants-table__header__cell column-thumbnail">
+            </div>
             <div class="variants-table__header__cell column-variant">
               <%= Spree.t(:variant) %>
             <button data-variants-form-target="deleteButton" data-action="variants-form#deleteSelected" type="button" class="btn btn-danger btn-sm hidden ml-12">

data/app/views/spree/admin/products/form/variants/_variant_template.html.erb

@@ -12,6 +12,9 @@
         </div>
       </div>
     <% end %>
+    <div class="variants-table__body__cell column-thumbnail pr-2" data-slot="variantThumbnail">
+      <%= render 'spree/admin/shared/no_image', width: 36, height: 36 %>
+    </div>
     <div class="variants-table__body__cell column-variant" data-slot="variantName">
       Medium
     </div>

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

@@ -2,7 +2,7 @@
 <% badge_name ||= label %>
 <% placeholder ||= [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>
 
-<div class="form-input flex items-center py-0 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 grow max-lg:max-w-[300px] mr-auto h-[2.125rem] max-lg:mb-4 transition-all duration-100 ease-in-out" id="filters-search-bar">
+<div class="form-input flex items-center py-0 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 grow max-lg:max-w-[300px] mr-auto max-lg:mb-4 transition-all duration-100 ease-in-out" id="filters-search-bar">
   <%= icon "search", class: "mr-4 text-gray-600" %>
   <%= search_field_tag "q[#{param}]", params.dig(:q, param), class: "outline-none border-0 h-full focus:border-0 focus:ring-0 p-0 text-base w-full", placeholder: placeholder, data: { filters_target: :input, badge_name: badge_name } %>
 </div>

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

@@ -19,7 +19,7 @@
 
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css2?family=Geist+Mono:wght@100..900&family=Geist:wght@100..900&display=swap" rel="stylesheet">
 
 <%= stylesheet_link_tag 'spree/admin/application', media: :all, data: { turbo_track: "reload" } %>
 <%= tinymce_assets %>

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

@@ -24,7 +24,7 @@
           media_form_target: 'addButton'
         }  do %>
         <%= icon('upload', class: 'mt-12 text-4xl') %>
-        <p class="text-sm mt-2 mb-12">
+        <p class="text-sm mb-12">
           <%= Spree.t('admin.upload_new_asset') %>
         </p>
       <% end %>

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

@@ -2,12 +2,12 @@
   <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-full flex justify-between items-center" do |f| %>
     <div>
       <%= f.select :selected_shipping_rate_id, options_for_select(@shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, @shipment.selected_shipping_rate_id),
-        {},  class: 'form-select', autofocus: true %>
+        {},  class: 'form-select form-select-sm', autofocus: true %>
     </div>
     <div class="flex h-full items-center gap-2">
       <% if can? :update, @shipment %>
-        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary' %>
-        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light" %>
+        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-sm btn-primary' %>
+        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-sm btn-light" %>
       <% end %>
     </div>
   <% end %>
@@ -16,12 +16,12 @@
   <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-full py-1 flex justify-between items-center" do |f| %>
     <div class="flex items-center text-nowrap gap-x-3 items-center grow mr-3">
       <%= f.label :tracking, Spree.t(:tracking_number), class: 'mb-0' %>
-      <%= f.text_field :tracking, class: 'form-input', required: true, autofocus: true %>
+      <%= f.text_field :tracking, class: 'form-input form-input-sm', required: true, autofocus: true %>
     </div>
     <div class="flex h-full items-center gap-2">
       <% if can? :update, @shipment %>
-        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary' %>
-        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light" %>
+        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-sm btn-primary' %>
+        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-sm btn-light" %>
       <% end %>
     </div>
   <% end %>

data/app/views/spree/admin/tables/_column_selector.html.erb

@@ -7,7 +7,7 @@
     <%= hidden_field_tag :redirect_url, request.fullpath %>
 
     <%= dropdown(portal: false) do %>
-      <%= dropdown_toggle(class: 'btn-light btn-sm h-[2.125rem]') do %>
+      <%= dropdown_toggle(class: 'btn-light btn-sm') do %>
         <%= icon 'columns-3' %>
         <span><%= Spree.t('admin.tables.columns') %></span>
         <%= icon 'chevron-down' %>

data/app/views/spree/admin/tables/_query_builder.html.erb

@@ -6,7 +6,7 @@
 
 <div data-controller="dialog" class="h-full">
   <button type="button"
-          class="btn btn-light btn-sm h-[2.125rem]"
+          class="btn btn-light btn-sm"
           data-action="dialog#open">
     <%= icon 'filter' %>
     <span><%= Spree.t('admin.tables.filters') %></span>

data/app/views/spree/admin/tables/_table.html.erb

@@ -11,11 +11,11 @@
     <%= render 'spree/admin/shared/export_modal', export_type: export_type %>
   <% end %>
   <div class="<%= local_assigns[:container_class] || 'card-lg' %>" data-controller="table" data-table-url-value="<%= request.path %>">
-    <div class="p-3 border-b border-gray-200">
+    <div class="p-2 border-b border-gray-200">
       <div class="flex flex-col lg:flex-row gap-3 items-start lg:items-center justify-between">
         <div class="flex gap-2 items-center flex-wrap">
           <%= search_form_for @search, url: url_for, html: { data: { turbo_frame: frame_name, turbo_action: 'advance', controller: 'auto-submit search-clear', auto_submit_delay_value: 300 } } do |f| %>
-            <div class="form-input flex items-center py-0 pr-1 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 lg:w-[300px] mr-auto h-[2.125rem] transition-all duration-100 ease-in-out">
+            <div class="form-input flex items-center py-0 pr-1 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 lg:w-[300px] mr-auto h-[2rem] transition-all duration-100 ease-in-out">
               <%= icon "search", class: "mr-4 text-gray-600 shrink-0" %>
               <%= search_field_tag "q[#{search_param}]",
                                    params.dig(:q, search_param),
@@ -55,7 +55,7 @@
                          date_to_input_name: "q[#{date_range_param}_lt]",
                          date_from_value: params.dig(:q, :"#{date_range_param}_gt"),
                          date_to_value: params.dig(:q, :"#{date_range_param}_lt"),
-                         css_classes: "btn-light btn-sm dropdown-toggle h-[2.125rem]" %>
+                         css_classes: "btn-light btn-sm" %>
               <%# Preserve search and filter state when submitting date range %>
               <% if params.dig(:q, search_param).present? %>
                 <%= hidden_field_tag "q[#{search_param}]", params.dig(:q, search_param) %>

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

@@ -32,7 +32,7 @@
         <p class="text-center mb-3"><%= Spree.t('admin.translations.no_translations_configured') %></p>
 
         <% if can?(:edit, current_store) %>
-          <%= link_to_with_icon 'world', Spree.t('admin.translations.manage_markets'), spree.edit_admin_store_path(section: 'general-settings'), class: 'btn btn-primary', data: { 'turbo-frame': '_top' } %>
+          <%= link_to_with_icon 'world', Spree.t('admin.manage_markets'), spree.admin_markets_path, class: 'btn btn-primary', data: { 'turbo-frame': '_top' } %>
         <% end %>
       </div>
     </div>

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

@@ -5,7 +5,7 @@
     </h5>
 
     <% if can?(:manage, Spree::Store) %>
-      <%= link_to_with_icon 'adjustments', Spree.t('admin.manage_currencies'), spree.edit_admin_store_path(section: 'general-settings'), class: 'btn btn-sm btn-light' %>
+      <%= link_to_with_icon 'world', Spree.t('admin.manage_markets'), spree.admin_markets_path, class: 'btn btn-sm btn-light' %>
     <% end %>
   </div>
   <div class="card-body p-0">

data/config/locales/en.yml

@@ -143,7 +143,7 @@ en:
         page_subtitle: Connect your store to third-party services to enhance customer experience.
       json_preview:
         no_api_response: No API response found for this resource
-      manage_currencies: Manage Currencies
+      manage_markets: Manage Markets
       manage_properties: Manage Properties
       manage_stock_locations: Manage Stock Locations
       manage_taxons: Manage Categories
@@ -366,9 +366,8 @@ en:
         manual: Manual
         manual_info: Curate products manually. You can add or remove them in bulk.
       translations:
-        manage_markets: Manage Markets
         no_translations_configured: No translations configured. Please setup Markets to use translations.
-      upload_new_asset: Upload new asset
+      upload_new_asset: Upload new media
       user:
         last_order_placed: Last order placed
         no_store_credit: Customer has no Store Credit available

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.4.0.rc5
+  version: 5.4.0.rc6
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.rc5
+        version: 5.4.0.rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.rc5
+        version: 5.4.0.rc6
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -1095,7 +1095,6 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - config/tailwind.config.js
-- db/migrate/20250217171018_create_action_text_video_embeds.rb
 - lib/generators/spree/admin/devise/devise_generator.rb
 - lib/generators/spree/admin/install/install_generator.rb
 - lib/generators/spree/admin/install/templates/app/assets/tailwind/spree_admin.css.tt
@@ -1170,9 +1169,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.rc6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc5
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.rc6
 post_install_message:
 rdoc_options: []
 require_paths:

data/db/migrate/20250217171018_create_action_text_video_embeds.rb

@@ -1,11 +0,0 @@
-class CreateActionTextVideoEmbeds < ActiveRecord::Migration[6.1]
-  def change
-    create_table :action_text_video_embeds, if_not_exists: true do |t|
-      t.string :url, null: false
-      t.string :thumbnail_url, null: false
-      t.text :raw_html, null: false
-
-      t.timestamps
-    end
-  end
-end