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

Re-phrase shop options

Browse Source
This commit is contained in:
Maikel Linke
2016-10-07 13:03:31 +11:00
parent 7c3968b64e
commit 08b9b50f33
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/serializers/api/admin/enterprise_serializer.rb
View File

@@ -4,6 +4,7 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
attributes :preferred_shopfront_message, :preferred_shopfront_closed_message, :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order
attributes :preferred_product_selection_from_inventory_only
attributes :owner, :users, :tag_groups, :default_tag_group
attributes :require_login
has_one :owner, serializer: Api::Admin::UserSerializer
has_many :users, serializer: Api::Admin::UserSerializer

12
app/views/admin/enterprises/form/_shop_preferences.html.haml
View File

@@ -40,20 +40,20 @@
%div{'ofn-with-tip' => t('.shopfront_requires_login_tip')}
%a= t 'admin.whats_this'
.three.columns
= f.radio_button :require_login, false
= f.radio_button :require_login, false, "ng-model" => "Enterprise.require_login", "ng-value" => "false"
= f.label :require_login, t('.shopfront_requires_login_false'), value: :false
.five.columns.omega
= f.radio_button :require_login, true
= f.radio_button :require_login, true, "ng-model" => "Enterprise.require_login", "ng-value" => "true"
= f.label :require_login, t('.shopfront_requires_login_true'), value: :true
.row
.row{ng: {if: "!Enterprise.require_login"}}
.alpha.eleven.columns
.three.columns.alpha
%label= t '.allow_guest_orders'
%div{'ofn-with-tip' => t('.allow_guest_orders_tip')}
%a= t 'admin.whats_this'
.three.columns
= f.radio_button :allow_guest_orders, false
= f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false
.five.columns.omega
= f.radio_button :allow_guest_orders, true
= f.label :allow_guest_orders, t('.allow_guest_orders_true'), value: :true
.five.columns.omega
= f.radio_button :allow_guest_orders, false
= f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false

8
config/locales/en.yml
View File

@@ -197,14 +197,14 @@ en:
manage: Manage
form:
shop_preferences:
shopfront_requires_login: "Shopfront requires login?"
shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront."
shopfront_requires_login: "Publicly visible shopfront?"
shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront or if it's visible to everybody."
shopfront_requires_login_false: "Public"
shopfront_requires_login_true: "Require customers to login"
shopfront_requires_login_true: "Visible to registered customers only"
allow_guest_orders: "Guest orders"
allow_guest_orders_tip: "Allow checkout as guest or require a registered user."
allow_guest_orders_false: "Require login to order"
allow_guest_orders_true: "Allow checkout as guest"
allow_guest_orders_true: "Allow guest checkout"
home:
hubs:

9
spec/features/admin/enterprises_spec.rb
View File

@@ -85,14 +85,12 @@ feature %q{
page.should have_selector '.available'
choose 'Own'
# Require login to view shopfront
# Require login to view shopfront or for checkout
within(".side_menu") { click_link "Shop Preferences" }
expect(page).to have_checked_field "enterprise_require_login_false"
choose "Require customers to login"
# Require login for checkout
expect(page).to have_checked_field "enterprise_allow_guest_orders_true"
choose "Require login to order"
choose "Visible to registered customers only"
expect(page).to have_no_checked_field "enterprise_require_login_false"
within (".side_menu") { click_link "Users" }
select2_search user.email, from: 'Owner'
@@ -195,7 +193,6 @@ feature %q{
page.should have_content 'This is my shopfront message.'
page.should have_checked_field "enterprise_preferred_shopfront_order_cycle_order_orders_open_at"
expect(page).to have_checked_field "enterprise_require_login_true"
expect(page).to have_checked_field "enterprise_allow_guest_orders_false"
end
describe "producer properties" do