From a29a1bd047b8df8eb5a0ec95259af57d35400b42 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 20 Jun 2018 15:11:30 +1000 Subject: [PATCH] Only show change warning for open order cycles --- .../admin/order_cycles/directives/change-warning.js.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/order_cycles/directives/change-warning.js.coffee b/app/assets/javascripts/admin/order_cycles/directives/change-warning.js.coffee index acd987069b..c1cd159807 100644 --- a/app/assets/javascripts/admin/order_cycles/directives/change-warning.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/directives/change-warning.js.coffee @@ -9,10 +9,14 @@ angular.module("admin.orderCycles").directive "changeWarning", (ConfirmDialog) - msg = 'admin.order_cycles.date_warning.msg' options = { cancel: t(cancel), confirm: t(proceed) } + isOpen = (orderCycle) -> + moment(orderCycle.orders_open_at, "YYYY-MM-DD HH:mm:SS Z").isBefore() && + moment(orderCycle.orders_close_at, "YYYY-MM-DD HH:mm:SS Z").isAfter() + element.focus -> count = scope.orderCycle.subscriptions_count return if acknowledged - return if moment(scope.orderCycle.orders_close_at).isBefore() + return unless isOpen(scope.orderCycle) return if count < 1 ConfirmDialog.open('info', t(msg, n: count), options).then -> acknowledged = true