mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-20 04:59:16 +00:00
Merge pull request #10023 from abdellani/add-hub-filter-to-orders-and-distributors
Add filter by distributor in "Orders And Distributors" report
This commit is contained in:
@@ -1 +1,5 @@
|
||||
= render 'admin/reports/date_range_form', f: f
|
||||
|
||||
.row
|
||||
.alpha.two.columns= label_tag nil, t(:report_hubs)
|
||||
.omega.fourteen.columns= f.collection_select(:distributor_id_in, @data.orders_distributors, :id, :name, {}, {class: "select2 fullwidth", multiple: true})
|
||||
|
||||
@@ -25,6 +25,7 @@ module Reporting
|
||||
context 'with completed order' do
|
||||
let(:bill_address) { create(:address) }
|
||||
let(:distributor) { create(:distributor_enterprise) }
|
||||
let(:distributor1) { create(:distributor_enterprise) }
|
||||
let(:product) { create(:product) }
|
||||
let(:shipping_method) { create(:shipping_method) }
|
||||
let(:shipping_instructions) { 'pick up on thursday please!' }
|
||||
@@ -82,6 +83,26 @@ module Reporting
|
||||
table = subject.table_rows
|
||||
expect(table.size).to eq 2
|
||||
end
|
||||
|
||||
context "filtering by distributor" do
|
||||
it do
|
||||
create(:line_item_with_shipment, order: order)
|
||||
|
||||
report1 = Base.new(create(:admin_user), {})
|
||||
table = report1.table_rows
|
||||
expect(table.size).to eq 2
|
||||
|
||||
report2 = Base.new(create(:admin_user),
|
||||
{ q: { distributor_id_in: [distributor.id] } })
|
||||
table2 = report2.table_rows
|
||||
expect(table2.size).to eq 2
|
||||
|
||||
report3 = Base.new(create(:admin_user),
|
||||
{ q: { distributor_id_in: [distributor1.id] } })
|
||||
table3 = report3.table_rows
|
||||
expect(table3.size).to eq 0
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user