spree_admin 5.0.6 → 5.1.0.beta

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

@@ -1,12 +1,12 @@
 <% cache variant do %>
-  <% if variant.is_master? || variant.product.deleted? %>
+  <% if variant.is_master? %>
     <% 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">
+    <div class="form-group" data-hook="sku">
       <%= f.label :sku, Spree.t(:sku) %>
       <%= f.text_field :sku, class: 'form-control' %>
     </div>
 
-    <div class="form-group">
+    <div class="form-group" data-hook="sku">
       <%= f.label :barcode, Spree.t(:barcode) %>
       <%= f.text_field :barcode, class: 'form-control' %>
     </div>
 
-    <div class="form-group">
+    <div class="form-group" data-hook="tax_category">
       <%= 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">
+    <div class="form-group" data-hook="discontinue_on">
       <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
       <%= f.error_message_on :discontinue_on %>
       <%= f.date_field :discontinue_on, class: 'form-control' %>

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

@@ -1,4 +1,4 @@
-<div id="<%= spree_dom_id(asset) %>" class="media-form__image border border-gray-200" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">
+<div id="<%= spree_dom_id(asset) %>" class="media-form__image" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">
   <div class="custom-control custom-checkbox d-none">
     <%= check_box_tag "ids[]", asset.id, false, class: "custom-control-input", id: "#{asset.id}-checkbox", data: { media_form_target: "checkbox", action: 'media-form#showDeleteButton' } %>
     <label class="custom-control-label" for="<%= asset.id %>-checkbox"><span></span></label>

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

@@ -8,7 +8,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:url) %></th>
             <th><%= Spree.t(:active) %></th>

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

@@ -17,26 +17,22 @@
           <%= zone_form.text_field :description, class: 'form-control' %>
         </div>
 
-        <div class="form-group checkbox">
-          <%= label_tag "zone[#{:default_tax}" do %>
-            <%= zone_form.check_box :default_tax %>
-            <%= Spree.t(:default_tax_zone) %>
-          <% end %>
+        <div class="form-group">
+          <div class="custom-control custom-checkbox">
+            <%= zone_form.check_box :default_tax, class: 'custom-control-input' %>
+            <%= zone_form.label :default_tax, Spree.t(:default_tax_zone), class: 'custom-control-label' %>
+          </div>
         </div>
 
         <div class="form-group">
           <strong><%= Spree.t(:type) %></strong>
-          <div class="radio my-2">
-            <%= label_tag :country_based do %>
-              <%= zone_form.radio_button :kind, :country, id: 'country_based', data: { action: 'auto-submit#submit' }  %>
-              <%= Spree.t(:country_based) %>
-            <% end %>
+          <div class="custom-control custom-radio my-2">
+            <%= zone_form.radio_button :kind, :country, id: 'country_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
+            <%= label_tag :country_based, Spree.t(:country_based), class: 'custom-control-label' %>
           </div>
-          <div class="radio my-2">
-            <%= label_tag :state_based do %>
-              <%= zone_form.radio_button :kind, :state, id: 'state_based', data: { action: 'auto-submit#submit' } %>
-              <%= Spree.t(:state_based) %>
-            <% end %>
+          <div class="custom-control custom-radio my-2">
+            <%= zone_form.radio_button :kind, :state, id: 'state_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
+            <%= label_tag :state_based, Spree.t(:state_based), class: 'custom-control-label' %>
           </div>
         </div>
       </div>

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

@@ -16,7 +16,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
         <tr>
           <th><%= sort_link @search,:name, Spree.t(:name) %></th>
           <th>

data/config/locales/en.yml

@@ -74,6 +74,9 @@ en:
       export_only_filtered_records: Export only filtered records, matching the search criteria
       filters: Filters
       getting_started: Getting started
+      integrations:
+        invalid_integration_type: This integration is not allowed
+        page_subtitle: Connect your store to third-party services to enhance customer experience.
       manage_currencies: Manage Currencies
       manage_properties: Manage Properties
       manage_stock_locations: Manage Stock Locations
@@ -138,6 +141,7 @@ en:
         maximum_products_to_show: Maximum products to show
         nav_centered: Nav centered
         not_set: Not set
+        posts_to_show: Posts to show
         separated: Separated
         show_more_button: Show explore category button
         show_taxon_image: Show taxon image

data/config/routes.rb

@@ -147,7 +147,9 @@ Spree::Core::Engine.add_routes do
       end
     end
     # setting up a new store
-    resources :stores, only: [:new, :create]
+    resources :stores, only: [:new, :create] do
+      resources :role_users, only: [:destroy]
+    end
     resources :payment_methods, except: :show
     resources :shipping_methods, except: :show
     resources :shipping_categories, except: :show
@@ -165,6 +167,9 @@ Spree::Core::Engine.add_routes do
     end
     resources :custom_domains, except: :show
 
+    # integrations
+    resources :integrations
+
     # storefront / page builder
     resource :storefront, only: [:edit, :update], controller: :storefront
     resources :themes, except: [:new, :show] do
@@ -214,6 +219,13 @@ Spree::Core::Engine.add_routes do
 
     # account management
     resources :roles, except: :show
+    resources :invitations, except: [:edit, :update] do
+      member do
+        put :accept
+        put :resend
+      end
+    end
+    resources :admin_users, except: [:destroy]
 
     # Action Text
     namespace :action_text do

data/lib/spree/admin/engine.rb

@@ -22,6 +22,7 @@ module Spree
         :store_form_partials,
         :store_nav_partials,
         :settings_nav_partials,
+        :shipping_method_form_partials,
         :store_settings_nav_partials,
         :store_orders_nav_partials,
         :store_products_nav_partials,
@@ -97,6 +98,7 @@ module Spree
         Rails.application.config.spree_admin.store_form_partials = []
         Rails.application.config.spree_admin.store_nav_partials = []
         Rails.application.config.spree_admin.settings_nav_partials = []
+        Rails.application.config.spree_admin.shipping_method_form_partials = []
         Rails.application.config.spree_admin.store_settings_nav_partials = []
         Rails.application.config.spree_admin.store_orders_nav_partials = []
         Rails.application.config.spree_admin.store_products_nav_partials = []

data/lib/spree/admin.rb

@@ -4,6 +4,7 @@ require 'spree_api'
 require 'sprockets/railtie'
 
 require 'active_link_to'
+require 'breadcrumbs_on_rails'
 require 'chartkick'
 require 'currency_select'
 require 'groupdate'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.1.0.beta
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-05-20 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.0.6
+        version: 5.1.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: 5.1.0.beta
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: 5.1.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: 5.1.0.beta
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.6.2.1
+- !ruby/object:Gem::Dependency
+  name: breadcrumbs_on_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +280,7 @@ files:
 - Rakefile
 - app/assets/config/spree_admin_manifest.js
 - app/assets/images/favicon_256x256.png
+- app/assets/images/login_sidebar_background.png
 - app/assets/stylesheets/spree/admin/actiontext.css
 - app/assets/stylesheets/spree/admin/application.scss
 - app/assets/stylesheets/spree/admin/components/_alerts.scss
@@ -311,11 +326,17 @@ files:
 - app/assets/stylesheets/spree/admin/views/_dashboard.scss
 - app/assets/stylesheets/spree/admin/views/_page_builder.scss
 - 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_concern.rb
 - app/controllers/concerns/spree/admin/page_builder_concern.rb
+- app/controllers/concerns/spree/admin/preferences_concern.rb
+- app/controllers/concerns/spree/admin/products_breadcrumb_concern.rb
+- app/controllers/concerns/spree/admin/promotions_breadcrumb_concern.rb
+- app/controllers/concerns/spree/admin/storefront_breadcrumb_concern.rb
 - app/controllers/spree/admin/action_text/video_embeds_controller.rb
 - app/controllers/spree/admin/addresses_controller.rb
+- app/controllers/spree/admin/admin_users_controller.rb
 - app/controllers/spree/admin/assets_controller.rb
 - app/controllers/spree/admin/base_controller.rb
 - app/controllers/spree/admin/checkouts_controller.rb
@@ -327,6 +348,8 @@ files:
 - app/controllers/spree/admin/digital_assets_controller.rb
 - app/controllers/spree/admin/errors_controller.rb
 - app/controllers/spree/admin/exports_controller.rb
+- app/controllers/spree/admin/integrations_controller.rb
+- app/controllers/spree/admin/invitations_controller.rb
 - app/controllers/spree/admin/line_items_controller.rb
 - app/controllers/spree/admin/oauth_applications_controller.rb
 - app/controllers/spree/admin/option_types_controller.rb
@@ -362,6 +385,7 @@ files:
 - app/controllers/spree/admin/return_authorization_reasons_controller.rb
 - app/controllers/spree/admin/return_authorizations_controller.rb
 - app/controllers/spree/admin/return_items_controller.rb
+- app/controllers/spree/admin/role_users_controller.rb
 - app/controllers/spree/admin/roles_controller.rb
 - app/controllers/spree/admin/shipments_controller.rb
 - app/controllers/spree/admin/shipping_categories_controller.rb
@@ -379,6 +403,8 @@ files:
 - app/controllers/spree/admin/taxons_controller.rb
 - app/controllers/spree/admin/themes_controller.rb
 - app/controllers/spree/admin/translations_controller.rb
+- app/controllers/spree/admin/user_passwords_controller.rb
+- app/controllers/spree/admin/user_sessions_controller.rb
 - app/controllers/spree/admin/users_controller.rb
 - app/controllers/spree/admin/variants_controller.rb
 - app/controllers/spree/admin/webhooks_subscribers_controller.rb
@@ -471,9 +497,17 @@ files:
 - app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb
 - app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb
 - app/views/layouts/spree/admin.html.erb
+- app/views/layouts/spree/minimal.html.erb
 - app/views/layouts/spree/page_builder.html.erb
 - app/views/spree/admin/addresses/edit.html.erb
 - app/views/spree/admin/addresses/new.html.erb
+- app/views/spree/admin/admin_users/_admin_user.html.erb
+- app/views/spree/admin/admin_users/_audit_log.html.erb
+- app/views/spree/admin/admin_users/_form.html.erb
+- app/views/spree/admin/admin_users/edit.html.erb
+- app/views/spree/admin/admin_users/index.html.erb
+- app/views/spree/admin/admin_users/new.html.erb
+- app/views/spree/admin/admin_users/show.html.erb
 - app/views/spree/admin/assets/bulk_destroy.turbo_stream.erb
 - app/views/spree/admin/assets/create.turbo_stream.erb
 - app/views/spree/admin/assets/destroy.turbo_stream.erb
@@ -524,6 +558,15 @@ files:
 - app/views/spree/admin/exports/create.turbo_stream.erb
 - app/views/spree/admin/exports/index.html.erb
 - app/views/spree/admin/exports/new.html.erb
+- app/views/spree/admin/integrations/_integration.html.erb
+- app/views/spree/admin/integrations/edit.html.erb
+- app/views/spree/admin/integrations/index.html.erb
+- app/views/spree/admin/integrations/new.html.erb
+- app/views/spree/admin/invitations/_invitation.html.erb
+- app/views/spree/admin/invitations/create.turbo_stream.erb
+- app/views/spree/admin/invitations/index.html.erb
+- app/views/spree/admin/invitations/new.html.erb
+- app/views/spree/admin/invitations/show.html.erb
 - app/views/spree/admin/line_items/edit.html.erb
 - app/views/spree/admin/line_items/new.html.erb
 - app/views/spree/admin/oauth_applications/_form.html.erb
@@ -746,7 +789,6 @@ 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
@@ -827,6 +869,7 @@ files:
 - app/views/spree/admin/shared/_alerts.html.erb
 - app/views/spree/admin/shared/_analytics_loader_skeleton.html.erb
 - app/views/spree/admin/shared/_audit_nav.html.erb
+- app/views/spree/admin/shared/_breadcrumbs.html.erb
 - app/views/spree/admin/shared/_bulk_modal.html.erb
 - app/views/spree/admin/shared/_calculator_fields.html.erb
 - app/views/spree/admin/shared/_calendar_range_picker.html.erb
@@ -848,6 +891,7 @@ files:
 - app/views/spree/admin/shared/_map.html.erb
 - app/views/spree/admin/shared/_modal.html.erb
 - app/views/spree/admin/shared/_multi_product_picker.html.erb
+- app/views/spree/admin/shared/_new_item_dropdown.html.erb
 - app/views/spree/admin/shared/_new_resource_links.html.erb
 - app/views/spree/admin/shared/_no_image.html.erb
 - app/views/spree/admin/shared/_no_resource_found.html.erb
@@ -865,8 +909,10 @@ files:
 - app/views/spree/admin/shared/_spinner.html.erb
 - app/views/spree/admin/shared/_stock_nav.html.erb
 - app/views/spree/admin/shared/_tax_nav.html.erb
+- app/views/spree/admin/shared/_team_nav.html.erb
 - app/views/spree/admin/shared/_user.html.erb
 - app/views/spree/admin/shared/_user_dropdown.html.erb
+- app/views/spree/admin/shared/devise/_links.html.erb
 - app/views/spree/admin/shared/named_types/_edit.html.erb
 - app/views/spree/admin/shared/named_types/_form.html.erb
 - app/views/spree/admin/shared/named_types/_new.html.erb
@@ -875,6 +921,7 @@ files:
 - app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb
 - app/views/spree/admin/shared/sidebar/_orders_nav.html.erb
 - app/views/spree/admin/shared/sidebar/_products_nav.html.erb
+- app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb
 - app/views/spree/admin/shared/sidebar/_returns_nav.html.erb
 - app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
 - app/views/spree/admin/shared/sidebar/_store_nav.html.erb
@@ -891,6 +938,12 @@ files:
 - app/views/spree/admin/shipping_methods/_form.html.erb
 - app/views/spree/admin/shipping_methods/_shipping_method.html.erb
 - app/views/spree/admin/shipping_methods/edit.html.erb
+- app/views/spree/admin/shipping_methods/form/_display.html.erb
+- app/views/spree/admin/shipping_methods/form/_estimated_transit_business_days.html.erb
+- app/views/spree/admin/shipping_methods/form/_shipping_categories.html.erb
+- app/views/spree/admin/shipping_methods/form/_tax_category.html.erb
+- app/views/spree/admin/shipping_methods/form/_tracking_url.html.erb
+- app/views/spree/admin/shipping_methods/form/_zones.html.erb
 - app/views/spree/admin/shipping_methods/index.html.erb
 - app/views/spree/admin/shipping_methods/new.html.erb
 - app/views/spree/admin/shipping_methods/update.turbo_stream.erb
@@ -969,6 +1022,9 @@ files:
 - app/views/spree/admin/translations/stores/_form.html.erb
 - app/views/spree/admin/translations/taxonomies/_form.html.erb
 - app/views/spree/admin/translations/taxons/_form.html.erb
+- app/views/spree/admin/user_passwords/edit.html.erb
+- app/views/spree/admin/user_passwords/new.html.erb
+- app/views/spree/admin/user_sessions/new.html.erb
 - app/views/spree/admin/users/_billing.html.erb
 - app/views/spree/admin/users/_details.html.erb
 - app/views/spree/admin/users/_extra_actions.html.erb
@@ -1059,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.0.6
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.6
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta
 post_install_message:
 rdoc_options: []
 require_paths:

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

@@ -1,12 +0,0 @@
-<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>