From beabe22a0108a127c01502c6cef1a9341dc61948 Mon Sep 17 00:00:00 2001 From: wvengen Date: Tue, 26 Nov 2013 13:22:44 +0100 Subject: [PATCH] simplify model --- app/models/order_article.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/order_article.rb b/app/models/order_article.rb index 32211f24..7e8c4a86 100644 --- a/app/models/order_article.rb +++ b/app/models/order_article.rb @@ -12,8 +12,9 @@ class OrderArticle < ActiveRecord::Base validate :article_and_price_exist validates_uniqueness_of :article_id, scope: :order_id - scope :ordered, -> { where("units_to_order > 0 OR units_billed > 0 OR units_received > 0") } - scope :ordered_or_member, -> { includes(:group_order_articles).where("units_to_order > 0 OR units_billed > 0 OR units_received > 0 OR group_order_articles.result > 0") } + _ordered_sql = "units_to_order > 0 OR units_billed > 0 OR units_received > 0" + scope :ordered, -> { where(_ordered_sql) } + scope :ordered_or_member, -> { includes(:group_order_articles).where("#{_ordered_sql} OR group_order_articles.result > 0") } before_create :init_from_balancing after_destroy :update_ordergroup_prices