mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
Update orders closing message
This commit is contained in:
@@ -170,10 +170,6 @@ shop ordercycle {
|
||||
float: none;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.no-message-pad {
|
||||
padding: 0.95rem;
|
||||
}
|
||||
}
|
||||
|
||||
form.custom {
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
%div{"ng-if" => "closesInLessThan3Months()"}
|
||||
= t :enterprises_next_closing
|
||||
%strong {{ OrderCycle.orders_close_at() | date_in_words }}
|
||||
%div.no-message-pad{"ng-if" => "!closesInLessThan3Months()"}
|
||||
%div{"ng-if" => "!closesInLessThan3Months()"}
|
||||
= t :enterprises_currently_open
|
||||
%div{"ng-if" => "!OrderCycle.selected()"}
|
||||
= t :enterprises_choose
|
||||
|
||||
|
||||
@@ -1677,6 +1677,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
|
||||
shopping_producers_of_hub: "%{hub}'s producers:"
|
||||
|
||||
enterprises_next_closing: "Next order closing"
|
||||
enterprises_currently_open: "Orders are currently open"
|
||||
enterprises_ready_for: "Ready for"
|
||||
enterprises_choose: "Choose when you want your order:"
|
||||
|
||||
|
||||
@@ -62,9 +62,9 @@ feature "As a consumer I want to shop with a distributor", js: true do
|
||||
describe "when order cycle closes in more than 3 months" do
|
||||
before { oc1.update orders_close_at: 5.months.from_now }
|
||||
|
||||
it "does not show 'closing in' message" do
|
||||
it "shows alternative to 'closing in' message" do
|
||||
visit shop_path
|
||||
expect(page).not_to have_content "Next order closing in 2 days"
|
||||
expect(page).to have_content "Orders are currently open"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user