spree_admin 5.1.4 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3970db34e315d777871a1d2e53cf27ac817b0ed7784d0fca0cf74f9ea6b736d4
-  data.tar.gz: 735e2cf7d03a439acb8cbd492f42f6ee7aa3172ff6bbcbaa300ba53ec5d40a4c
+  metadata.gz: 8a44b861bdad4ce0d03b3225344461ced14b8dea71fec7a839beca7d19bac3c9
+  data.tar.gz: 7efaca5c31054109ea94d9f867ba0ce820db0fded92e1cc7ddfa5a52763ba645
 SHA512:
-  metadata.gz: 5f5951292d223e9e8594898d1156cff0ecb0f2b69029dc160fb226340d3723e3203fee617448e8458709fd01776cb5d481f7863b9792ad0abe5d4411d6250945
-  data.tar.gz: b3843f735e552418eaab27b0b24f05388dd8ff256e8aa1cde15d2707e0c1cf4874689ab10d6ae4da248570322dbebca54f7267fc42fd31a06c0f64a9afb005be
+  metadata.gz: 5022e147047a7c8e1bdb0484420a4d7f9a461763974b0d1a4b517e676201fdc801bba89a65bb1b244688bccf2d0e404f04e1cbef517a0366c10b7dde5d417561
+  data.tar.gz: 8291066c622ef1d32385470823dd9b343e58cda7534e3547d3c26ad32c815d922a21225c700f1c23f920a6b2bfd2c7c5a42bda4f5e1c57a0b74eab2467dfdaa0

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

@@ -35,7 +35,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>

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/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/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.5
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-24 00:00:00.000000000 Z
+date: 2025-08-06 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.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.5
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.5
 - !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
@@ -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.5
   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.5
 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 %>