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

Tidy up import_date

Browse Source
This commit is contained in:
Matt-Yorkley
2018-03-13 22:53:11 +00:00
parent 73f7bc3db0
commit d9c720e89a
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/admin/variant_overrides_controller.rb
View File

@@ -63,11 +63,12 @@ module Admin
options = [{ id: '0', name: 'All' }]
import_dates = VariantOverride.
select('variant_overrides.import_date').
select(:import_date).
where('variant_overrides.hub_id IN (?)
AND variant_overrides.import_date IS NOT NULL', editable_enterprises.collect(&:id))
AND variant_overrides.import_date IS NOT NULL', editable_enterprises.collect(&:id)).
order('import_date DESC')
import_dates.uniq.collect(&:import_date).sort.reverse.map { |i| options.push(id: i.to_date, name: i.to_date.to_formatted_s(:long)) }
import_dates.collect(&:import_date).uniq.map { |i| options.push(id: i.to_date, name: i.to_date.to_formatted_s(:long)) }
options
end

11
app/controllers/spree/admin/products_controller_decorator.rb
View File

@@ -109,12 +109,13 @@ Spree::Admin::ProductsController.class_eval do
import_dates = Spree::Variant.
select('spree_variants.import_date').
joins(:product).
where('spree_products.supplier_id IN (?)
AND spree_variants.is_master = false
AND spree_variants.import_date IS NOT NULL
AND spree_variants.deleted_at IS NULL', editable_enterprises.collect(&:id))
where('spree_products.supplier_id IN (?)', editable_enterprises.collect(&:id)).
where('spree_variants.import_date IS NOT NULL').
where(spree_variants: {is_master: false}).
where(spree_variants: {deleted_at: nil}).
order('spree_variants.import_date DESC')
import_dates.uniq.collect(&:import_date).sort.reverse
import_dates.collect(&:import_date).uniq
end
def strip_new_properties