diff --git a/app/helpers/spree/orders_helper.rb b/app/helpers/spree/orders_helper.rb
index 2388cd3eea..790ff1b155 100644
--- a/app/helpers/spree/orders_helper.rb
+++ b/app/helpers/spree/orders_helper.rb
@@ -18,6 +18,7 @@ module Spree
end
def changeable_orders
+ # Only returns open order for the current user + shop + oc combo
return [] unless spree_current_user && current_distributor && current_order_cycle
Spree::Order.complete.where(
state: 'complete',
@@ -36,7 +37,7 @@ module Spree
path: changeable_orders_link_path,
order: changeable_orders.first.number,
shop: current_distributor.name,
- oc_close: l(current_order_cycle.orders_close_at, format: "%b %d, %Y %H:%M"))
+ oc_close: l(current_order_cycle.orders_close_at, format: "%A, %b %d, %Y @ %H:%M"))
end
end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9aa3a0de57..7ffb769534 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -897,7 +897,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
shop_changeable_orders_alert_html:
one: Your order with %{shop} / %{order} is open for review. You can make changes until %{oc_close}.
- other: You have %{count} orders with %{shop} currently open for review.
+ other: You have %{count} orders with %{shop} currently open for review. You can make changes until %{oc_close}.
orders_changeable_orders_alert_html: This order has been confirmed, but you can make changes until %{oc_close}.
products_clear_all: Clear all