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.

Fix filtering customer orders (#12422)

Łukasz Adamczyk9d92580f0394
diff --git a/admin/app/javascript/spree/admin/controllers/filters_controller.js b/admin/app/javascript/spree/admin/controllers/filters_controller.js
index b64ee79376..22db76cdec 100644
--- a/admin/app/javascript/spree/admin/controllers/filters_controller.js
+++ b/admin/app/javascript/spree/admin/controllers/filters_controller.js
@@ -4,6 +4,10 @@ import DOMPurify from "dompurify"
export default class extends Controller {
static targets = ["input", "badgesContainer", "badgeTemplate"];
+ static values = {
+ url: { type: String }
+ };
+
connect() {
this.inputTargets.forEach((input) => {
this.createBadgeFor(input);
@@ -47,7 +51,7 @@ export default class extends Controller {
label = DOMPurify.sanitize(`${label.trim()}: ${ransackValue.trim()}`);
- const newUrl = new URL(window.location.href);
+ const newUrl = this.urlValue ? new URL(this.urlValue) : new URL(window.location.href);
const newSearchParams = newUrl.searchParams;
newSearchParams.delete(input.name);
newUrl.search = newSearchParams.toString();
diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erb
index aeb3642210..57226b9d57 100644
--- a/admin/app/views/spree/admin/orders/_filters.html.erb
+++ b/admin/app/views/spree/admin/orders/_filters.html.erb
@@ -1,4 +1,15 @@
-<%= search_form_for [:admin, @vendor || @user, @search], url: controller_name == 'checkouts' ? spree.admin_checkouts_url : nil, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<% frame_name ||= nil %>
+
+<%= search_form_for [:admin, @vendor || @user, @search],
+ url: controller_name == 'checkouts' ? spree.admin_checkouts_path : nil,
+ class: "filter-wrap border-bottom",
+ data: {
+ controller: "filters reveal",
+ reveal_hidden_class: "d-none",
+ filters_url_value: request.url
+ } do |f| %>
+ <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
+
<div class="d-flex flex-column flex-lg-row gap-2">
<%= render 'spree/admin/shared/filters_search_bar', param: :multisearch %>
diff --git a/admin/app/views/spree/admin/orders/index.html.erb b/admin/app/views/spree/admin/orders/index.html.erb
index e44e64aea7..5a13ab4366 100644
--- a/admin/app/views/spree/admin/orders/index.html.erb
+++ b/admin/app/views/spree/admin/orders/index.html.erb
@@ -13,7 +13,7 @@
<div class="card-lg p-0">
<% if params[:frame_name].present? %>
<%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
- <%= render 'spree/admin/orders/filters' %>
+ <%= render 'spree/admin/orders/filters', frame_name: params[:frame_name] %>
<%= render 'spree/admin/orders/list' %>
<% end %>
<% else %>