diff --git a/app/controllers/spree/admin/products_controller.rb b/app/controllers/spree/admin/products_controller.rb index 74c99dc057..13700e4c39 100644 --- a/app/controllers/spree/admin/products_controller.rb +++ b/app/controllers/spree/admin/products_controller.rb @@ -181,7 +181,6 @@ module Spree joins(:product). 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') end diff --git a/app/helpers/spree/admin/images_helper.rb b/app/helpers/spree/admin/images_helper.rb index 875790438b..1602294908 100644 --- a/app/helpers/spree/admin/images_helper.rb +++ b/app/helpers/spree/admin/images_helper.rb @@ -5,11 +5,7 @@ module Spree module ImagesHelper def options_text_for(image) if image.viewable.is_a?(Spree::Variant) - if image.viewable.is_master? - I18n.t(:all) - else - image.viewable.options_text - end + image.viewable.options_text else I18n.t(:all) end diff --git a/app/models/product_import/entry_processor.rb b/app/models/product_import/entry_processor.rb index 4fada7bef3..05b90ca856 100644 --- a/app/models/product_import/entry_processor.rb +++ b/app/models/product_import/entry_processor.rb @@ -55,7 +55,6 @@ module ProductImport VariantOverride.for_hubs([enterprise_id]).count else Spree::Variant. - not_master. joins(:product). where('spree_products.supplier_id IN (?)', enterprise_id). count diff --git a/app/models/spree/product.rb b/app/models/spree/product.rb index 2736076d65..440286ad1d 100755 --- a/app/models/spree/product.rb +++ b/app/models/spree/product.rb @@ -43,9 +43,8 @@ module Spree has_many :properties, through: :product_properties has_many :classifications, dependent: :delete_all has_many :taxons, through: :classifications - has_many :variants, -> { - where(is_master: false).order("spree_variants.position ASC") - }, class_name: 'Spree::Variant', dependent: :destroy + has_many :variants, -> { order("spree_variants.position ASC") }, class_name: 'Spree::Variant', + dependent: :destroy has_many :prices, -> { order('spree_variants.position, spree_variants.id, currency') diff --git a/app/models/spree/variant.rb b/app/models/spree/variant.rb index 868987e545..e0cb767bb1 100644 --- a/app/models/spree/variant.rb +++ b/app/models/spree/variant.rb @@ -88,7 +88,6 @@ module Spree scope :with_order_cycles_inner, -> { joins(exchanges: :order_cycle) } - scope :not_master, -> { where(is_master: false) } scope :in_order_cycle, lambda { |order_cycle| with_order_cycles_inner. merge(Exchange.outgoing). diff --git a/app/services/exchange_products_renderer.rb b/app/services/exchange_products_renderer.rb index 8f762cda84..66217cd2ec 100644 --- a/app/services/exchange_products_renderer.rb +++ b/app/services/exchange_products_renderer.rb @@ -18,7 +18,6 @@ class ExchangeProductsRenderer def exchange_variants(incoming, enterprise) variants_relation = Spree::Variant. - not_master. where(product_id: exchange_products(incoming, enterprise).select(&:id)) filter_visible(variants_relation) diff --git a/app/services/products_renderer.rb b/app/services/products_renderer.rb index a37f5d8576..50bdae4066 100644 --- a/app/services/products_renderer.rb +++ b/app/services/products_renderer.rb @@ -97,7 +97,7 @@ class ProductsRenderer end def variants_for_shop_by_id - index_by_product_id variants_for_shop.reject(&:is_master) + index_by_product_id variants_for_shop end def index_by_product_id(variants) diff --git a/engines/catalog/app/services/catalog/product_import/products_reset_strategy.rb b/engines/catalog/app/services/catalog/product_import/products_reset_strategy.rb index da963717e7..c2df5a76cc 100644 --- a/engines/catalog/app/services/catalog/product_import/products_reset_strategy.rb +++ b/engines/catalog/app/services/catalog/product_import/products_reset_strategy.rb @@ -24,7 +24,7 @@ module Catalog .joins(:product) .where( spree_products: { supplier_id: enterprise_ids }, - spree_variants: { is_master: false, deleted_at: nil } + spree_variants: { deleted_at: nil } ) return relation if excluded_items_ids.blank? diff --git a/engines/dfc_provider/app/services/variant_fetcher.rb b/engines/dfc_provider/app/services/variant_fetcher.rb index df3fd86f82..fa213e3410 100644 --- a/engines/dfc_provider/app/services/variant_fetcher.rb +++ b/engines/dfc_provider/app/services/variant_fetcher.rb @@ -9,7 +9,7 @@ class VariantFetcher end def scope - Spree::Variant.not_master. + Spree::Variant. joins(:product). where(spree_products: { supplier: @enterprise }) end diff --git a/engines/order_management/app/services/order_management/subscriptions/variants_list.rb b/engines/order_management/app/services/order_management/subscriptions/variants_list.rb index 5c5a3fddb3..1807f5154f 100644 --- a/engines/order_management/app/services/order_management/subscriptions/variants_list.rb +++ b/engines/order_management/app/services/order_management/subscriptions/variants_list.rb @@ -16,7 +16,7 @@ module OrderManagement variant_conditions << exchange_variant_ids end - Spree::Variant.joins(:product).where(is_master: false).where(*variant_conditions) + Spree::Variant.joins(:product).where(*variant_conditions) end def self.in_open_and_upcoming_order_cycles?(distributor, schedule, variant) diff --git a/lib/open_food_network/scope_variants_for_search.rb b/lib/open_food_network/scope_variants_for_search.rb index f633d7c3c6..e84d4b66f3 100644 --- a/lib/open_food_network/scope_variants_for_search.rb +++ b/lib/open_food_network/scope_variants_for_search.rb @@ -33,7 +33,7 @@ module OpenFoodNetwork end def query_scope - Spree::Variant.where(is_master: false). + Spree::Variant. ransack(search_params.merge(m: 'or')). result. order("spree_products.name, display_name, display_as, spree_products.variant_unit_name"). diff --git a/lib/reporting/reports/products_and_inventory/base.rb b/lib/reporting/reports/products_and_inventory/base.rb index efae30ca67..55f8393667 100644 --- a/lib/reporting/reports/products_and_inventory/base.rb +++ b/lib/reporting/reports/products_and_inventory/base.rb @@ -33,7 +33,6 @@ module Reporting def child_variants Spree::Variant. - where(is_master: false). joins(:product). merge(visible_products). order('spree_products.name') diff --git a/spec/controllers/api/v0/variants_controller_spec.rb b/spec/controllers/api/v0/variants_controller_spec.rb index f98c870ced..9d948886a4 100644 --- a/spec/controllers/api/v0/variants_controller_spec.rb +++ b/spec/controllers/api/v0/variants_controller_spec.rb @@ -42,7 +42,7 @@ describe Api::V0::VariantsController, type: :controller do # Regression test for spree#2141 context "a deleted variant" do before do - expect(Spree::Variant.not_master.count).to eq 7 + expect(Spree::Variant.count).to eq 7 variant.update_column(:deleted_at, Time.zone.now) end