spree_admin 5.1.0.beta3 → 5.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad8df3c5f0debff456ba6a1a0e71dc8d30fec31ad3ba5d64bfe0cab5d38d16de
-  data.tar.gz: 57aa367a0b8685fa0a58256572a3251a3b85174de87285533b1a29078209fbef
+  metadata.gz: 3f5759966c4d6a61b9c2b51e85b01e209cefabf35fb2ec0934623d21f1937e23
+  data.tar.gz: '0994653a7d251af2746bde91daf82e7ea397063821f4f8019face626deb733d6'
 SHA512:
-  metadata.gz: c6296a732fe8e299b6b9081110b63a83f7b583488365c90b7611cbc00bf1f4162519f56817672dc20d4f2e5898aaf44f39e0e77a0ff70e10642981c44160b7ef
-  data.tar.gz: 97d4e2b93be33bc4ba57fc8cdea559720c117628f28029cecc39bdb0dda53473b4bf513e190a7ab2ceca512d827d08250d9f63bf7eefe1e290fc7545c9b56f59
+  metadata.gz: 55e5ffcfc30c9238cbe32909defe509b7a9dd919d80589cafcc24031acbd6559bd05c56aea57bd62dbbc06ae496b6787a087b3ac9a5306b141924884b6e5896a
+  data.tar.gz: 838eba52a5b8bc939c4c7ac5a541cc621f1f347f43f0354a591c973a13c33fea7a2cc79ea18e88f1f1bf0d41c4e34a27bebf418640bc1e5a8a4cb5fdbe3f1748

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

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

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

@@ -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 = {}

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta3
+  version: 5.1.0.beta4
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-29 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.beta3
+        version: 5.1.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta3
+        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.beta3
+        version: 5.1.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta3
+        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
@@ -1118,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.beta3
+  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.beta3
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta4
 post_install_message:
 rdoc_options: []
 require_paths: