diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass index 5422c4463a..eab074369e 100644 --- a/app/assets/stylesheets/darkswarm/shop.css.sass +++ b/app/assets/stylesheets/darkswarm/shop.css.sass @@ -84,9 +84,11 @@ padding-right: 0rem font-size: 0.8rem - .shopfront_message, .shopfront_closed_message + .shopfront_message, .shopfront_closed_message, .shopfront_hidden_message padding: 15px border-radius: 5px + + .shopfront_message, .shopfront_closed_message border: 2px solid #eb4c46 .shopfront_message @@ -94,3 +96,7 @@ .shopfront_closed_message margin: 2em 0em + + .shopfront_hidden_message + border: 2px solid #db4 + margin: 2em 0em diff --git a/app/helpers/shop_helper.rb b/app/helpers/shop_helper.rb index ed2facd86f..43c1583bbb 100644 --- a/app/helpers/shop_helper.rb +++ b/app/helpers/shop_helper.rb @@ -9,6 +9,8 @@ module ShopHelper end def require_customer? - current_distributor.require_login? and not spree_current_user.andand.customer_of current_distributor + current_distributor.require_login? && !( + spree_current_user.andand.customer_of current_distributor + ) end end diff --git a/app/views/shop/_messages.html.haml b/app/views/shop/_messages.html.haml index 7f5451334b..ba35354bf3 100644 --- a/app/views/shop/_messages.html.haml +++ b/app/views/shop/_messages.html.haml @@ -2,7 +2,7 @@ - if require_customer? .row.footer-pad .small-12.columns - .shopfront_closed_message + .shopfront_hidden_message = t '.require_customer_login' - if spree_current_user.nil? = t '.require_login_html', diff --git a/config/locales/en.yml b/config/locales/en.yml index 40abae6dd2..95c4e0b92a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -109,7 +109,7 @@ en: form: primary_details: shopfront_requires_login: "Shopfront requires login?" - shopfront_requires_login_tip: "Choose whether viewing the shopfront requires to login or not." + shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront." shopfront_requires_login_false: "Public" shopfront_requires_login_true: "Require customers to login"