spree_admin 5.1.0.beta2 → 5.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9de1e5e85e6639aa2f1798ff7d6c6d77116a702da71c872463a882157a22209
-  data.tar.gz: 067c530bc16335b4a43d086de3269aec4dd0d5381ebb518219cde01bea6097f3
+  metadata.gz: 3f5759966c4d6a61b9c2b51e85b01e209cefabf35fb2ec0934623d21f1937e23
+  data.tar.gz: '0994653a7d251af2746bde91daf82e7ea397063821f4f8019face626deb733d6'
 SHA512:
-  metadata.gz: e57033091798721e3017a6748f52ffb6a6384f25bc456294089bdf97625a8c78b1827e9bd70896114a789c5eb68ef4c6d2d8b1b695323765cdd6c6d584a0f535
-  data.tar.gz: '015298e7d0b7032889630f8a150405e6f9ee5bb568da96f30415da0d9d066b13bce38dee9e54cbe8abd3e669ca5c090868b3096d013c48b46398eacf4033003d'
+  metadata.gz: 55e5ffcfc30c9238cbe32909defe509b7a9dd919d80589cafcc24031acbd6559bd05c56aea57bd62dbbc06ae496b6787a087b3ac9a5306b141924884b6e5896a
+  data.tar.gz: 838eba52a5b8bc939c4c7ac5a541cc621f1f347f43f0354a591c973a13c33fea7a2cc79ea18e88f1f1bf0d41c4e34a27bebf418640bc1e5a8a4cb5fdbe3f1748

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

@@ -42,14 +42,11 @@
 .card-header, .card-footer {
   background-color: transparent;
 }
-.card-header, .card-footer, .card-body {
-  border-top: 0 none;
-}
 .card-header {
   display: flex;
   align-items: center;
   height: 50px;
-  border-bottom-color: $gray-50;
+  border-bottom: 1px solid $gray-50;
 
   .card-title {
     margin-bottom: 0;
@@ -125,7 +122,4 @@
   .card-body {
     border-top: 1px solid $gray-50;
   }
-  .card-header {
-    border: 0 none;
-  }
 }

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

@@ -16,7 +16,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding-left: 0.75rem;
+  padding-left: 0.5rem;
   padding-right: 0.75rem;
   background-color: $sidebar-bg;
   width: $sidebar-width;

data/app/assets/stylesheets/spree/admin/global/_variables.scss

@@ -1,8 +1,8 @@
 // https://github.com/twbs/bootstrap/blob/v4.6.2/scss/_variables.scss
 
-$gray-25: #F9F9F9;
+$gray-25: #FAFAFA;
 $gray-50: #F3F3F3;
-$gray-100: #E7E5E4 !default;
+$gray-100: #EAEAEA !default;
 $gray-200: #D5D5D5 !default;
 $gray-300: #B3B3B3 !default;
 $gray-400: #999999 !default;
@@ -27,9 +27,9 @@ $container-max-widths: (
   sm: 540px,
   md: 720px,
   lg: 960px,
-  xl: 1240px
+  xl: 1272px
 ) !default;
-
+$grid-gutter-width: 16px !default;
 
 $theme-colors: (
   "white": $white,

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

@@ -171,6 +171,9 @@ strong {
 .cursor-not-allowed {
   cursor: not-allowed !important;
 }
+.cursor-help {
+  cursor: help;
+}
 
 .active {
   color: theme-color('primary');
@@ -445,6 +448,9 @@ small,
 .opacity-50 {
   opacity: 0.5;
 }
+.opacity-75 {
+  opacity: 0.75;
+}
 .opacity-0 {
   opacity: 0;
 }

data/app/controllers/concerns/spree/admin/order_breadcrumb_concern.rb

@@ -0,0 +1,12 @@
+module Spree
+  module Admin
+    module OrderBreadcrumbConcern
+      extend ActiveSupport::Concern
+
+      included do
+        add_breadcrumb Spree.t(:orders), :admin_orders_path
+        add_breadcrumb_icon 'inbox'
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ module Spree
     class OrdersController < Spree::Admin::BaseController
       include Spree::Admin::OrderConcern
       include Spree::Admin::OrdersFiltersHelper
+      include Spree::Admin::OrderBreadcrumbConcern
 
       before_action :initialize_order_events
       before_action :load_order, only: %i[edit cancel resend]
@@ -11,9 +12,6 @@ module Spree
 
       helper_method :model_class
 
-      add_breadcrumb Spree.t(:orders), :admin_orders_path
-      add_breadcrumb_icon 'inbox'
-
       def create
         @order = Spree::Order.create(created_by: try_spree_current_user, store: current_store)
 
@@ -66,7 +64,7 @@ module Spree
 
       def order_params
         params[:created_by_id] = try_spree_current_user.try(:id)
-        params.permit(:created_by_id, :user_id, :store_id, :channel)
+        params.permit(:created_by_id, :user_id, :store_id, :channel, tag_list: [])
       end
 
       def load_order

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

@@ -47,7 +47,9 @@ module Spree
 
       def permitted_resource_params
         params.require(:page_block).permit(
-          permitted_page_block_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" }
+          permitted_page_block_attributes +
+          [link_attributes: permitted_page_link_attributes + [:id]] +
+          @object.preferences.keys.map { |key| "preferred_#{key}" }
         )
       end
     end

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

@@ -71,7 +71,11 @@ module Spree
       end
 
       def permitted_resource_params
-        params.require(:page_section).permit(permitted_page_section_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" })
+        params.require(:page_section).permit(
+          permitted_page_section_attributes +
+          [link_attributes: permitted_page_link_attributes + [:id]] +
+          @object.preferences.keys.map { |key| "preferred_#{key}" }
+        )
       end
     end
   end

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

@@ -14,10 +14,10 @@ module Spree
         if params[:payment_method].present?
           payment_type = params[:payment_method].delete(:type)
           # Find the actual class from our allowed types rather than using constantize
-          payment_class = allowed_payment_types.find { |type| type.to_s == payment_type }
+          payment_class = allowed_payment_types.find { |type| type == payment_type }
 
-          if payment_class
-            @object = payment_class.new
+          if payment_class.present?
+            @object = payment_class.constantize.new
           end
         end
       end
@@ -45,7 +45,9 @@ module Spree
       end
 
       def allowed_payment_types
-        Rails.application.config.spree.payment_methods
+        # We need to map to strings, otherwise some weird things happen with STI
+        # where Rails can't find the ancestor class when we try to save the payment method.
+        Rails.application.config.spree.payment_methods.map(&:to_s)
       end
 
       def permitted_resource_params

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

@@ -4,6 +4,12 @@ module Spree
       include StorefrontBreadcrumbConcern
       add_breadcrumb Spree.t(:posts), :admin_posts_path
       add_breadcrumb Spree.t(:categories), :admin_post_categories_path
+
+      private
+
+      def permitted_resource_params
+        params.require(:post_category).permit(permitted_post_category_attributes)
+      end
     end
   end
 end

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

@@ -35,6 +35,10 @@ module Spree
 
         add_breadcrumb @post.title, spree.edit_admin_post_path(@post)
       end
+
+      def permitted_resource_params
+        params.require(:post).permit(permitted_post_attributes)
+      end
     end
   end
 end

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

@@ -152,7 +152,7 @@ module Spree
       protected
 
       def find_resource
-        current_store.products.accessible_by(current_ability, :manage).with_deleted.friendly.find(params[:id])
+        current_store.products.accessible_by(current_ability, :manage).friendly.find(params[:id])
       end
 
       def load_data
@@ -180,10 +180,10 @@ module Spree
             @product_options[option_type.id.to_s] = {
               name: option_type.presentation,
               position: index + 1,
-              values: option_values.pluck(:presentation).uniq
+              values: option_values.pluck(:name, :presentation).uniq.map { |name, presentation| { value: name, text: presentation } }
             }
 
-            @product_available_options[option_type.id.to_s] = option_type.option_values.to_tom_select_json
+            @product_available_options[option_type.id.to_s] = option_type.option_values.pluck(:name, :presentation).uniq.map { |name, presentation| { id: name, name: presentation } }
           end
 
         @product_stock = {}
@@ -274,7 +274,7 @@ module Spree
                       for_ordering_with_translations(model_class, :name).
                       includes(product_includes).
                       page(params[:page]).
-                      per(params[:per_page] || ENV.fetch('ADMIN_PRODUCTS_PER_PAGE', 25))
+                      per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_products_per_page)
 
         @collection
       end

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

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class RefundsController < ResourceController
+      include Spree::Admin::OrderBreadcrumbConcern
+
       belongs_to 'spree/payment', find_by: :number
 
       before_action :load_order
@@ -18,6 +20,8 @@ module Spree
 
       def load_order
         @order = @payment.order if @payment
+
+        add_breadcrumb @order.number, spree.edit_admin_order_path(@order)
       end
 
       def refund_reasons

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

@@ -11,7 +11,7 @@ module Spree
       before_action :refresh_shipping_rates, only: :edit
 
       def update
-        @result = Spree::Dependencies.shipment_update_service.constantize.call(shipment: @shipment, shipment_attributes: shipment_params)
+        @result = Spree::Dependencies.shipment_update_service.constantize.call(shipment: @shipment, shipment_attributes: permitted_resource_params)
         flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:shipment)) if @result.success?
 
         redirect_back fallback_location: spree.edit_admin_order_path(@order)
@@ -94,7 +94,7 @@ module Spree
         @variant = current_store.variants.accessible_by(current_ability, :manage).find(params[:variant_id])
       end
 
-      def shipment_params
+      def permitted_resource_params
         params.require(:shipment).permit(permitted_shipment_attributes)
       end
     end

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

@@ -263,7 +263,7 @@ module Spree
       # @param css [String] the css class of the help bubble
       # @return [String] the help bubble with the icon
       def help_bubble(text = '', placement = 'bottom', css: nil)
-        css ||= 'text-muted'
+        css ||= 'text-muted opacity-75 cursor-help'
         content_tag :small, icon('info-square-rounded', class: css), data: { placement: placement }, class: "with-tip #{css}", title: text
       end
 

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

@@ -57,7 +57,7 @@ module Spree
         # lazy loading other models here (via includes) may result in an invalid query
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
         # see https://github.com/spree/spree/pull/3919
-        @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page])
+        @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_orders_per_page)
       end
 
       def load_user

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

@@ -26,8 +26,9 @@ export default class extends Controller {
   values() {
     return this.selectTargets
       .map((selectTarget) => selectTarget.querySelector('select'))
-      .map((select) => select.options[select.selectedIndex].text)
-      .filter((text) => text?.length > 0)
+      .map((select) => select.options[select.selectedIndex])
+      .filter((option) => option.value.length > 0)
+      .map((option) => ({ text: option.text, value: option.value}))
   }
 
   setValues() {

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

@@ -129,7 +129,7 @@ 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 !== internalName)
+        const newOptionValues = this.optionsValue[firstOptionKey].values.filter((value) => value.text !== internalName)
         if (newOptionValues.length === 0) {
           const newOptionsValue = this.optionsValue
           delete newOptionsValue[firstOptionKey]
@@ -265,12 +265,12 @@ export default class extends CheckboxSelectAll {
     let name = ''
     let internalName = name
     if (i === 0) {
-      name = variant[keys[i]]
+      name = variant[keys[i]].text
       internalName = name
     } else {
-      const namesPath = keys.slice(1, keys.length).map((key) => variant[key])
+      const namesPath = keys.slice(1, keys.length).map((key) => variant[key].text)
       name = namesPath.join(' / ')
-      internalName = `${variant[keys[0]]}/${namesPath.join('/')}`
+      internalName = `${variant[keys[0]].text}/${namesPath.join('/')}`
     }
 
     return { name, internalName }
@@ -572,12 +572,12 @@ export default class extends CheckboxSelectAll {
   refreshParentInputs() {
     const firstOption = Object.values(this.optionsValue)[0]
     if (firstOption) {
-      firstOption.values.forEach((name) => {
+      firstOption.values.forEach((option) => {
         this.currenciesValue.forEach((currency) => {
-          this.updateParentPriceRange(name, currency)
+          this.updateParentPriceRange(option.text, currency)
         })
         this.stockLocationsValue.forEach((stockLocationId) => {
-          this.updateParentStockSum(name, stockLocationId)
+          this.updateParentStockSum(option.text, stockLocationId)
         })
         this.updateShopLocationCountOnHand()
       })
@@ -615,11 +615,17 @@ export default class extends CheckboxSelectAll {
         .find((option) => option.name === key).position
       inputs.push(positionInput)
 
-      const valueInput = document.createElement('input')
-      valueInput.type = 'hidden'
-      valueInput.name = `product[variants_attributes][${i}][options][][value]`
-      valueInput.value = variant[key]
-      inputs.push(valueInput)
+      const optionNameInput = document.createElement('input')
+      optionNameInput.type = 'hidden'
+      optionNameInput.name = `product[variants_attributes][${i}][options][][option_value_name]`
+      optionNameInput.value = variant[key].value
+      inputs.push(optionNameInput)
+
+      const optionIdInput = document.createElement('input')
+      optionIdInput.type = 'hidden'
+      optionIdInput.name = `product[variants_attributes][${i}][options][][option_value_presentation]`
+      optionIdInput.value = variant[key].text
+      inputs.push(optionIdInput)
     })
 
     return inputs
@@ -924,8 +930,8 @@ export default class extends CheckboxSelectAll {
     const optionValuesSelectContainer = template.querySelector('[data-slot="optionValuesSelectContainer"]')
     const tomSelectOptionValues = optionValues.map((optionValue) => {
       return {
-        id: availableOptions.find((availableOption) => availableOption.name === optionValue)?.id,
-        name: optionValue
+        id: optionValue.value,
+        name: optionValue.text,
       }
     })
 
@@ -948,8 +954,8 @@ export default class extends CheckboxSelectAll {
     values.forEach((value) => {
       const template = this.optionValueTemplateTarget.content.cloneNode(true)
       const optionValueNameEl = template.querySelector('[data-slot="optionValueName"]')
-      optionValueNameEl.textContent = value
-      optionValueNameEl.dataset.name = value
+      optionValueNameEl.textContent = value.text
+      optionValueNameEl.dataset.name = value.text
 
       templates.push(template)
     })

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

@@ -0,0 +1,14 @@
+<% if @order.special_instructions.present? %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5 class="card-title">
+        <%= I18n.t('activerecord.attributes.spree/order.special_instructions') %>
+      </h5>
+    </div>
+    <div class="card-body">
+      <div class="card-text">
+        <%= simple_format(@order.special_instructions) %>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -15,6 +15,7 @@
     </div>
     <div class="col-lg-4">
       <%= render 'customer' %>
+      <%= render 'special_instructions' %>
       <%= render_admin_partials(:order_page_sidebar_partials, order: @order) %>
     </div>
   </div>

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

@@ -33,7 +33,8 @@
           <%= link_to_with_icon 'credit-card-refund', Spree.t(:refund), spree.new_admin_order_payment_refund_path(@order, payment), class: 'dropdown-item' %>
         <% end %>
         <% if can?(:cancel, payment) && payment.pending? %>
-          <%= link_to_with_icon 'cancel', Spree.t(:void), spree.void_admin_order_payment_path(@order, payment), class: 'dropdown-item', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>
+          <div class="dropdown-divider"></div>
+          <%= link_to_with_icon 'cancel', Spree.t(:void), spree.void_admin_order_payment_path(@order, payment), class: 'dropdown-item btn-danger', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>
         <% end %>
         <% if can?(:destroy, payment) && payment.can_be_deleted? %>
           <div class="dropdown-divider"></div>

data/app/views/spree/admin/preferences/_password_field.html.erb

@@ -3,7 +3,7 @@
     <div data-replace-target="from">
       <div readonly class="form-control d-flex align-items-center justify-content-between pr-1">
         <span class="text-muted">
-          ...<%= form.object.send(field).last(4) %>
+          ...<%= form.object.send(field)&.last(4) %>
         </span>
         <button class="btn btn-sm btn-light" type="button" data-action="click->replace#replace">
           <%= icon 'edit', class: 'mr-2' %>
@@ -23,4 +23,4 @@
   <% else %>
     <%= form.password_field(field, preference_field_options(options)) %>
   <% end %>
-</div>
+</div>

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

@@ -7,13 +7,14 @@
     <% end unless @product.has_variants? %>
     <%= render 'spree/admin/products/form/variants', f: f %>
     <%= render 'spree/admin/products/form/inventory', f: f unless @product.has_variants? %>
-    <%= render 'spree/admin/products/form/shipping', f: f %>
     <%= render 'spree/admin/products/form/properties', f: f %>
     <%= render_admin_partials(:product_form_partials, f: f, product: @product) %>
   </div>
   <div class="col-md-4">
     <%= render 'spree/admin/products/form/status', f: f %>
     <%= render 'spree/admin/products/form/categorization', f: f %>
+    <%= render 'spree/admin/products/form/shipping', f: f %>
+    <%= render 'spree/admin/products/form/tax', f: f %>
     <%= render 'spree/admin/products/form/stores', f: f if available_stores.count > 1 %>
     <%= render_admin_partials(:product_form_sidebar_partials, f: f, product: @product) %>
 

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

@@ -15,8 +15,11 @@
                   <%= 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">
                   <%= Spree.t(:status) %>

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

@@ -0,0 +1,12 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:tax) %></h5>
+  </div>
+  <div class="card-body">
+    <div class="form-group">
+      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+      <%= f.select(:tax_category_id, @tax_categories.pluck(:name, :id), { include_blank: false }, { class: 'custom-select' }) %>
+      <%= f.error_message_on :tax_category %>
+    </div>
+  </div>
+</div>

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

@@ -1,7 +1,5 @@
-<%= render 'spree/admin/orders/header' %>
-
-<div class="row">
-  <div class="col-lg-6">
+<div class="row mt-4">
+  <div class="col-lg-6 offset-lg-3">
     <%= render 'spree/admin/shared/error_messages', target: @refund %>
 
     <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>

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

@@ -11,7 +11,7 @@
     <h3 class="page-header-title mb-0 d-flex align-items-center gap-3">
       <%= yield :page_title %>
     </h3>
-    <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-3">
+    <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-2">
       <% if action_name == 'index' && defined?(model_class) && model_class && Spree::Export.available_models.include?(model_class) && can?(:create, Spree::Export) %>
         <span data-toggle="modal" data-target="#modal">
           <%= link_to spree.new_admin_export_path(export: { search_params: params[:q]&.to_json, type: Spree::Export.type_for_model(model_class) }), class: 'btn btn-light bg-transparent with-tip', title: 'Download records as CSV file', data: { turbo_frame: :dialog_modal } do %>

data/app/views/spree/admin/shared/_filter_badge_template.erb

@@ -1,3 +1,3 @@
 <template data-filters-target="badgeTemplate">
-  <span class="badge py-1 px-2 bg-light text-dark d-flex-inline align-items-center mb-0">LABEL<a href="DELETE_URL" class="btn-close ml-2" title="Remove"></a></span>
+  <span class="badge py-0 pl-2 pr-0 bg-light text-dark d-flex-inline align-items-center mb-0">LABEL<a href="DELETE_URL" class="btn-close ml-2" title="<%= Spree.t('actions.remove') %>"></a></span>
 </template>

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

@@ -1,4 +1,4 @@
-<% orders_active = %[orders checkouts].include?(controller_name) || @order %>
+<% orders_active = %[orders checkouts].include?(controller_name) || @order&.present? || @parent&.is_a?(Spree::Order) %>
 <% if can?(:manage, Spree::Order) %>
   <% orders_label = Spree.t(:orders) %>
   <% if ready_to_ship_orders_count&.positive? %>

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

@@ -1,6 +1,6 @@
-<% content_for :head do %>
-  <script type="text/javascript" src="https://cdn.goentri.com/entri.js"></script>
-<% end if entri_enabled? %>
+<%= content_for :page_actions do %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_store_#{current_store.id}" %>
+<% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store }, class: 'mb-5 pb-5' %>
 

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

@@ -31,18 +31,38 @@
   <div class="col-lg-5">
     <div class="card mb-4">
       <div class="card-header">
-        <h5 class="card-title"><%= Spree.t(:guest_checkout) %></h5>
+        <h5 class="card-title"><%= Spree.t(:settings) %></h5>
       </div>
 
       <div class="card-body">
-        <p class="text-muted">
-          <%= Spree.t('admin.checkout_settings.guest_checkout.description') %>
-        </p>
-
         <div class="custom-control custom-checkbox mb-3">
           <%= f.check_box :preferred_guest_checkout, class: "custom-control-input" %>
           <%= f.label :preferred_guest_checkout, Spree.t('admin.checkout_settings.guest_checkout.label'), class: "custom-control-label" %>
           <%= f.error_message_on :preferred_guest_checkout %>
+
+          <p class="text-muted mt-1">
+            <%= Spree.t('admin.checkout_settings.guest_checkout.description') %>
+          </p>
+        </div>
+
+        <div class="custom-control custom-checkbox mb-3">
+          <%= f.check_box :preferred_company_field_enabled, class: "custom-control-input" %>
+          <%= f.label :preferred_company_field_enabled, Spree.t('admin.store_form.company_field.label'), class: "custom-control-label" %>
+          <%= f.error_message_on :preferred_company_field_enabled %>
+
+          <div class="text-muted mt-1">
+            <%= Spree.t('admin.store_form.company_field.description') %>
+          </div>
+        </div>
+
+        <div class="custom-control custom-checkbox">
+          <%= f.check_box :preferred_special_instructions_enabled, class: "custom-control-input" %>
+          <%= f.label :preferred_special_instructions_enabled, Spree.t('admin.checkout_settings.special_instructions.label'), class: "custom-control-label" %>
+          <%= f.error_message_on :preferred_special_instructions_enabled %>
+
+          <p class="text-muted mt-1">
+            <%= Spree.t('admin.checkout_settings.special_instructions.description') %>
+          </p>
         </div>
       </div>
     </div>

data/app/views/spree/admin/variants/_variant.html.erb

@@ -1,12 +1,12 @@
 <% cache variant do %>
-  <% if variant.is_master? %>
+  <% if variant.is_master? || variant.product.deleted? %>
     <% variant_url = spree.edit_admin_product_path(variant.product) %>
   <% else %>
     <% variant_url = spree.edit_admin_product_variant_path(variant.product, variant) %>
   <% end %>
 
   <%= link_to variant_url, id: spree_dom_id(variant), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'd-flex align-items-center justify-content-start text-decoration-none' do %>
-    <%= render 'spree/admin/shared/product_image', object: variant %>
+    <%= render "spree/admin/shared/product_image", object: variant %>
     <div class="ml-3">
       <strong><%= variant.name %></strong>
       <% if variant.options_text.present? %>

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

@@ -5,22 +5,22 @@
     </h5>
   </div>
   <div class="card-body">
-    <div class="form-group" data-hook="sku">
+    <div class="form-group">
       <%= f.label :sku, Spree.t(:sku) %>
       <%= f.text_field :sku, class: 'form-control' %>
     </div>
 
-    <div class="form-group" data-hook="sku">
+    <div class="form-group">
       <%= f.label :barcode, Spree.t(:barcode) %>
       <%= f.text_field :barcode, class: 'form-control' %>
     </div>
 
-    <div class="form-group" data-hook="tax_category">
+    <div class="form-group">
       <%= f.label :tax_category_id, Spree.t(:tax_category) %>
       <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { data: { controller: 'autocomplete-select' } }) %>
     </div>
 
-    <div class="form-group" data-hook="discontinue_on">
+    <div class="form-group">
       <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
       <%= f.error_message_on :discontinue_on %>
       <%= f.date_field :discontinue_on, class: 'form-control' %>

data/config/locales/en.yml

@@ -43,6 +43,9 @@ en:
           description: Allow customers to checkout without creating an account.
           label: Allow guest checkout
         policy_copy: Checkout footer links are added automatically based on the %{policies_link} content.
+        special_instructions:
+          description: Allow customers to add special instructions to their order.
+          label: Display the special instructions field
       copied: Copied!
       copy_payment_link: Copy Payment Link
       copy_to_clipboard: Copy to clipboard
@@ -193,6 +196,9 @@ en:
       store_credit:
         amount_remaining_of_total: "<strong>%{amount}</strong> remaining (<strong>%{total}</strong> total)"
       store_form:
+        company_field:
+          description: It shows the company field on the address form in the My Account section and on the checkout address step.
+          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
       store_setup_tasks:

data/lib/spree/admin/testing_support/tom_select.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Admin
+    module TestingSupport
+      module TomSelect
+        def tom_select(value, from:, create: false)
+          fill_in(from, with: value, visible: false)
+
+          if create
+            first('.ts-dropdown .ts-dropdown-content .create.active').click
+          else
+            first('.ts-dropdown .ts-dropdown-content .option', text: /#{Regexp.quote(value)}/i).click
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta2
+  version: 5.1.0.beta4
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-06-04 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.0.beta2
+        version: 5.1.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta2
+        version: 5.1.0.beta4
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta2
+        version: 5.1.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta2
+        version: 5.1.0.beta4
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +328,7 @@ files:
 - app/controllers/concerns/spree/admin/analytics_concern.rb
 - app/controllers/concerns/spree/admin/breadcrumb_concern.rb
 - app/controllers/concerns/spree/admin/bulk_operations_concern.rb
+- app/controllers/concerns/spree/admin/order_breadcrumb_concern.rb
 - app/controllers/concerns/spree/admin/order_concern.rb
 - app/controllers/concerns/spree/admin/page_builder_concern.rb
 - app/controllers/concerns/spree/admin/preferences_concern.rb
@@ -601,6 +602,7 @@ files:
 - app/views/spree/admin/orders/_shipment.html.erb
 - app/views/spree/admin/orders/_shipment_manifest_item.html.erb
 - app/views/spree/admin/orders/_shipments.html.erb
+- app/views/spree/admin/orders/_special_instructions.html.erb
 - app/views/spree/admin/orders/_summary.html.erb
 - app/views/spree/admin/orders/_summary_custom.html.erb
 - app/views/spree/admin/orders/_table_filter_dropdown.html.erb
@@ -789,6 +791,7 @@ files:
 - app/views/spree/admin/products/form/_shipping.html.erb
 - app/views/spree/admin/products/form/_status.html.erb
 - app/views/spree/admin/products/form/_stores.html.erb
+- app/views/spree/admin/products/form/_tax.html.erb
 - app/views/spree/admin/products/form/_variants.html.erb
 - app/views/spree/admin/products/form/variants/_option_template.html.erb
 - app/views/spree/admin/products/form/variants/_variant_template.html.erb
@@ -1083,6 +1086,7 @@ files:
 - lib/spree/admin/engine.rb
 - lib/spree/admin/runtime_configuration.rb
 - lib/spree/admin/testing_support/capybara_utils.rb
+- lib/spree/admin/testing_support/tom_select.rb
 - lib/spree_admin.rb
 - vendor/javascript/@easepick--base-plugin.js
 - vendor/javascript/@easepick--core.js
@@ -1115,9 +1119,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.0.beta2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta4
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta2
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta4
 post_install_message:
 rdoc_options: []
 require_paths: