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

Merge branch 'product-reports-without-deleted'

Browse Source
This commit is contained in:
Rohan Mitchell
2014-12-12 15:29:03 +11:00
parent 84b607433c eab2e5de2a
commit 0b3dfa7278
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/open_food_network/products_and_inventory_report.rb
View File

@@ -60,7 +60,11 @@ module OpenFoodNetwork
def filter(variants)
# NOTE: Ordering matters.
# filter_to_order_cycle and filter_to_distributor return Arrays not Arel
filter_to_distributor filter_to_order_cycle filter_on_hand filter_to_supplier variants
filter_to_distributor filter_to_order_cycle filter_on_hand filter_to_supplier filter_not_deleted variants
end
def filter_not_deleted(variants)
variants.not_deleted
end
def filter_on_hand(variants)

6
spec/lib/open_food_network/products_and_inventory_report_spec.rb
View File

@@ -115,6 +115,12 @@ module OpenFoodNetwork
product2 = create(:simple_product, supplier: supplier)
subject.filter(Spree::Variant.scoped).sort.should == [product1.master, product2.master].sort
end
it "should filter deleted products" do
product1 = create(:simple_product, supplier: supplier)
product2 = create(:simple_product, supplier: supplier)
product2.delete
subject.filter(Spree::Variant.scoped).sort.should == [product1.master].sort
end
describe "based on report type" do
it "returns only variants on hand" do
product1 = create(:simple_product, supplier: supplier, on_hand: 99)