From f733c7f20795090dd2d875ca32f2906d3aed722d Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 6 Jul 2016 12:45:12 +1000 Subject: [PATCH] Include shop enterprise on shop front --- app/helpers/injection_helper.rb | 2 +- app/models/enterprise.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb index 032aee2cf7..6db2e583bc 100644 --- a/app/helpers/injection_helper.rb +++ b/app/helpers/injection_helper.rb @@ -15,7 +15,7 @@ module InjectionHelper else OrderCycle.not_closed.with_distributor(current_distributor) end - inject_json_ams "enterprises", current_distributor.relatives_and_oc_producers(ocs).activated.includes(address: :state).all, Api::EnterpriseSerializer, enterprise_injection_data + inject_json_ams "enterprises", current_distributor.plus_relatives_and_oc_producers(ocs).activated.includes(address: :state).all, Api::EnterpriseSerializer, enterprise_injection_data end def inject_group_enterprises diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index 3802468ee9..80414d5116 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -230,9 +230,9 @@ class Enterprise < ActiveRecord::Base ", self.id, self.id) end - def relatives_and_oc_producers(order_cycles) + def plus_relatives_and_oc_producers(order_cycles) oc_producer_ids = Exchange.in_order_cycle(order_cycles).incoming.pluck :sender_id - Enterprise.relatives_of_one_union_others(id, oc_producer_ids) + Enterprise.relatives_of_one_union_others(id, oc_producer_ids | [id]) end def relatives_including_self