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

Prepare inventory report for Spree upgrade

Browse Source 
This change could impact the performance of the report. But therefore it
takes VariantOverrides into consideration. The old code ignored the
distributor for this filter. It also ignored the `on_demand` flag.
This commit is contained in:
Maikel Linke
2018-06-28 14:55:24 +10:00
parent 289d0b937f
commit b84e524f2d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/open_food_network/products_and_inventory_report_base.rb
View File

@@ -29,16 +29,18 @@ module OpenFoodNetwork
end
def filter(variants)
filter_to_distributor filter_to_order_cycle filter_on_hand filter_to_supplier filter_not_deleted variants
filter_on_hand filter_to_distributor filter_to_order_cycle filter_to_supplier filter_not_deleted variants
end
def filter_not_deleted(variants)
variants.not_deleted
end
# Using the `in_stock?` method allows overrides by distributors.
# It also allows the upgrade to Spree 2.0.
def filter_on_hand(variants)
if params[:report_type] == 'inventory'
variants.where('spree_variants.count_on_hand > 0')
variants.select(&:in_stock?)
else
variants
end