spree_admin 5.1.0.beta → 5.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e1ac13d6758a403cfb0bbe73dc321c2c5f853c1910c8bc680d9fb0d366f599c
-  data.tar.gz: 1a475cbd3c432b53f0bcf9e940d596af75f02da95ab17e6b8af53e5167575eb7
+  metadata.gz: a9de1e5e85e6639aa2f1798ff7d6c6d77116a702da71c872463a882157a22209
+  data.tar.gz: 067c530bc16335b4a43d086de3269aec4dd0d5381ebb518219cde01bea6097f3
 SHA512:
-  metadata.gz: b92a3f1848e75f3a03f363d5339afffda9ba16f9a956660ad704082dd423a9f6c45b4493dd0f2b5d973a0203631de95d58afb31ef2bfcf9f40381efbddb4f251
-  data.tar.gz: 5cfcc7b93f6f46e0f6f1e5ee337d6282cf02c62be8ef3b22e6f8bf198a11f451047492359cafbe3a8302b65f1fa062c3f6405b89fe8cf08d0b91e9b4bd4ae679
+  metadata.gz: e57033091798721e3017a6748f52ffb6a6384f25bc456294089bdf97625a8c78b1827e9bd70896114a789c5eb68ef4c6d2d8b1b695323765cdd6c6d584a0f535
+  data.tar.gz: '015298e7d0b7032889630f8a150405e6f9ee5bb568da96f30415da0d9d066b13bce38dee9e54cbe8abd3e669ca5c090868b3096d013c48b46398eacf4033003d'

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

@@ -44,6 +44,12 @@ module Spree
           *parent&.available_blocks_to_add
         ].uniq.sort_by(&:name)
       end
+
+      def permitted_resource_params
+        params.require(:page_block).permit(
+          permitted_page_block_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" }
+        )
+      end
     end
   end
 end

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

@@ -25,8 +25,10 @@ module Spree
             icon('credit-card-refund') + Spree.t('payment_states.refunded')
           elsif order.partially_refunded?
             icon('credit-card-refund') + Spree.t('payment_states.partially_refunded')
-          elsif order.payment_state == 'failed' || order.payment_state == 'void'
+          elsif order.payment_state == 'failed'
             icon('cancel') + Spree.t('payment_states.failed')
+          elsif order.payment_state == 'void'
+            icon('cancel') + Spree.t('payment_states.void')
           elsif order.payment_state == 'paid'
             icon('check') + Spree.t('payment_states.paid')
           else

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

@@ -5,20 +5,20 @@
       <%= f.text_field :name, class: "form-control", autofocus: f.object.new_record?, required: true %>
       <%= f.error_message_on :name %>
     </div>
-    <%- if @reimbursement_type.new_record? %>
-      <div class="form-group">
-        <%= f.label :type, Spree.t(:type) %>
-        <%= f.select :type,
-                 options_for_select(
-                   Spree::ReimbursementType::KINDS.map do |kind|
-                     [kind.demodulize.titleize, kind]
-                   end,
-                 ),
-                 { include_blank: false },
-                 { class: "custom-select" } %>
-        <%= f.error_message_on :type %>
-      </div>
-    <% end %>
+
+    <div class="form-group">
+      <%= f.label :type, Spree.t(:type) %>
+      <%= f.select :type,
+                options_for_select(
+                  Spree::ReimbursementType::KINDS.map do |kind|
+                    [kind.demodulize.titleize, kind]
+                  end,
+                ),
+                { include_blank: false },
+                { class: "custom-select" } %>
+      <%= f.error_message_on :type %>
+    </div>
+
     <div class="form-group">
       <div class="custom-control custom-checkbox">
         <%= f.check_box :active, class: "custom-control-input" %>
@@ -26,5 +26,13 @@
       </div>
       <%= f.error_message_on :active %>
     </div>
+
+    <div class="form-group">
+      <div class="custom-control custom-checkbox">
+        <%= f.check_box :mutable, class: "custom-control-input" %>
+        <%= f.label :mutable, Spree.t(:mutable), class: "custom-control-label" %>
+      </div>
+      <%= f.error_message_on :mutable %>
+    </div>
   </div>
 </div>

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

@@ -39,10 +39,6 @@
 
 <%= javascript_importmap_tags 'application-spree-admin', importmap: Rails.application.config.spree_admin.importmap %>
 
-<% if Rails.application.importmap.packages["application"].present? %>
-  <%= javascript_import_module_tag "application" %>
-<% end %>
-
 <%= yield :head %>
 
 <% if Rails.env.test? %>

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

@@ -1,7 +1,7 @@
 <% content_for(:title, Spree.t(:forgot_password)) %>
 
 <h1 class="mb-3 font-weight-light"><%= Spree.t(:change_password) %></h1>
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, data: { turbo_frame: :_top, turbo: false }) do |f| %>
+<%= form_for(resource, as: resource_name, url: password_path(:admin_user), html: { method: :put }, data: { turbo_frame: :_top, turbo: false }) do |f| %>
   <%= render partial: 'spree/admin/shared/error_messages', locals: { target: resource } %>
   <%= f.hidden_field :reset_password_token %>
   <div class="form-group mb-3">

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

@@ -1,7 +1,7 @@
 <% content_for(:title, Spree.t(:forgot_password)) %>
 
 <h1 class="mb-3 font-weight-light"><%= Spree.t(:forgot_password) %></h1>
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), data: { turbo_frame: :_top }) do |f| %>
+<%= form_for(resource, as: resource_name, url: password_path(:admin_user), data: { turbo_frame: :_top }) do |f| %>
   <div class="form-group mb-3">
     <%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>
     <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: 'steve@apple.com', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>

data/config/routes.rb

@@ -59,10 +59,10 @@ Spree::Core::Engine.add_routes do
         post :resend
         put :cancel
       end
-      resource :shipping_address, except: [:index, :show], controller: 'orders/shipping_address'
-      resource :billing_address, except: [:index, :show], controller: 'orders/billing_address'
+      resource :shipping_address, except: [:show], controller: 'orders/shipping_address'
+      resource :billing_address, except: [:show], controller: 'orders/billing_address'
       resource :contact_information, only: [:edit, :update], controller: 'orders/contact_information'
-      resource :user, except: [:edit, :show, :index], controller: 'orders/user'
+      resource :user, except: [:edit, :show], controller: 'orders/user'
       resources :shipments, only: [:edit, :update, :create], controller: 'shipments' do
         member do
           post :ship

data/lib/spree/admin/engine.rb

@@ -57,6 +57,8 @@ module Spree
         app.config.assets.paths << root.join('app/javascript')
         app.config.assets.paths << root.join('vendor/javascript')
         app.config.assets.precompile += %w[ spree_admin_manifest bootstrap.bundle.min.js jquery3.min.js ]
+        # fix for TinyMCE-rails gem to work with both propshaft and sprockets
+        app.config.assets.excluded_paths ||= []
       end
 
       initializer 'spree.admin.importmap', after: 'importmap' do |app|

data/lib/spree/admin.rb

@@ -17,8 +17,9 @@ require 'stimulus-rails'
 require 'local_time'
 require 'payment_icons'
 require 'dartsass-rails'
-require 'tinymce-rails'
 
 require 'spree/admin/action_callbacks'
 require 'spree/admin/callbacks'
 require 'spree/admin/engine'
+
+require 'tinymce-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta
+  version: 5.1.0.beta2
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2025-05-22 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.beta
+        version: 5.1.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0.beta2
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0.beta2
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -1115,9 +1115,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.beta
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta2
 post_install_message:
 rdoc_options: []
 require_paths: