raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error from OrderCycle#distributor_shipping methods return ActiveRecord::Relation sometimes and Array other times

Browse Source 
Now it will return ActiveRecord::Relation consistently.
This commit is contained in:
Cillian O'Ruanaidh
2022-09-09 16:29:23 +01:00
committed by Filipe
parent 5207dbf8c6
commit db92e9d91c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/order_cycle.rb
View File

@@ -294,15 +294,14 @@ class OrderCycle < ApplicationRecord
end
def distributor_shipping_methods
if simple?
if simple? || selected_distributor_shipping_methods.none?
attachable_distributor_shipping_methods
else
attachable_distributor_shipping_methods.reject do |distributor_shipping_method|
selected_distributor_shipping_methods.
map(&:distributor_id).
include?(distributor_shipping_method.distributor_id) &&
!selected_distributor_shipping_methods.include?(distributor_shipping_method)
end
attachable_distributor_shipping_methods.where(
"distributors_shipping_methods.id IN (?) OR distributor_id NOT IN (?)",
selected_distributor_shipping_methods.map(&:id),
selected_distributor_shipping_methods.map(&:distributor_id)
)
end
end