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

Move "orders closed" message to "shop" tab and adjust "home" tab message display logic

Browse Source
This commit is contained in:
Matt-Yorkley
2020-01-08 13:58:22 +01:00
parent 56223bb960
commit e7d88f0df9
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/shop_helper.rb
View File

@@ -38,8 +38,7 @@ module ShopHelper
private
def show_home_tab?
require_customer? || shopfront_closed_message? ||
current_distributor.preferred_shopfront_message.present?
require_customer? || current_distributor.preferred_shopfront_message.present?
end
def shopfront_closed_message?

6
app/views/shop/_messages.html.haml
View File

@@ -14,12 +14,6 @@
= t '.require_customer_html',
{contact: link_to(t('.contact'), '#contact'),
enterprise: current_distributor.name}
- elsif @order_cycles and @order_cycles.empty?
- if current_distributor.preferred_shopfront_closed_message.present?
.row
.small-12.columns
.shopfront_closed_message
= current_distributor.preferred_shopfront_closed_message.html_safe
- elsif current_distributor.preferred_shopfront_message.present?
.row
.small-12.columns

14
app/views/shopping_shared/_order_cycles.html.haml
View File

@@ -3,18 +3,6 @@
%ordercycle{"ng-controller" => "OrderCycleCtrl"}
- if @order_cycles and @order_cycles.empty?
%h4
%i.ofn-i_012-warning
= t :shopping_oc_closed
%p
= t :shopping_oc_closed_description
.text-right
%small
%em
= render partial: "shopping_shared/next_order_cycle"
= render partial: "shopping_shared/last_order_cycle"
- else
- unless @order_cycles and @order_cycles.empty?
%form.custom
= yield :order_cycle_form

21
app/views/shopping_shared/tabs/_shop.html.haml
View File

@@ -1,3 +1,24 @@
%script{ type: "text/ng-template", id: "shop/shop.html" }
- if @order_cycles and @order_cycles.empty?
.content
.row
%h4
%i.ofn-i_012-warning
= t :shopping_oc_closed
%small
%em
(
= render partial: "shopping_shared/next_order_cycle"
= render partial: "shopping_shared/last_order_cycle"
)
%p
= t :shopping_oc_closed_description
- if shopfront_closed_message?
.row
.shopfront_closed_message
= current_distributor.preferred_shopfront_closed_message.html_safe
- unless require_customer?
= render partial: "shop/products/form"