From 4f50afc188fc94c131ec1e1c232842c2aadaeb69 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Fri, 21 May 2021 14:33:44 +0200 Subject: [PATCH] Change shipping_method_id storage: in the query --- .../admin/orders/controllers/orders_controller.js.coffee | 4 ++-- app/views/spree/admin/orders/_filters.html.haml | 3 ++- spec/features/admin/orders_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee index 7a53177398..ea0034c405 100644 --- a/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee @@ -16,7 +16,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque $scope.rowStatus = {} QueryPersistence.storageKey = 'ordersFilters' - QueryPersistence.storableFilters = ["q", "sorting", "shipping_method_id", "page", "per_page"] + QueryPersistence.storableFilters = ["q", "sorting", "page", "per_page"] $scope.initialise = -> unless QueryPersistence.restoreFilters($scope) @@ -48,7 +48,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque 'q[distributor_id_in][]': $scope.q?.distributor_id_in, 'q[order_cycle_id_in][]': $scope.q?.order_cycle_id_in, 'q[s]': $scope.sorting || 'completed_at desc', - shipping_method_id: $scope.shipping_method_id, + shipping_method_id: $scope.q?.shipping_method_id, per_page: $scope.per_page, page: page } diff --git a/app/views/spree/admin/orders/_filters.html.haml b/app/views/spree/admin/orders/_filters.html.haml index 656fb62e02..8432108996 100644 --- a/app/views/spree/admin/orders/_filters.html.haml +++ b/app/views/spree/admin/orders/_filters.html.haml @@ -35,8 +35,9 @@ .field = label_tag nil, t(:shipping_method) = select_tag("shipping_method_id", + = select_tag("q[shipping_method_id]", options_for_select(Spree::ShippingMethod.managed_by(spree_current_user).collect {|s| [t("spree.shipping_method_names.#{s.name}"), s.id]}), - {include_blank: true, class: 'select2', 'ng-model' => 'shipping_method_id', 'ng-value' => 'shipping_method_id'}) + {include_blank: true, class: 'select2', 'ng-model': 'q.shipping_method_id'}) .field-block.alpha.eight.columns = label_tag nil, t(:distributors) = select_tag("q[distributor_id_in]", diff --git a/spec/features/admin/orders_spec.rb b/spec/features/admin/orders_spec.rb index 33a2693aec..0188df9eeb 100644 --- a/spec/features/admin/orders_spec.rb +++ b/spec/features/admin/orders_spec.rb @@ -134,7 +134,7 @@ feature ' fill_in "Invoice number", with: "R123456" select2_select order_cycle.name, from: 'q_order_cycle_id_in' select2_select distributor.name, from: 'q_distributor_id_in' - select2_select shipping_method.name, from: 'shipping_method_id' + select2_select shipping_method.name, from: 'q_shipping_method_id' select2_select "complete", from: 'q_state_eq' fill_in "Email", with: user.email fill_in "First name begins with", with: "J" @@ -151,7 +151,7 @@ feature ' # Check every filters to be equal expect(find_field("Only show complete orders")).not_to be_checked expect(find_field("Invoice number").value).to eq "R123456" - expect(find("#s2id_shipping_method_id").text).to eq shipping_method.name + expect(find("#s2id_q_shipping_method_id").text).to eq shipping_method.name expect(find("#s2id_q_state_eq").text).to eq "complete" expect(find_field("Email").value).to eq user.email expect(find_field("First name begins with").value).to eq "J"