From cbd7c9f4c06aa7e6ba081e2ea00d612e6a1c819e Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 25 Mar 2021 12:30:05 +0000 Subject: [PATCH] Update adjustments controller collection scope --- .../spree/admin/adjustments_controller.rb | 2 +- .../spree/admin/adjustments_controller_spec.rb | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/controllers/spree/admin/adjustments_controller.rb b/app/controllers/spree/admin/adjustments_controller.rb index d596ed9b16..ed6b9d2cde 100644 --- a/app/controllers/spree/admin/adjustments_controller.rb +++ b/app/controllers/spree/admin/adjustments_controller.rb @@ -17,7 +17,7 @@ module Spree end def collection - parent.adjustments.eligible | parent.shipment_adjustments.shipping + parent.all_adjustments.eligible end def find_resource diff --git a/spec/controllers/spree/admin/adjustments_controller_spec.rb b/spec/controllers/spree/admin/adjustments_controller_spec.rb index 931112da4b..87b372c3b9 100644 --- a/spec/controllers/spree/admin/adjustments_controller_spec.rb +++ b/spec/controllers/spree/admin/adjustments_controller_spec.rb @@ -8,6 +8,24 @@ module Spree before { controller_login_as_admin } + describe "index" do + let!(:order) { create(:order) } + let!(:adjustment1) { + create(:adjustment, originator_type: "Spree::ShippingMethod", order: order) + } + let!(:adjustment2) { + create(:adjustment, originator_type: "Spree::PaymentMethod", eligible: false, order: order) + } + let!(:adjustment3) { create(:adjustment, originator_type: "EnterpriseFee", order: order) } + + it "loads all eligible adjustments" do + spree_get :index, order_id: order.number + + expect(assigns(:collection)).to include adjustment1, adjustment3 + expect(assigns(:collection)).to_not include adjustment2 + end + end + describe "setting included tax" do let(:order) { create(:order) } let(:tax_rate) { create(:tax_rate, amount: 0.1, calculator: ::Calculator::DefaultTax.new) }