From 1da18d3386321a3375fa8cdded89632d0bf00f9b Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 3 Jun 2019 16:01:00 +0100 Subject: [PATCH] Fix enterprise model scopes by making ready_for_checkout return enterprises and not ids again and by making not_ready_for_checkout select the id field from the ready_for_checkout scope --- app/models/enterprise.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index ac9252e389..09560060df 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -111,12 +111,12 @@ class Enterprise < ActiveRecord::Base joins(:shipping_methods). joins(:payment_methods). merge(Spree::PaymentMethod.available). - select('enterprises.id') + select('DISTINCT enterprises.*') } scope :not_ready_for_checkout, lambda { # When ready_for_checkout is empty, return all rows when there are no enterprises ready for # checkout. - ready_enterprises = Enterprise.ready_for_checkout + ready_enterprises = Enterprise.ready_for_checkout.select('enterprises.id') if ready_enterprises.present? where("enterprises.id NOT IN (?)", ready_enterprises) else