raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include shop enterprise on shop front

Browse Source
This commit is contained in:
Maikel Linke
2016-07-06 12:45:12 +10:00
parent 52f68dac33
commit f733c7f207
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/injection_helper.rb
View File

@@ -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

4
app/models/enterprise.rb
View File

@@ -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