raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take into account other finalized order states

Browse Source 
This makes it consistent with other places where we show order balances.
Here though, we purposefully skip canceled ones.
This commit is contained in:
Pau Perez
2021-02-08 19:32:48 +01:00
parent a66d1b7299
commit e4319b06e6
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/open_food_network/order_cycle_management_report.rb
View File

@@ -47,8 +47,8 @@ module OpenFoodNetwork
def search
Spree::Order.
complete.
where("spree_orders.state != ?", :canceled).
finalized.
where.not(spree_orders: { state: :canceled }).
distributed_by_user(@user).
managed_by(@user).
search(params[:q])

26
spec/lib/open_food_network/order_cycle_management_report_spec.rb
View File

@@ -18,13 +18,25 @@ module OpenFoodNetwork
describe "fetching orders" do
it "fetches completed orders" do
o1 = create(:order)
o2 = create(:order, completed_at: 1.day.ago)
o2 = create(:order, completed_at: 1.day.ago, state: 'complete')
expect(subject.orders).to eq([o2])
end
it 'fetches resumed orders' do
order = create(:order, state: 'resumed', completed_at: 1.day.ago)
expect(subject.orders).to eq([order])
end
it 'calls OutstandingBalance query object' do
outstanding_balance = instance_double(OutstandingBalance, query: Spree::Order.none)
expect(OutstandingBalance).to receive(:new).and_return(outstanding_balance)
subject.orders
end
it "does not show cancelled orders" do
o1 = create(:order, state: "canceled", completed_at: 1.day.ago)
o2 = create(:order, completed_at: 1.day.ago)
o1 = create(:order, state: 'canceled', completed_at: 1.day.ago)
o2 = create(:order, state: 'complete', completed_at: 1.day.ago)
expect(subject.orders).to eq([o2])
end
@@ -38,8 +50,8 @@ module OpenFoodNetwork
context "default date range" do
it "fetches orders completed in the past month" do
o1 = create(:order, completed_at: 1.month.ago - 1.day)
o2 = create(:order, completed_at: 1.month.ago + 1.day)
o1 = create(:order, state: 'complete', completed_at: 1.month.ago - 1.day)
o2 = create(:order, state: 'complete', completed_at: 1.month.ago + 1.day)
expect(subject.orders).to eq([o2])
end
end
@@ -62,8 +74,8 @@ module OpenFoodNetwork
d2 = create(:distributor_enterprise)
d2.enterprise_roles.create!(user: create(:user))
o1 = create(:order, distributor: d1, completed_at: 1.day.ago)
o2 = create(:order, distributor: d2, completed_at: 1.day.ago)
o1 = create(:order, distributor: d1, state: 'complete', completed_at: 1.day.ago)
o2 = create(:order, distributor: d2, state: 'complete', completed_at: 1.day.ago)
expect(subject).to receive(:filter).with([o1]).and_return([o1])
expect(subject.orders).to eq([o1])