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.

Use strict scope, but with the option to use a filter param showing items for all stores (products and orders).

Matthew Kennedy62f45148ac70
diff --git a/backend/app/assets/javascripts/spree/backend/global/ransack.es6 b/backend/app/assets/javascripts/spree/backend/global/ransack.es6
index 83bce1d607..d3e833b307 100644
--- a/backend/app/assets/javascripts/spree/backend/global/ransack.es6
+++ b/backend/app/assets/javascripts/spree/backend/global/ransack.es6
@@ -75,7 +75,7 @@ document.addEventListener('DOMContentLoaded', function() {
var cleanLabel = DOMPurify.sanitize(label)
- filter = '<span class="js-filter badge badge-secondary" data-ransack-field="' + ransackFieldId + '">' + cleanLabel + '<i class="icon icon-cancel ml-2 js-delete-filter"></i></span>'
+ filter = '<span class="js-filter badge badge-secondary d-inline-flex align-items-center" data-ransack-field="' + ransackFieldId + '">' + cleanLabel + '<i class="icon icon-cancel ml-2 js-delete-filter"></i></span>'
$('.js-filters').append(filter).show()
}
})
diff --git a/backend/app/assets/stylesheets/spree/backend/components/_filters.scss b/backend/app/assets/stylesheets/spree/backend/components/_filters.scss
index 0a24c98b33..76b15c69b9 100644
--- a/backend/app/assets/stylesheets/spree/backend/components/_filters.scss
+++ b/backend/app/assets/stylesheets/spree/backend/components/_filters.scss
@@ -19,8 +19,6 @@
}
i.js-delete-filter {
- width: $select2-icon-size;
- height: $select2-icon-size;
margin-bottom: 0;
}
diff --git a/backend/app/assets/stylesheets/spree/backend/components/_tables.scss b/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
index 814240088b..e4971d7f9f 100644
--- a/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
+++ b/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
@@ -3,6 +3,7 @@ table.table {
th {
padding: 0.5rem;
+ padding-left: 0;
&.handel-head {
width: 50px;
@@ -14,6 +15,11 @@ table.table {
td {
padding: 0.5rem;
+ padding-left: 0;
+ }
+
+ td.move-handle {
+ width:45px;
}
.badge {
@@ -25,6 +31,7 @@ table.table {
text-transform: uppercase;
font-size: $small-font-size;
padding: 0.5rem;
+ padding-left: 0;
padding-top: 14px;
padding-bottom: 14px;
vertical-align: top;
@@ -54,7 +61,6 @@ table.table {
.table-active-filters {
display: none;
- margin: -.5em 0 .9em;
.js-filter {
.icon {
diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_base.scss b/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
index b533904620..9aac222628 100644
--- a/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
+++ b/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
@@ -1,7 +1,3 @@
-.transparent-indicator-bg {
- background: repeating-conic-gradient(#c7c7c7 0% 25%, transparent 0% 50%) 50% / 20px 20px
-}
-
.row {
padding: 0 0 15px 0;
}
@@ -40,6 +36,10 @@
cursor: grab;
}
+.badge {
+ padding: 0.5em 0.6em;
+}
+
.badge-light-muted-text {
color: rgba(0, 0, 0, 0.50);
}
diff --git a/backend/app/controllers/spree/admin/orders_controller.rb b/backend/app/controllers/spree/admin/orders_controller.rb
index e2049316a0..b0d5798977 100644
--- a/backend/app/controllers/spree/admin/orders_controller.rb
+++ b/backend/app/controllers/spree/admin/orders_controller.rb
@@ -26,18 +26,18 @@ module Spree
if params[:q][:created_at_gt].present?
params[:q][:created_at_gt] = begin
- Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
- rescue StandardError
- ''
- end
+ Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
+ rescue StandardError
+ ''
+ end
end
if params[:q][:created_at_lt].present?
params[:q][:created_at_lt] = begin
- Time.zone.parse(params[:q][:created_at_lt]).end_of_day
- rescue StandardError
- ''
- end
+ Time.zone.parse(params[:q][:created_at_lt]).end_of_day
+ rescue StandardError
+ ''
+ end
end
if @show_only_completed
@@ -45,7 +45,11 @@ module Spree
params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
end
- @search = Spree::Order.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
+ @search = if params[:q][:all_stores] == '1'
+ Spree::Order.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
+ else
+ scope.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
+ end
# 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"
@@ -60,7 +64,7 @@ module Spree
end
def new
- @order = Spree::Order.create(order_params)
+ @order = scope.create(order_params)
redirect_to cart_admin_order_url(@order)
end
@@ -87,8 +91,8 @@ module Spree
# Jump to next step if order is not completed.
redirect_to admin_order_customer_path(@order) and return
end
- else
- @order.errors.add(:line_items, Spree.t('errors.messages.blank')) if @order.line_items.empty?
+ elsif @order.line_items.empty?
+ @order.errors.add(:line_items, Spree.t('errors.messages.blank'))
end
render action: :edit
@@ -157,6 +161,10 @@ module Spree
private
+ def scope
+ current_store.orders
+ end
+
def order_params
params[:created_by_id] = try_spree_current_user.try(:id)
params.permit(:created_by_id, :user_id, :store_id, :channel)
diff --git a/backend/app/controllers/spree/admin/products_controller.rb b/backend/app/controllers/spree/admin/products_controller.rb
index 415b61233c..179871c4ad 100644
--- a/backend/app/controllers/spree/admin/products_controller.rb
+++ b/backend/app/controllers/spree/admin/products_controller.rb
@@ -31,8 +31,15 @@ module Spree
invoke_callbacks(:update, :after)
flash[:success] = flash_message_for(@object, :successfully_updated)
respond_with(@object) do |format|
- format.html { redirect_to location_after_save }
- format.js { render layout: false }
+ format.html do
+ if params[:product][:store_ids].include? current_store.id
+ redirect_to location_after_save
+ else
+ redirect_to admin_products_url
+ end
+ end
+
+ format.js { render layout: false }
end
else
# Stops people submitting blank slugs, causing errors when they try to
@@ -91,8 +98,12 @@ module Spree
protected
+ def scope
+ current_store.products
+ end
+
def find_resource
- Product.with_deleted.friendly.find(params[:id])
+ scope.with_deleted.friendly.find(params[:id])
end
def location_after_save
@@ -114,7 +125,13 @@ module Spree
params[:q][:not_discontinued] ||= '1'
params[:q][:s] ||= 'name asc'
- @collection = super
+
+ @collection = if params[:q][:all_stores] == '1'
+ super
+ else
+ scope
+ end
+
# Don't delete params[:q][:deleted_at_null] here because it is used in view to check the
# checkbox for 'q[deleted_at_null]'. This also messed with pagination when deleted_at_null is checked.
if params[:q][:deleted_at_null] == '0'
diff --git a/backend/app/helpers/spree/admin/stores_helper.rb b/backend/app/helpers/spree/admin/stores_helper.rb
index 9df64d1c0d..c035afd0ca 100644
--- a/backend/app/helpers/spree/admin/stores_helper.rb
+++ b/backend/app/helpers/spree/admin/stores_helper.rb
@@ -1,18 +1,6 @@
module Spree
module Admin
module StoresHelper
- def admin_current_store_products_path
- spree.admin_products_path(q: { stores_id_in: current_store.id })
- end
-
- def admin_current_store_orders_path
- spree.admin_orders_path(q: { store_id_in: current_store.id })
- end
-
- def admin_current_store_payment_methods_path
- spree.admin_payment_methods_path(q: { stores_id_in: current_store.id })
- end
-
def selected_checkout_zone(store)
store&.checkout_zone || Spree::Zone.default_checkout_zone
end
@@ -37,11 +25,6 @@ module Spree
link_to icon + store.unique_name, store.formatted_url + request.path,
class: "#{classes} d-flex align-items-center text-dark p-3 dropdown-item"
end
-
- def store_switch_tab(store, query = :store_id_in)
- link_to store.unique_name, params.merge({ q: { query => store.id, } }).permit!,
- class: "nav-link #{'active' if params[:q][query] == store.id.to_s}"
- end
end
end
end
diff --git a/backend/app/views/spree/admin/menus/index.html.erb b/backend/app/views/spree/admin/menus/index.html.erb
index 410efc6ede..272738191b 100644
--- a/backend/app/views/spree/admin/menus/index.html.erb
+++ b/backend/app/views/spree/admin/menus/index.html.erb
@@ -6,23 +6,12 @@
<%= button_link_to Spree.t('admin.navigation.add_new_menu'), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_menu' } %>
<% end if can?(:create, Spree::Menu) %>
-<% content_for :page_tabs do %>
- <li class="nav-item">
- <%= link_to '#', class: "nav-link active d-flex align-items-center",
- data: { show_info: true,
- alert_kind: 'info',
- alert_title: Spree.t('admin.navigation.managing_by_store_title'),
- alert_html: (raw Spree.t( 'admin.navigation.managing_by_store', store: current_store.unique_name )) } do %>
- <%= (svg_icon name: "info.svg", width: '18', height: '18', classes: 'mr-2') + current_store.unique_name %>
- <% end %>
- </li>
-<% end %>
-
<% content_for :table_filter do %>
<div data-hook="admin_menus_sidebar">
<%= search_form_for [:admin, @search] do |f| %>
<%- locals = {f: f} %>
<div class="row">
+
<div class="col-12 col-lg-4">
<div class="form-group">
<%= f.label :name_cont, Spree.t('name') %>
diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erb
index efb46cb40a..83ae559349 100644
--- a/backend/app/views/spree/admin/orders/index.html.erb
+++ b/backend/app/views/spree/admin/orders/index.html.erb
@@ -10,10 +10,6 @@
id: 'admin_new_order' %>
<% end if can? :create, Spree::Order %>
-<% content_for :page_tabs do %>
- <%= render 'spree/admin/shared/fast_store_filter', all_stores_path: spree.admin_orders_path %>
-<% end %>
-
<% content_for :table_filter do %>
<div data-hook="admin_orders_index_search">
@@ -132,13 +128,6 @@
</div>
</div>
- <div class="col-12 col-lg-4">
- <div class="form-group">
- <%= label_tag :q_store_id_in, Spree.t(:store) %>
- <%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
- </div>
- </div>
-
<div class="col-12 col-lg-4">
<div class="form-group">
<%= label_tag :q_channel_eq, Spree.t(:channel) %>
@@ -146,28 +135,28 @@
</div>
</div>
- <div class="col-12 col-lg-4">
-
- <div class="form-group">
-
- <div class="checkbox mt-2">
- <%= label_tag 'q_completed_at_not_null' do %>
- <%= f.check_box :completed_at_not_null, {checked: @show_only_completed}, '1', '0' %>
- <%= Spree.t(:show_only_complete_orders) %>
- <% end %>
+ <div class="col-12">
+ <%= f.field_container :all_stores do %>
+ <div class="custom-control custom-checkbox">
+ <%= f.check_box :all_stores, {checked: params[:q][:all_stores] == '1', class: 'custom-control-input'}, '1', '0' %>
+ <%= f.label :all_stores, Spree.t('admin.show_orders_for_all_stores'), class: 'custom-control-label' %>
</div>
+ <% end %>
- <div class="checkbox mt-2">
- <%= label_tag 'q_considered_risky_eq' do %>
- <%= f.check_box :considered_risky_eq, {checked: (params[:q][:considered_risky_eq] == '1')}, '1', '' %>
- <%= Spree.t(:show_only_considered_risky) %>
- <% end %>
+ <%= f.field_container :completed_at_not_null do %>
+ <div class="custom-control custom-checkbox">
+ <%= f.check_box :completed_at_not_null, {checked: @show_only_completed, class: 'custom-control-input'}, '1', '0' %>
+ <%= f.label :completed_at_not_null, Spree.t(:show_only_complete_orders), class: 'custom-control-label' %>
</div>
+ <% end %>
- </div>
-
+ <%= f.field_container :considered_risky_eq do %>
+ <div class="custom-control custom-checkbox">
+ <%= f.check_box :considered_risky_eq, {checked: params[:q][:considered_risky_eq] == '1', class: 'custom-control-input'}, '1', '' %>
+ <%= f.label :considered_risky_eq, Spree.t(:show_only_considered_risky), class: 'custom-control-label' %>
+ </div>
+ <% end %>
</div>
-
</div>
<div data-hook="admin_orders_index_search_buttons" class="form-actions">
diff --git a/backend/app/views/spree/admin/payment_methods/edit.html.erb b/backend/app/views/spree/admin/payment_methods/edit.html.erb
index 3c7754c453..2b193027ea 100644
--- a/backend/app/views/spree/admin/payment_methods/edit.html.erb
+++ b/backend/app/views/spree/admin/payment_methods/edit.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- <%= link_to Spree.t(:payment_methods), admin_current_store_payment_methods_path %> /
+ <%= link_to Spree.t(:payment_methods), admin_payment_methods_path %> /
<%= @payment_method.name %>
<% end %>
diff --git a/backend/app/views/spree/admin/payment_methods/index.html.erb b/backend/app/views/spree/admin/payment_methods/index.html.erb
index 5a8026dddf..a24aa585cd 100644
--- a/backend/app/views/spree/admin/payment_methods/index.html.erb
+++ b/backend/app/views/spree/admin/payment_methods/index.html.erb
@@ -6,10 +6,6 @@
<%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_payment_methods_link' %>
<% end if can? :create, Spree::PaymentMethod %>
-<% content_for :page_tabs do %>
- <%= render 'spree/admin/shared/fast_store_filter', query: :stores_id_in, all_stores_path: spree.admin_payment_methods_path %>
-<% end %>
-
<% if @payment_methods.any? %>
<div class="table-responsive">
<table class="table sortable" id='listing_payment_methods' data-hook data-sortable-link="<%= update_positions_admin_payment_methods_url %>">
diff --git a/backend/app/views/spree/admin/payment_methods/new.html.erb b/backend/app/views/spree/admin/payment_methods/new.html.erb
index 01457ceade..3c451196f1 100644
--- a/backend/app/views/spree/admin/payment_methods/new.html.erb
+++ b/backend/app/views/spree/admin/payment_methods/new.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- <%= link_to Spree.t(:payment_methods), admin_current_store_payment_methods_path %> /
+ <%= link_to Spree.t(:payment_methods), admin_payment_methods_path %> /
<%= Spree.t(:new_payment_method) %>
<% end %>
diff --git a/backend/app/views/spree/admin/products/index.html.erb b/backend/app/views/spree/admin/products/index.html.erb
index f623893da0..f262f6dedf 100644
--- a/backend/app/views/spree/admin/products/index.html.erb
+++ b/backend/app/views/spree/admin/products/index.html.erb
@@ -6,9 +6,9 @@
<%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_product' } %>
<% end if can?(:create, Spree::Product) %>
-<% content_for :page_tabs do %>
- <%= render 'spree/admin/shared/fast_store_filter', query: :stores_id_in, all_stores_path: spree.admin_products_path %>
-<% end %>
+<%# content_for :page_tabs do %>
+ <%#= render 'spree/admin/shared/store_filter', query: :stores_id_in, all_stores_path: spree.admin_products_path %>
+<%# end %>
<% content_for :table_filter do %>
<div data-hook="admin_products_sidebar">
@@ -16,38 +16,39 @@
<%= search_form_for [:admin, @search] do |f| %>
<%- locals = {f: f} %>
<div data-hook="admin_products_index_search" class="row">
- <div class="col-12 col-lg-4">
+ <div class="col-12 col-lg-6">
<div class="form-group">
<%= f.label :search_by_name, Spree.t(:product_name) %>
<%= f.text_field :search_by_name, size: 15, class: "form-control js-quick-search-target js-filterable" %>
</div>
</div>
- <div class="col-12 col-lg-4">
+ <div class="col-12 col-lg-6">
<div class="form-group">
<%= f.label :variants_including_master_sku_cont, Spree.t(:sku) %>
<%= f.text_field :variants_including_master_sku_cont, size: 15, class: "form-control js-filterable" %>
</div>
</div>
- <div class="col-12 col-lg-4">
- <div class="form-group">
- <%= label_tag :q_stores_id_in, Spree.t(:store) %>
- <%= f.select :stores_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
- </div>
- </div>
<div class="col-12">
- <div class="field checkbox mb-2">
- <label>
- <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0'}, '0', '1' %>
- <%= Spree.t(:show_deleted) %>
- </label>
- </div>
+ <%= f.field_container :all_stores do %>
+ <div class="custom-control custom-checkbox">
+ <%= f.check_box :all_stores, {checked: params[:q][:all_stores] == '1', class: 'custom-control-input'}, '1', '0' %>
+ <%= f.label :all_stores, Spree.t('admin.show_products_for_all_stores'), class: 'custom-control-label' %>
+ </div>
+ <% end %>
- <div class="field checkbox mb-2">
- <label>
- <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0'}, '0', '1' %>
- <%= Spree.t(:show_discontinued ) %>
- </label>
- </div>
+ <%= f.field_container :deleted_at_null do %>
+ <div class="custom-control custom-checkbox">
+ <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0', class: 'custom-control-input'}, '0', '1' %>
+ <%= f.label :deleted_at_null, Spree.t(:show_deleted), class: 'custom-control-label' %>
+ </div>
+ <% end %>
+
+ <%= f.field_container :not_discontinued do %>
+ <div class="custom-control custom-checkbox">
+ <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0', class: 'custom-control-input'}, '0', '1' %>
+ <%= f.label :not_discontinued, Spree.t(:show_discontinued ), class: 'custom-control-label' %>
+ </div>
+ <% end %>
</div>
</div>
<div data-hook="admin_products_index_search_buttons" class="form-actions">
diff --git a/backend/app/views/spree/admin/shared/_fast_store_filter.html.erb b/backend/app/views/spree/admin/shared/_fast_store_filter.html.erb
deleted file mode 100644
index 7249ffdedb..0000000000
--- a/backend/app/views/spree/admin/shared/_fast_store_filter.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% query = query || :store_id_in %>
-
-<li class="nav-item">
- <%= link_to Spree.t(:all_stores), all_stores_path, class: "nav-link #{'active' if params[:q][query].blank?}" %>
-</li>
-
-<% @stores.each do |store| %>
- <li class="nav-item">
- <%= store_switch_tab(store, query) %>
- </li>
-<% end %>
diff --git a/backend/app/views/spree/admin/shared/_main_menu.html.erb b/backend/app/views/spree/admin/shared/_main_menu.html.erb
index a762d9c6e5..a05bd46e52 100644
--- a/backend/app/views/spree/admin/shared/_main_menu.html.erb
+++ b/backend/app/views/spree/admin/shared/_main_menu.html.erb
@@ -12,7 +12,7 @@
<% if can? :admin, Spree::Order %>
<ul class="nav nav-sidebar border-bottom" id="sidebarOrder">
- <%= tab *Spree::BackendConfiguration::ORDER_TABS, url: admin_current_store_orders_path, icon: 'list.svg' %>
+ <%= tab *Spree::BackendConfiguration::ORDER_TABS, url: admin_orders_path, icon: 'list.svg' %>
</ul>
<% end %>
diff --git a/backend/app/views/spree/admin/shared/_order_tabs.html.erb b/backend/app/views/spree/admin/shared/_order_tabs.html.erb
index ba6992354a..3a4bcb3b79 100644
--- a/backend/app/views/spree/admin/shared/_order_tabs.html.erb
+++ b/backend/app/views/spree/admin/shared/_order_tabs.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- <%= link_to Spree.t(:orders), admin_current_store_orders_path %> /
+ <%= link_to Spree.t(:orders), admin_orders_path %> /
<%= link_to @order.number, spree.edit_admin_order_path(@order) %>
<% end %>
diff --git a/backend/app/views/spree/admin/shared/_product_tabs.html.erb b/backend/app/views/spree/admin/shared/_product_tabs.html.erb
index a62ea3ffc6..b465eb3e1d 100644
--- a/backend/app/views/spree/admin/shared/_product_tabs.html.erb
+++ b/backend/app/views/spree/admin/shared/_product_tabs.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- <%= link_to Spree.t(:products), admin_current_store_products_path %> /
+ <%= link_to Spree.t(:products), admin_products_path %> /
<%= @product.name %>
<% end %>
diff --git a/backend/app/views/spree/admin/shared/_store_switcher.html.erb b/backend/app/views/spree/admin/shared/_store_switcher.html.erb
index 64daeb4918..76ea3bcc37 100644
--- a/backend/app/views/spree/admin/shared/_store_switcher.html.erb
+++ b/backend/app/views/spree/admin/shared/_store_switcher.html.erb
@@ -1,5 +1,4 @@
<% if can?(:admin, current_store) %>
-<%#= stores_select %>
<div id="storeSwitcherDropdown" class="dropdown">
<span class="d-none d-lg-inline text-light">
diff --git a/backend/app/views/spree/admin/shared/sub_menu/_configuration.html.erb b/backend/app/views/spree/admin/shared/sub_menu/_configuration.html.erb
index b5d7d38110..99505c6295 100644
--- a/backend/app/views/spree/admin/shared/sub_menu/_configuration.html.erb
+++ b/backend/app/views/spree/admin/shared/sub_menu/_configuration.html.erb
@@ -10,7 +10,7 @@
<%= configurations_sidebar_menu_item(Spree.t(:states), spree.admin_country_states_path(country)) if can? :manage, Spree::Country %>
<% end %>
- <%= tab :payment_methods, url: admin_current_store_payment_methods_path, match_path: '/payment_methods' if can? :manage, Spree::PaymentMethod %>
+ <%= configurations_sidebar_menu_item(Spree.t(:payment_methods), spree.admin_payment_methods_path) if can? :manage, Spree::PaymentMethod %>
<%= configurations_sidebar_menu_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path) if can? :manage, Spree::ShippingMethod %>
<%= configurations_sidebar_menu_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can? :manage, Spree::ShippingCategory %>
<%= configurations_sidebar_menu_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
diff --git a/backend/app/views/spree/admin/shared/sub_menu/_product.html.erb b/backend/app/views/spree/admin/shared/sub_menu/_product.html.erb
index 53555005f6..ded2d19056 100644
--- a/backend/app/views/spree/admin/shared/sub_menu/_product.html.erb
+++ b/backend/app/views/spree/admin/shared/sub_menu/_product.html.erb
@@ -1,5 +1,5 @@
<ul id="sidebar-product" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
- <%= tab :products, url: admin_current_store_products_path, match_path: '/products' %>
+ <%= tab :products, url: admin_products_path, match_path: '/products' %>
<%= tab :option_types, match_path: '/option_types' %>
<%= tab :properties %>
<%= tab :prototypes %>
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 65b588197f..9778b9ae6b 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -549,6 +549,9 @@ en:
adjustment_total: Adjustment Total
adjustments: Adjustments
admin:
+ show_orders_for_all_stores: Show orders for all stores
+ show_products_for_all_stores: Show products for all stores
+ show_menus_for_all_stores: Show menus for all stores
tab:
configuration: Configuration
content: Content