raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Per review, remove instance variable @query

Browse Source
This commit is contained in:
Gaetan Craig-Riou
2024-07-10 11:45:39 +10:00
parent 5c136f8baa
commit 5c3acbbcaf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/order_cycles/distributed_products_service.rb
View File

@@ -12,11 +12,11 @@ module OrderCycles
end
def products_relation(supplier_properties: nil)
@query = relation_by_sorting(supplier_properties)
query = relation_by_sorting(supplier_properties)
supplier_property_join if supplier_properties.present?
query = supplier_property_join(query) if supplier_properties.present?
@query.order(Arel.sql(order))
query.order(Arel.sql(order))
end
def variants_relation
@@ -67,8 +67,8 @@ module OrderCycles
distributor.preferred_shopfront_product_sorting_method
end
def supplier_property_join
@query = @query.joins("
def supplier_property_join(query)
query.joins("
JOIN enterprises ON enterprises.id = first_variant.supplier_id
LEFT OUTER JOIN producer_properties ON producer_properties.producer_id = enterprises.id
")