Refactor open order cycle checks

This commit is contained in:
Matt-Yorkley
2020-01-13 17:11:27 +01:00
parent 0546acd6f9
commit d14d6fe865
3 changed files with 7 additions and 4 deletions

View File

@@ -36,7 +36,10 @@ module ShopHelper
end
def shopfront_closed_message?
@order_cycles && @order_cycles.empty? &&
current_distributor.preferred_shopfront_closed_message.present?
no_open_order_cycles? && current_distributor.preferred_shopfront_closed_message.present?
end
def no_open_order_cycles?
@order_cycles && @order_cycles.empty?
end
end

View File

@@ -3,6 +3,6 @@
%ordercycle{"ng-controller" => "OrderCycleCtrl"}
- unless @order_cycles and @order_cycles.empty?
- unless no_open_order_cycles?
%form.custom
= yield :order_cycle_form

View File

@@ -1,7 +1,7 @@
%script{ type: "text/ng-template", id: "shop/shop.html" }
.row
.small-12.columns
- if @order_cycles and @order_cycles.empty?
- if no_open_order_cycles?
.content
%h4
%i.ofn-i_012-warning