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

Ensure hack for showing products on a shop with closed order cycles also works if an order cycle has no shipping methods

Browse Source 
If a distributor order cycle has no shipping methods it will be invalid. This is a bit confusing because adding a check for :invalid seems like it would be better if it was done in the Shop::OrderCyclesList service but the hack doesn't work if you put it in there, it seems like something needs a refactor.
This commit is contained in:
Cillian O'Ruanaidh
2022-06-08 21:26:12 +01:00
committed by Filipe
parent 5a4bc79c74
commit a46b77d10c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/base_controller.rb
View File

@@ -15,8 +15,12 @@ class BaseController < ApplicationController
private
def all_distributor_order_cycles_invalid?
OrderCycle.with_distributor(@distributor).active.all?(&:invalid?)
end
def set_order_cycles
unless @distributor.ready_for_checkout?
if !@distributor.ready_for_checkout? || all_distributor_order_cycles_invalid?
@order_cycles = OrderCycle.where('false')
return
end