diff --git a/app/controllers/admin/variant_overrides_controller.rb b/app/controllers/admin/variant_overrides_controller.rb index 4f8b39f1f4..da2006ec2b 100644 --- a/app/controllers/admin/variant_overrides_controller.rb +++ b/app/controllers/admin/variant_overrides_controller.rb @@ -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 diff --git a/app/controllers/spree/admin/products_controller_decorator.rb b/app/controllers/spree/admin/products_controller_decorator.rb index 1e38a65da6..07b818d1ea 100644 --- a/app/controllers/spree/admin/products_controller_decorator.rb +++ b/app/controllers/spree/admin/products_controller_decorator.rb @@ -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