spree_admin 5.1.4 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3970db34e315d777871a1d2e53cf27ac817b0ed7784d0fca0cf74f9ea6b736d4
-  data.tar.gz: 735e2cf7d03a439acb8cbd492f42f6ee7aa3172ff6bbcbaa300ba53ec5d40a4c
+  metadata.gz: ced4e88139c2415b6773c33a5a61745fd66c3785038bd2bedbf393e2123eaed6
+  data.tar.gz: 9e3017a0cb8ded68fe31d44f0031fae27ae11eee6a85e299467434086a449f47
 SHA512:
-  metadata.gz: 5f5951292d223e9e8594898d1156cff0ecb0f2b69029dc160fb226340d3723e3203fee617448e8458709fd01776cb5d481f7863b9792ad0abe5d4411d6250945
-  data.tar.gz: b3843f735e552418eaab27b0b24f05388dd8ff256e8aa1cde15d2707e0c1cf4874689ab10d6ae4da248570322dbebca54f7267fc42fd31a06c0f64a9afb005be
+  metadata.gz: 031ac7b75b3e3ae2d1772d1a85f09f6ad0de3fedb198199e49799868cb8d037b44a6c0267448eba5dbc920b944680ccff9f685fb3afe8b4307dae2b5ca3849aa
+  data.tar.gz: 2836282801798b9f0a493002735342e31f387af928158566bf8c7773776ebf36de0a579bb5898ce86873fa257752b7dc9df0043991fead981ac7a3bee142b0e5

data/app/assets/stylesheets/spree/admin/components/_variants_form.scss

@@ -27,7 +27,8 @@
     &__option {
       display: flex;
       border-bottom: 1px solid $border-color;
-      padding: 1rem 0rem;
+      padding: 0.5rem 0.5rem 1rem 0;
+      margin-bottom: 0.5rem;
 
       .label {
         margin-bottom: 0.5rem;
@@ -57,6 +58,9 @@
 
       &--new {
         padding-left: calc(1.13px + 3.25rem);
+        border-bottom: none;
+        margin-bottom: 0;
+        padding-bottom: 0.5rem;
 
         .values-inputs {
           display: flex;

data/app/assets/stylesheets/spree/admin/shared/_forms.scss

@@ -186,3 +186,7 @@ turbo-frame.blur-busy[busy] {
     pointer-events: none;
   }
 }
+
+.input-group-text {
+  background-color: transparent;
+}

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

@@ -9,10 +9,6 @@ module Spree
         spree.admin_custom_domains_path
       end
 
-      def create_turbo_stream_enabled?
-        helpers.entri_enabled?
-      end
-
       def location_after_save
         spree.admin_custom_domains_path
       end

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

@@ -6,7 +6,7 @@ module Spree
       layout 'turbo_rails/frame'
 
       def create
-        @variant = Spree::Variant.accessible_by(current_ability, :manage).find(params[:line_item][:variant_id])
+        @variant = variant_scope.find(params.dig(:line_item, :variant_id))
 
         @order.transaction do
           line_item_result = create_service.call(order: @order, line_item_attributes: permitted_resource_params)
@@ -120,6 +120,10 @@ module Spree
       def permitted_resource_params
         params.require(:line_item).permit(permitted_line_item_attributes)
       end
+
+      def variant_scope
+        Spree::Variant.accessible_by(current_ability, :manage)
+      end
     end
   end
 end

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

@@ -173,7 +173,7 @@ module Spree
           joins(option_type: :product_option_types).
           includes(option_type: :option_values).
           merge(@product.product_option_types).
-          reorder("#{Spree::ProductOptionType.table_name}.position").
+          reorder("#{Spree::ProductOptionType.table_name}.position", "#{Spree::Variant.table_name}.position").
           uniq.group_by(&:option_type).each_with_index do |option, index|
             option_type, option_values = option
 

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

@@ -145,7 +145,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       # call authorize! a third time (called twice already in Admin::BaseController)
       # this time we pass the actual instance so fine-grained abilities can control
       # access to individual records, not just entire models.
-      authorize! action, @object
+      authorize! action, @object if @object.present?
 
       instance_variable_set("@#{resource.object_name}", @object)
     else

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

@@ -31,6 +31,10 @@ module Spree
       def permitted_resource_params
         params.require(:taxonomy).permit(permitted_taxonomy_attributes)
       end
+
+      def update_turbo_stream_enabled?
+        true
+      end
     end
   end
 end

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

@@ -52,6 +52,10 @@ module Spree
         spree.edit_admin_taxonomy_taxon_path(@taxon.taxonomy_id, @taxon.id)
       end
 
+      def update_turbo_stream_enabled?
+        true
+      end
+
       def destroy_turbo_stream_enabled?
         true && !params[:force_redirect].to_b
       end

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

@@ -4,7 +4,7 @@ module Spree
       include Spree::ImagesHelper
 
       def available_stores
-        @available_stores ||= Spree::Store.accessible_by(current_ability).includes(:logo_attachment, :favicon_image_attachment, :default_custom_domain)
+        @available_stores ||= Spree::Store.accessible_by(current_ability, :manage).includes(:logo_attachment, :favicon_image_attachment, :default_custom_domain)
       end
 
       DEFAULT_ICON_SIZE = 40

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

@@ -3,16 +3,22 @@ import { Controller } from '@hotwired/stimulus'
 export default class extends Controller {
   static targets = ['close', 'save']
 
-  close() {
+  close(event) {
+    // https://github.com/hotwired/stimulus/issues/743
+    if (event.type == "keydown" && !(event instanceof KeyboardEvent)) return
+
     if (this.hasCloseTarget) {
       window.Turbo.visit(this.closeTarget.href)
     }
   }
 
   save(event) {
+    // https://github.com/hotwired/stimulus/issues/743
+    if (event.type == "keydown" && !(event instanceof KeyboardEvent)) return
+
     if (this.hasSaveTarget) {
       event.preventDefault()
       this.saveTarget.click()
     }
   }
-}
+}

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

@@ -38,12 +38,6 @@ export default class extends Controller {
     }
   }
 
-  disconnect() {
-    if (this.select) {
-      this.select.destroy()
-    }
-  }
-
   initTomSelect(options = []) {
     const settings = {
       maxOptions: 1500,

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

@@ -128,25 +128,29 @@ export default class extends CheckboxSelectAll {
 
       const nestingLevel = internalName.split('/').length
       if (nestingLevel === 1) {
-        const firstOptionKey = Object.keys(this.optionsValue)[0]
-        const newOptionValues = this.optionsValue[firstOptionKey].values.filter((value) => value.text !== internalName)
-        if (newOptionValues.length === 0) {
-          const newOptionsValue = this.optionsValue
-          delete newOptionsValue[firstOptionKey]
-          this.optionsValue = newOptionsValue
-          this.optionsContainerTarget.querySelector(`#option-${firstOptionKey}`).remove()
-        } else {
-          this.optionsValue = {
-            ...this.optionsValue,
-            [firstOptionKey]: {
-              ...this.optionsValue[firstOptionKey],
-              values: newOptionValues
+        const sortedOptions = Object.entries(this.optionsValue).sort((a, b) => a[1].position - b[1].position)
+        const firstOptionKey = sortedOptions[0]?.[0]
+
+        if (firstOptionKey !== undefined) {
+          const newOptionValues = this.optionsValue[firstOptionKey].values.filter((value) => value.text !== internalName)
+          if (newOptionValues.length === 0) {
+            const newOptionsValue = this.optionsValue
+            delete newOptionsValue[firstOptionKey]
+            this.optionsValue = newOptionsValue
+            this.removeOption(firstOptionKey)
+          } else {
+            this.optionsValue = {
+              ...this.optionsValue,
+              [firstOptionKey]: {
+                ...this.optionsValue[firstOptionKey],
+                values: newOptionValues
+              }
             }
-          }
 
-          this.optionsContainerTarget.querySelector(`#option-${firstOptionKey} [data-name="${internalName}"]`).remove()
+            this.optionsContainerTarget.querySelector(`#option-${firstOptionKey} [data-name="${internalName}"]`).remove()
+          }
+          checkbox.checked = false
         }
-        checkbox.checked = false
       }
 
       delete newStockValue[internalName]
@@ -463,25 +467,42 @@ export default class extends CheckboxSelectAll {
       this.variantsTableTarget.classList.remove('d-none')
 
       const nestingLevel = Math.min(keys.length, 2)
-      let idx = 0
+
+      // This is the index for the product variant attributes
+      // We only want to count nested options if we have more than one option type
+      let idx
+      if (nestingLevel > 1) {
+        idx = this.variantsContainerTarget.querySelectorAll('.nested').length
+      } else {
+        idx = this.variantsContainerTarget.querySelectorAll('[data-variants-form-target="variant"]').length
+      }
 
       for (let i = 0; i < nestingLevel; i++) {
         this.variantsValue.forEach((variant) => {
           const { name, internalName } = this.calculateVariantName(variant, keys, i)
           if (currentVariants.has(internalName) || this.ignoredVariants.has(internalName)) {
-            idx++
             return
           }
           currentVariants.add(internalName)
 
           const existingVariant = this.variantsContainerTarget.querySelector(`[data-variant-name="${internalName}"]`)
           if (existingVariant) {
-            if (i === 0 && nestingLevel > 1) {
-              existingVariant.querySelectorAll("input[type='hidden']").forEach((input) => input.remove())
-
-              this.prepareParentVariant(existingVariant, internalName)
+            if (i === 0) {
+              if (nestingLevel > 1) {
+                existingVariant.querySelectorAll("input[type='hidden']").forEach((input) => input.remove())
+
+                this.prepareParentVariant(existingVariant, internalName)
+              } else if (nestingLevel === 1) {
+                // We need to generate hidden inputs when we only have a single option left
+                // And there are no inputs already
+                if (existingVariant.querySelectorAll("input[type='hidden']").length === 0) {
+                  const inputs = this.createInputsForVariant(keys, variant, idx)
+                  inputs.forEach((input) => existingVariant.appendChild(input))
+                  idx++
+                }
+              }
             }
-            idx++
+
             return
           }
 
@@ -537,10 +558,10 @@ export default class extends CheckboxSelectAll {
             }
 
             this.preparePriceInputs(variantTarget, internalName, idx)
-
             this.prepareStockInputs(variantTarget, internalName, idx)
+
+            idx++
           }
-          idx++
 
           variantNameContainer.textContent = name
           if (previousVariant) {
@@ -570,7 +591,9 @@ export default class extends CheckboxSelectAll {
   }
 
   refreshParentInputs() {
-    const firstOption = Object.values(this.optionsValue)[0]
+    const sortedOptions = Object.entries(this.optionsValue).sort((a, b) => a[1].position - b[1].position)
+    const firstOption = sortedOptions[0]?.[1]
+
     if (firstOption) {
       firstOption.values.forEach((option) => {
         this.currenciesValue.forEach((currency) => {
@@ -899,12 +922,25 @@ export default class extends CheckboxSelectAll {
     let { optionId } = event.params
     optionId = String(optionId)
 
-    const option = this.optionsContainerTarget.querySelector(`#option-${optionId}`)
-    option.remove()
-    this.optionsValue = { ...this.optionsValue, [optionId]: null }
+    this.removeOption(optionId)
+
+    const newOptionsValue = {}
+    Object.entries(this.optionsValue).filter((option) => option[0] !== optionId).forEach((option) => {
+      newOptionsValue[option[0]] = option[1]
+    })
+
+    this.optionsValue = newOptionsValue
     this.refreshParentInputs()
   }
 
+  removeOption(optionId) {
+    const option = this.optionsContainerTarget.querySelector(`#option-${optionId}`)
+    if (option) option.remove()
+
+    const optionTypeInput = this.optionsContainerTarget.querySelector(`#product_option_type_ids_${optionId}`)
+    if (optionTypeInput) optionTypeInput.remove()
+  }
+
   optionFormTemplate(optionName, optionValues, id, availableOptions) {
     const template = this.optionFormTemplateTarget.content.cloneNode(true)
 
@@ -1045,14 +1081,24 @@ export default class extends CheckboxSelectAll {
 
   priceForVariant(variantName, currency) {
     const existingPrice = this.pricesValue[variantName]?.[currency.toLowerCase()]
+
     if (existingPrice) {
       return {
         ...existingPrice,
         amount: existingPrice.amount ? parseFloat(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))
+        .sort((priceAmountA, priceAmountB) => priceAmountA - priceAmountB)
 
-    return { amount: null, id: null }
+      return {
+        amount: parentPrices[0] ?? null,
+        id: null
+      }
+    }
   }
 
   updatePriceForVariant(variantName, newPrice, currency) {

data/app/views/spree/admin/custom_domains/_custom_domain.html.erb

@@ -4,10 +4,8 @@
     <%= active_badge(custom_domain.active?) %>
   </td>
 
-  <% unless entri_enabled? %>
-    <td><%= active_badge(custom_domain.default?) %></td>
-    <td class="actions">
-      <%= link_to_edit(custom_domain, no_text: true, url: spree.edit_admin_custom_domain_path(custom_domain), data: { turbo: false }) %>
-    </td>
-  <% end %>
+  <td><%= active_badge(custom_domain.default?) %></td>
+  <td class="actions">
+    <%= link_to_edit(custom_domain, no_text: true, url: spree.edit_admin_custom_domain_path(custom_domain), data: { turbo: false }) %>
+  </td>
 </tr>

data/app/views/spree/admin/custom_domains/_custom_domains.html.erb

@@ -4,12 +4,9 @@
       <thead>
         <tr>
           <th><%= Spree.t(:name) %></th>
-          <th>Active?</th>
-
-          <% unless entri_enabled? %>
-            <th>Default</th>
-            <th></th>
-          <% end %>
+          <th><%= Spree.t(:active) %>?</th>
+          <th><%= Spree.t(:default) %>?</th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
@@ -18,7 +15,5 @@
     </table>
   </div>
 <% else %>
-  <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-    You don't have any custom domains set yet.
-  </div>
+  <%= render 'spree/admin/shared/no_resource_found' %>
 <% end %>

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

@@ -6,42 +6,56 @@
   <%= render_admin_partials(:custom_domains_actions_partials) %>
 <% end %>
 
+<%= render_admin_partials(:custom_domains_header_partials) %>
+
 <div class="card-lg p-4">
   <h5 class="mb-3">Internal URL</h5>
   <div class="row mb-4">
     <div class="col-lg-4">
       <p class="text-muted">
-        This is your internal URL.
+        This is your internal Admin URL.
       </p>
     </div>
     <div class="col-lg-7 offset-lg-1">
-      <%= form_for current_store, url: spree.admin_store_path(current_store), data: { turbo: false, controller: 'enable-button', 'enable-button-disable-when-not-changed-value': true } do |f| %>
-        <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border mb-3 <% if current_store.custom_domains.any? %>disabled<% end %>">
-          <%= f.text_field :code, class: 'form-control-plaintext pl-0',  data: { enable_button_target: 'input' }, required: true, disabled: current_store.custom_domains.any? %>
-          <span>.<%= Spree.root_domain %></span>
-        </div>
-        <% unless current_store.custom_domains.any? %>
-          <%= turbo_save_button_tag Spree.t('actions.update') %>
+      <%= form_for current_store, url: spree.admin_store_path, data: { turbo: false, controller: 'enable-button', 'enable-button-disable-when-not-changed-value': true } do |f| %>
+        <% if Spree.root_domain.present? %>
+          <div class="d-flex align-items-center gap-3">
+            <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border pr-2 gap-1 <% if current_store.custom_domains.any? %>disabled<% end %>">
+              <span class="text-muted">https://</span>
+              <%= f.text_field :code, class: 'form-control-plaintext pl-0', data: { enable_button_target: 'input' }, required: true, disabled: current_store.custom_domains.any? %>
+              <span>.<%= Spree.root_domain %></span>
+
+              <%= clipboard_component(current_store.formatted_url) %>
+            </div>
+            <% unless current_store.custom_domains.any? %>
+              <%= turbo_save_button_tag %>
+            <% end %>
+          </div>
+        <% else %>
+          <div class="d-flex align-items-center gap-3">
+            <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border pr-2 gap-1">
+              <span class="text-muted">https://</span>
+              <%= f.text_field :url, class: 'form-control-plaintext pl-0', required: true, data: { enable_button_target: 'input' } %>
+              <%= clipboard_component(current_store.formatted_url) %>
+            </div>
+            <%= turbo_save_button_tag %>
+          </div>
         <% end %>
       <% end %>
     </div>
   </div>
   <hr class="my-5" />
-  <h5>Custom domains</h5>
+  <h5><%= Spree.t(:custom_domains) %></h5>
   <div class="row">
     <div class="col-lg-4">
       <p class="text-muted">
-        Connect your domain or subdomain to your store.
+        Connect your domain or subdomain to your storefront.
       </p>
     </div>
     <div class="col-lg-7 offset-lg-1">
-      <% if entri_enabled? %>
-        <%= render 'setup_domain_entri' %>
-      <% else %>
-        <div class="text-right">
-          <%= link_to Spree.t(:new_domain), spree.new_admin_custom_domain_path, class: "btn btn-primary" %>
-        </div>
-      <% end %>
+      <div class="text-right">
+        <%= link_to Spree.t(:new_domain), spree.new_admin_custom_domain_path, class: "btn btn-primary" %>
+      </div>
 
       <%= turbo_frame_tag 'admin_custom_domains_index' do %>
         <%= render 'custom_domains' %>

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

@@ -1,4 +1,4 @@
-<div class="d-flex align-items-center gap-2">
+<div class="d-flex align-items-center gap-2 mb-4">
   <div>
     <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>
   </div>
@@ -6,4 +6,4 @@
     <strong><%= @invitation.inviter.name %></strong> has invited you to join <strong><%= @invitation.resource.name %></strong>
   </div>
 </div>
-<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary w-100', data: { turbo_method: :put } %>
+<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary mx-auto px-5', data: { turbo_method: :put } %>

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

@@ -1,6 +1,7 @@
 <% content_for :page_title do %>
   <% if controller_name == 'orders' %>
-    <%= page_header_back_button spree.admin_orders_path, @order %>
+    <% back_url = @order.present? && !@order.completed? ? spree.admin_checkouts_path : spree.admin_orders_path %>
+    <%= page_header_back_button back_url, @order %>
   <% else %>
     <%= page_header_back_button spree.edit_admin_order_path(@order) %>
   <% end %>

data/app/views/spree/admin/page_builder/_pages_dropdown.html.erb

@@ -8,7 +8,7 @@
   </button>
   <div class="dropdown-menu" style="min-width: 300px">
     <% @theme.pages.standard.order(name: :asc).find_all(&:customizable?).each do |page| %>
-      <%= active_link_to spree.edit_admin_theme_path(@theme, theme_preview_id: @theme_preview.id, page_id: page.id), class: 'dropdown-item', active: @page == page do %>
+      <%= active_link_to spree.edit_admin_theme_path(@theme, theme_preview_id: @theme_preview.id, page_id: page.id), class: 'dropdown-item', active: @page == page, data: { turbo_prefetch: false } do %>
         <%= icon page.icon_name, class: 'mr-2' %>
         <%= page.display_name %>
       <% end %>

data/app/views/spree/admin/page_links/_list.html.erb

@@ -31,6 +31,6 @@
       <% add_url = spree.admin_page_section_block_links_path(parent.section, parent) %>
     <% end %>
 
-    <%= link_to_with_icon 'plus', 'Add link', add_url, class: 'btn btn-primary w-100', data: { turbo_method: :post } if add_url && can?(:create, Spree::PageLink.new(parent: parent)) %>
+    <%= link_to_with_icon 'plus', Spree.t(:add_link), add_url, class: 'btn btn-primary w-100', data: { turbo_method: :post } if add_url && can?(:create, Spree::PageLink.new(parent: parent)) %>
   <% end %>
 </div>

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

@@ -15,10 +15,10 @@
                   <%= sort_link @search,
                   :name,
                   Spree.t(:name),
-                  { 
-                    default_order: "desc", 
-                    title: "admin_products_listing_name_title" 
-                  } 
+                  {
+                    default_order: "desc",
+                    title: "admin_products_listing_name_title"
+                  }
                   %>
                 </th>
                 <th scope="col" class="text-center">
@@ -30,6 +30,8 @@
                   <th scope="col" class="d-vendor"><%= Spree.t(:vendor) %></th>
                 <% end %>
                 <th scope="col"><%= Spree.t(:price) %></th>
+
+                <%= render_admin_partials(:products_table_header_partials) %>
               </tr>
             </thead>
             <tbody>

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

@@ -24,4 +24,6 @@
   <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
     <%= display_admin_price(product) %>
   </td>
+
+  <%= render_admin_partials(:products_table_row_partials, product: product) %>
 </tr>

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

@@ -33,6 +33,7 @@ locals: {
 
 <% content_for :page_title do %>
   <%= render "spree/admin/products/edit_page_title" %>
+  <%= render_admin_partials(:product_page_title_partials, product: @product) %>
 <% end %>
 
 <%= form_for [:admin, @product] do |f| %>

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

@@ -27,7 +27,6 @@
           <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 %>
-              <%= hidden_field_tag "product[option_type_ids][]", option_type.id %>
               <div class="options-creator__option" data-variants-form-target="option" id="option-<%= option_type.id %>">
                 <% if can?(:manage_option_types, @product) %>
                   <button class="draggable" type="button">
@@ -35,7 +34,7 @@
                   </button>
                 <% end%>
                 <div class="w-100">
-                  <div class="d-flex justify-content-between">
+                  <div class="d-flex justify-content-between align-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>
@@ -161,7 +160,7 @@
             </div>
           </div>
           <%= render 'spree/admin/products/form/variants/variant_template', default_stock_location: default_stock_location_for_product(@product) %>
-          <div class="variants-table__body" data-variants-form-target="variantsContainer">
+          <div class="variants-table__body" data-variants-form-target="variantsContainer" data-test-id="product-variants-table">
           </div>
           <div class="variants-table__footer">
             <%= Spree.t('admin.variants_form.total_inventory_html', stock_location: current_store.default_stock_location.name, count: raw("<span data-variants-form-target='stockItemsCount'>#{@product.total_on_hand}</span>") )%>

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

@@ -37,6 +37,8 @@
 <%= tinymce_assets %>
 <link rel="stylesheet" type="text/css" href="https://unpkg.com/trix@2.1.12/dist/trix.css">
 
+<script async src="https://ga.jspm.io/npm:es-module-shims@1.8.2/dist/es-module-shims.js" data-turbo-track="reload"></script>
+
 <%= javascript_importmap_tags 'application-spree-admin', importmap: Rails.application.config.spree_admin.importmap %>
 
 <%= yield :head %>

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

@@ -21,7 +21,7 @@
 
     <%= invite_vendor_button(class: 'dropdown-item') if defined?(invite_vendor_button) %>
 
-    <% if can?(:create, Spree::Store) %>
+    <% if can?(:create, Spree::Store) && Spree.root_domain.present? %>
       <div class="dropdown-divider"></div>
 
       <span data-toggle="modal" data-target="#modal-lg">

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

@@ -66,13 +66,15 @@
   </ul>
 <% else %>
   <ul class="nav flex-column">
-    <% unless current_store.setup_completed? %>
-      <%= nav_item(nil, spree.admin_getting_started_path, icon: 'map') do %>
-        <%= icon 'map' %>
-        <%= Spree.t('admin.getting_started') %>
-        <span class="badge ml-auto badge-info">
-          <%= current_store.setup_tasks_done %><span class="opacity-50">/<%= current_store.setup_tasks_total %></span>
-        </span>
+    <% if can?(:manage, current_store) %>
+      <% unless current_store.setup_completed? %>
+        <%= nav_item(nil, spree.admin_getting_started_path, icon: 'map') do %>
+          <%= icon 'map' %>
+          <%= Spree.t('admin.getting_started') %>
+          <span class="badge ml-auto badge-info">
+            <%= current_store.setup_tasks_done %><span class="opacity-50">/<%= current_store.setup_tasks_total %></span>
+          </span>
+        <% end %>
       <% end %>
     <% end %>
 

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

@@ -4,6 +4,23 @@
 
 <div class="row">
   <div class="col-lg-6 offset-lg-3">
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title"><%= Spree.t(:settings) %></h5>
+      </div>
+      <div class="card-body">
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <%= f.check_box :preferred_send_consumer_transactional_emails, class: 'custom-control-input' %>
+            <%= f.label :preferred_send_consumer_transactional_emails, Spree.t(:send_consumer_transactional_emails), class: 'custom-control-label' %>
+            <small class="form-text text-muted mt-2">
+              <%= Spree.t('admin.store_form.send_consumer_transactional_emails_help') %>
+            </small>
+          </div>
+        </div>
+      </div>
+    </div>
+
     <div class="card mb-4">
       <div class="card-header">
         <h5 class="card-title">Email addresses</h5>

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

@@ -12,12 +12,14 @@
       <%= f.error_message_on :name %>
     </div>
     <div class="form-group">
-      <%= f.label :amount, Spree.t(:rate) %>
-      <%= f.number_field :amount, class: 'form-control', min: 0, step: 0.0001, required: true %>
+      <%= f.label :amount_percentage, Spree.t(:rate) %>
+      <div class="input-group">
+        <%= f.number_field :amount_percentage, class: 'form-control', min: 0, step: 0.1, required: true %>
+        <div class="input-group-append">
+          <span class="input-group-text">%</span>
+        </div>
+      </div>
       <%= f.error_message_on :amount %>
-      <small class="form-text text-muted">
-        <%= Spree.t(:tax_rate_amount_explanation) %>
-      </small>
     </div>
 
     <div class="form-group">

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

@@ -10,7 +10,7 @@
     <%= taxonomy.taxons.count - 1 %>
   </td>
   <td class="w-10 actions">
-    <%= link_to_with_icon 'list-tree', Spree.t('admin.manage_taxons'), spree.admin_taxonomy_path(taxonomy), class: 'btn btn-light btn-sm' %>
-    <%= link_to_edit(taxonomy, class: 'btn btn-light btn-sm') if can?(:edit, taxonomy) %>
+    <%= link_to_with_icon 'list-tree', Spree.t('admin.manage_taxons'), spree.admin_taxonomy_path(taxonomy), class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' } %>
+    <%= link_to_edit(taxonomy, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can?(:edit, taxonomy) %>
   </td>
 </tr>

data/app/views/spree/admin/taxonomies/update.turbo_stream.erb

@@ -0,0 +1 @@
+<%= turbo_render_alerts %>

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

@@ -80,7 +80,7 @@
         <div class="card-body border-bottom">
           <div class="d-flex align-items-center">
             <%= f.label :sort_order, class: 'text-nowrap mr-2 mb-0' %>
-            <%= f.select :sort_order, taxon_sort_options_for_select, {}, { class: 'custom-select custom-select-sm w-auto',  data: { action: 'change->auto-submit#submit' } } %>
+            <%= f.select :sort_order, taxon_sort_options_for_select, {}, { class: 'custom-select custom-select-sm w-auto',  data: { action: 'change->auto-submit#submit' } } %>n sort order dropdown in admin (#13030))
           </div>
         </div>
 

data/app/views/spree/admin/taxons/update.turbo_stream.erb

@@ -0,0 +1,7 @@
+<%= turbo_render_alerts %>
+
+<%= turbo_stream.replace :classifications do %>
+  <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon.id) do %>
+    <%= render 'spree/admin/shared/spinner' %>
+  <% end %>
+<% end %>

data/config/importmap.rb

@@ -23,7 +23,6 @@ pin '@stimulus-components/rails-nested-form', to: '@stimulus-components--rails-n
 pin 'stimulus-notification', preload: ['application-spree-admin'] # @2.2.0
 pin 'stimulus-password-visibility', preload: ['application-spree-admin'] # @2.1.1
 pin 'stimulus-sortable', preload: ['application-spree-admin'] # @4.1.1
-pin 'stimulus-textarea-autogrow', preload: ['application-spree-admin'] # @4.1.0
 pin 'hotkeys-js', preload: ['application-spree-admin'] # @3.13.9
 pin 'stimulus-use', preload: ['application-spree-admin'] # @0.51.3
 pin 'stimulus-checkbox-select-all', preload: ['application-spree-admin'] # @5.3.0

data/config/locales/en.yml

@@ -212,6 +212,7 @@ en:
           label: Display the company address field
         customer_support_email_help: This email is visible to your Store visitors in the Footer section
         new_order_notifications_email_help: If you want to receive an email notification every time someone places an Order please provide an email address for that notification to be sent to
+        send_consumer_transactional_emails_help: When unchecked, transactional emails like order confirmations and shipment notifications will not be sent to customers
       store_setup_tasks:
         add_billing_address: Add billing address
         add_products: Add products

data/lib/spree/admin/engine.rb

@@ -54,11 +54,14 @@ module Spree
         :posts_filters_partials,
         :posts_header_partials,
         :product_dropdown_partials,
+        :product_page_title_partials,
         :product_form_partials,
         :product_form_sidebar_partials,
         :products_actions_partials,
         :products_filters_partials,
         :products_header_partials,
+        :products_table_header_partials,
+        :products_table_row_partials,
         :promotions_actions_partials,
         :promotions_filters_partials,
         :promotions_header_partials,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.6
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-24 00:00:00.000000000 Z
+date: 2025-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.6
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.6
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -415,7 +415,6 @@ files:
 - app/controllers/spree/admin/zones_controller.rb
 - app/helpers/spree/admin/base_helper.rb
 - app/helpers/spree/admin/bulk_operations_helper.rb
-- app/helpers/spree/admin/custom_domains_helper.rb
 - app/helpers/spree/admin/customer_returns_helper.rb
 - app/helpers/spree/admin/flash_helper.rb
 - app/helpers/spree/admin/modal_helper.rb
@@ -530,7 +529,6 @@ files:
 - app/views/spree/admin/custom_domains/_custom_domain.html.erb
 - app/views/spree/admin/custom_domains/_custom_domains.html.erb
 - app/views/spree/admin/custom_domains/_form.html.erb
-- app/views/spree/admin/custom_domains/create.turbo_stream.erb
 - app/views/spree/admin/custom_domains/edit.html.erb
 - app/views/spree/admin/custom_domains/index.html.erb
 - app/views/spree/admin/custom_domains/new.html.erb
@@ -1021,6 +1019,7 @@ files:
 - app/views/spree/admin/taxonomies/index.html.erb
 - app/views/spree/admin/taxonomies/new.html.erb
 - app/views/spree/admin/taxonomies/show.html.erb
+- app/views/spree/admin/taxonomies/update.turbo_stream.erb
 - app/views/spree/admin/taxons/_form.html.erb
 - app/views/spree/admin/taxons/_rule_form.html.erb
 - app/views/spree/admin/taxons/_rules_form.html.erb
@@ -1030,6 +1029,7 @@ files:
 - app/views/spree/admin/taxons/rule_forms/_available_on.html.erb
 - app/views/spree/admin/taxons/rule_forms/_sale.html.erb
 - app/views/spree/admin/taxons/rule_forms/_tag.html.erb
+- app/views/spree/admin/taxons/update.turbo_stream.erb
 - app/views/spree/admin/themes/_theme.html.erb
 - app/views/spree/admin/themes/_theme_preview_image.html.erb
 - app/views/spree/admin/themes/edit.html.erb
@@ -1133,7 +1133,6 @@ files:
 - vendor/javascript/stimulus-password-visibility.js
 - vendor/javascript/stimulus-reveal-controller.js
 - vendor/javascript/stimulus-sortable.js
-- vendor/javascript/stimulus-textarea-autogrow.js
 - vendor/javascript/stimulus-use.js
 - vendor/javascript/tom-select--dist--esm--tom-select.complete.js.js
 - vendor/javascript/trix@2.1.12.js
@@ -1142,9 +1141,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.4
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.6
 post_install_message:
 rdoc_options: []
 require_paths:

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

@@ -1,9 +0,0 @@
-module Spree
-  module Admin
-    module CustomDomainsHelper
-      def entri_enabled?
-        false
-      end
-    end
-  end
-end

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

@@ -1,3 +0,0 @@
-<%= turbo_stream.replace('admin_custom_domains_index') do %>
-  <%= render partial: 'custom_domains' %>
-<% end %>

data/vendor/javascript/stimulus-textarea-autogrow.js

@@ -1,4 +0,0 @@
-// stimulus-textarea-autogrow@4.1.0 downloaded from https://ga.jspm.io/npm:stimulus-textarea-autogrow@4.1.0/dist/stimulus-textarea-autogrow.mjs
-
-import{Controller as e}from"@hotwired/stimulus";function r(e,t){let i;return(...s)=>{const o=this;clearTimeout(i),i=setTimeout((()=>e.apply(o,s)),t)}}class l extends e{initialize(){this.autogrow=this.autogrow.bind(this)}connect(){this.element.style.overflow="hidden";const e=this.resizeDebounceDelayValue;this.onResize=e>0?r(this.autogrow,e):this.autogrow,this.autogrow(),this.element.addEventListener("input",this.autogrow),window.addEventListener("resize",this.onResize)}disconnect(){window.removeEventListener("resize",this.onResize)}autogrow(){this.element.style.height="auto",this.element.style.height=`${this.element.scrollHeight}px`}}l.values={resizeDebounceDelay:{type:Number,default:100}};export{l as default};
-