Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

admin: added missing breadcrumbs

Damian Legawiecb7e4d8f9971a
diff --git a/admin/app/controllers/spree/admin/admin_users_controller.rb b/admin/app/controllers/spree/admin/admin_users_controller.rb
index f639ce2d8c..27c34b9918 100644
--- a/admin/app/controllers/spree/admin/admin_users_controller.rb
+++ b/admin/app/controllers/spree/admin/admin_users_controller.rb
@@ -1,6 +1,8 @@
module Spree
module Admin
class AdminUsersController < BaseController
+ add_breadcrumb Spree.t(:users), :admin_admin_users_path
+
skip_before_action :authorize_admin, only: [:new, :create]
before_action :load_parent, except: [:new, :create]
before_action :load_roles, except: [:index]
@@ -23,6 +25,8 @@ module Spree
def show
authorize! :read, @admin_user
@role_users = @admin_user.role_users.includes(:role).where(resource: @parent)
+
+ add_breadcrumb @admin_user.email, spree.admin_admin_user_path(@admin_user)
end
# GET /admin/admin_users/new?token=<token>
diff --git a/admin/app/controllers/spree/admin/custom_domains_controller.rb b/admin/app/controllers/spree/admin/custom_domains_controller.rb
index 63b98ad5b9..f71fddd41b 100644
--- a/admin/app/controllers/spree/admin/custom_domains_controller.rb
+++ b/admin/app/controllers/spree/admin/custom_domains_controller.rb
@@ -1,6 +1,8 @@
module Spree
module Admin
class CustomDomainsController < ResourceController
+ add_breadcrumb Spree.t(:domains), :admin_custom_domains_path
+
protected
def collection_url
diff --git a/admin/app/controllers/spree/admin/customer_returns_controller.rb b/admin/app/controllers/spree/admin/customer_returns_controller.rb
index 60d47efec8..8e45898a52 100644
--- a/admin/app/controllers/spree/admin/customer_returns_controller.rb
+++ b/admin/app/controllers/spree/admin/customer_returns_controller.rb
@@ -3,6 +3,7 @@ module Spree
class CustomerReturnsController < ResourceController
add_breadcrumb_icon 'receipt-refund'
add_breadcrumb Spree.t(:returns), :admin_customer_returns_path
+ add_breadcrumb Spree.t(:customer_returns), :admin_customer_returns_path
def index; end
diff --git a/admin/app/controllers/spree/admin/integrations_controller.rb b/admin/app/controllers/spree/admin/integrations_controller.rb
index 0e59e0c2b2..a3855e7556 100644
--- a/admin/app/controllers/spree/admin/integrations_controller.rb
+++ b/admin/app/controllers/spree/admin/integrations_controller.rb
@@ -10,6 +10,9 @@ module Spree
before_action :check_if_can_connect, only: %i[create update]
+ add_breadcrumb Spree.t(:integrations), :admin_integrations_path
+ add_breadcrumb_icon 'plug-connected'
+
private
def allowed_integration_types
diff --git a/admin/app/controllers/spree/admin/invitations_controller.rb b/admin/app/controllers/spree/admin/invitations_controller.rb
index 6c1834be0a..28e7a89cb2 100644
--- a/admin/app/controllers/spree/admin/invitations_controller.rb
+++ b/admin/app/controllers/spree/admin/invitations_controller.rb
@@ -3,6 +3,9 @@ module Spree
class InvitationsController < BaseController
skip_before_action :authorize_admin, only: [:show, :accept]
+ add_breadcrumb Spree.t(:users), :admin_admin_users_path
+ add_breadcrumb Spree.t(:invitations), :admin_invitations_path
+
before_action :load_parent, except: [:show]
before_action :load_invitation, only: [:destroy]
before_action :load_roles, only: [:new, :create]
diff --git a/admin/app/controllers/spree/admin/payment_methods_controller.rb b/admin/app/controllers/spree/admin/payment_methods_controller.rb
index 4b1a302428..184e1227c0 100644
--- a/admin/app/controllers/spree/admin/payment_methods_controller.rb
+++ b/admin/app/controllers/spree/admin/payment_methods_controller.rb
@@ -2,9 +2,11 @@ module Spree
module Admin
class PaymentMethodsController < ResourceController
include Spree::Admin::PreferencesConcern
+ add_breadcrumb Spree.t(:payment_methods), :admin_payment_methods_path
prepend_before_action :require_payment_type, only: [:new, :create]
before_action -> { clear_empty_password_preferences(:payment_method) }, only: :update
+ before_action :set_breadcrumb, only: :edit
private
@@ -29,6 +31,10 @@ module Spree
def require_payment_type
redirect_to spree.admin_payment_methods_path unless params.dig(:payment_method, :type).present?
end
+
+ def set_breadcrumb
+ add_breadcrumb @payment_method.name, spree.edit_admin_payment_method_path(@payment_method)
+ end
end
end
end
diff --git a/admin/app/controllers/spree/admin/roles_controller.rb b/admin/app/controllers/spree/admin/roles_controller.rb
index 4adbce634f..ed351a888c 100644
--- a/admin/app/controllers/spree/admin/roles_controller.rb
+++ b/admin/app/controllers/spree/admin/roles_controller.rb
@@ -1,6 +1,8 @@
module Spree
module Admin
class RolesController < ResourceController
+ add_breadcrumb Spree.t(:users), :admin_admin_users_path
+ add_breadcrumb Spree.t(:roles), :admin_roles_path
end
end
end
diff --git a/admin/app/controllers/spree/admin/shipping_categories_controller.rb b/admin/app/controllers/spree/admin/shipping_categories_controller.rb
index e9d1677027..c3eee1f92d 100644
--- a/admin/app/controllers/spree/admin/shipping_categories_controller.rb
+++ b/admin/app/controllers/spree/admin/shipping_categories_controller.rb
@@ -1,6 +1,7 @@
module Spree
module Admin
class ShippingCategoriesController < ResourceController
+ add_breadcrumb Spree.t(:shipping_categories), :admin_shipping_categories_path
end
end
end
diff --git a/admin/app/controllers/spree/admin/shipping_methods_controller.rb b/admin/app/controllers/spree/admin/shipping_methods_controller.rb
index 0ec29508a4..6e84dd3dd7 100644
--- a/admin/app/controllers/spree/admin/shipping_methods_controller.rb
+++ b/admin/app/controllers/spree/admin/shipping_methods_controller.rb
@@ -4,6 +4,8 @@ module Spree
before_action :load_data, except: :index
before_action :set_default_values, only: :new
+ add_breadcrumb Spree.t(:shipping_methods), :admin_shipping_methods_path
+
private
def set_default_values
diff --git a/admin/app/controllers/spree/admin/stock_locations_controller.rb b/admin/app/controllers/spree/admin/stock_locations_controller.rb
index 5b42d765e6..c58bd8a6ab 100644
--- a/admin/app/controllers/spree/admin/stock_locations_controller.rb
+++ b/admin/app/controllers/spree/admin/stock_locations_controller.rb
@@ -3,6 +3,8 @@ module Spree
class StockLocationsController < ResourceController
before_action :set_country, only: :new
+ add_breadcrumb Spree.t(:stock_locations), :admin_stock_locations_path
+
def mark_as_default
@stock_location.update(default: true)
diff --git a/admin/app/controllers/spree/admin/stores_controller.rb b/admin/app/controllers/spree/admin/stores_controller.rb
index ea0e8c14c7..8428a481c3 100644
--- a/admin/app/controllers/spree/admin/stores_controller.rb
+++ b/admin/app/controllers/spree/admin/stores_controller.rb
@@ -31,7 +31,17 @@ module Spree
end
end
- def edit; end
+ def edit
+ if params[:section] == 'emails'
+ add_breadcrumb Spree.t(:emails), spree.edit_admin_store_path(section: params[:section])
+ elsif params[:section] == 'policies'
+ add_breadcrumb Spree.t(:policies), spree.edit_admin_store_path(section: params[:section])
+ elsif params[:section] == 'checkout'
+ add_breadcrumb Spree.t(:checkout), spree.edit_admin_store_path(section: params[:section])
+ else
+ add_breadcrumb Spree.t(:store_settings), spree.edit_admin_store_path(section: params[:section])
+ end
+ end
def edit_emails; end
diff --git a/admin/app/controllers/spree/admin/tax_categories_controller.rb b/admin/app/controllers/spree/admin/tax_categories_controller.rb
index 34a050d586..c7219e00b3 100644
--- a/admin/app/controllers/spree/admin/tax_categories_controller.rb
+++ b/admin/app/controllers/spree/admin/tax_categories_controller.rb
@@ -1,6 +1,7 @@
module Spree
module Admin
class TaxCategoriesController < ResourceController
+ add_breadcrumb Spree.t(:tax_categories), :admin_tax_categories_path
end
end
end
diff --git a/admin/app/controllers/spree/admin/tax_rates_controller.rb b/admin/app/controllers/spree/admin/tax_rates_controller.rb
index e227aa3a51..1d66d83071 100644
--- a/admin/app/controllers/spree/admin/tax_rates_controller.rb
+++ b/admin/app/controllers/spree/admin/tax_rates_controller.rb
@@ -4,6 +4,8 @@ module Spree
before_action :load_data
before_action :set_defaults, only: :new
+ add_breadcrumb Spree.t(:tax_rates), :admin_tax_rates_path
+
private
def set_defaults
diff --git a/admin/app/controllers/spree/admin/zones_controller.rb b/admin/app/controllers/spree/admin/zones_controller.rb
index 167d04aa6b..af187ae3a0 100644
--- a/admin/app/controllers/spree/admin/zones_controller.rb
+++ b/admin/app/controllers/spree/admin/zones_controller.rb
@@ -1,6 +1,7 @@
module Spree
module Admin
class ZonesController < ResourceController
+ add_breadcrumb Spree.t(:zones), :admin_zones_path
before_action :load_data, except: :index
def new
diff --git a/admin/app/views/spree/admin/shared/_breadcrumbs.html.erb b/admin/app/views/spree/admin/shared/_breadcrumbs.html.erb
index 2a295f2374..72d39550bd 100644
--- a/admin/app/views/spree/admin/shared/_breadcrumbs.html.erb
+++ b/admin/app/views/spree/admin/shared/_breadcrumbs.html.erb
@@ -5,6 +5,7 @@
<li>
<%= active_link_to Spree.t(:settings), spree.edit_admin_store_path %>
</li>
+ <%= icon('slash', class: 'text-muted font-size-sm') %>
<% end %>
<%= render_breadcrumbs tag: :li, separator: icon('slash', class: 'text-muted font-size-sm') %>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb
index f1e82604f2..9a2ef0a6d2 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_integrations_nav.html.erb
@@ -1,5 +1,5 @@
<% if can?(:manage, Spree::Integration) %>
<li class="nav-item">
- <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug') %>
+ <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug-connected') %>
</li>
<% end %>
\ No newline at end of file