raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move 'shopfront requires login' setting

Browse Source 
Move 'shopfront requires login' setting to 'shop preferences' tab in
Profile Edit.

Solves issue #901.
This commit is contained in:
Maikel Linke
2016-09-21 14:00:39 +10:00
parent 7b2b285ba7
commit 92694c729f
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/admin/enterprises/form/_primary_details.html.haml
View File

@@ -50,17 +50,6 @@
.five.columns.omega
= f.radio_button :visible, false
= f.label :visible, "Not Visible", :value => "false"
.row
.three.columns.alpha
%label= t '.shopfront_requires_login'
%div{'ofn-with-tip' => t('.shopfront_requires_login_tip')}
%a= t 'admin.whats_this'
.two.columns
= f.radio_button :require_login, false
= f.label :require_login, t('.shopfront_requires_login_false'), value: :false
.five.columns.omega
= f.radio_button :require_login, true
= f.label :require_login, t('.shopfront_requires_login_true'), value: :true
.permalink{ ng: { controller: "permalinkCtrl" } }
.row{ ng: { show: "Enterprise.sells == 'own' || Enterprise.sells == 'any'" } }
.three.columns.alpha

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

@@ -33,3 +33,15 @@
.five.columns.omega
= radio_button :enterprise, :preferred_shopfront_order_cycle_order, :orders_close_at, { 'ng-model' => 'Enterprise.preferred_shopfront_order_cycle_order' }
= label :enterprise, :preferred_shopfront_order_cycle_order_orders_close_at, "Close Date"
.row
.alpha.eleven.columns
.three.columns.alpha
%label= t '.shopfront_requires_login'
%div{'ofn-with-tip' => t('.shopfront_requires_login_tip')}
%a= t 'admin.whats_this'
.three.columns
= f.radio_button :require_login, false
= f.label :require_login, t('.shopfront_requires_login_false'), value: :false
.five.columns.omega
= f.radio_button :require_login, true
= f.label :require_login, t('.shopfront_requires_login_true'), value: :true

2
config/locales/en.yml
View File

@@ -196,7 +196,7 @@ en:
status: Status
manage: Manage
form:
primary_details:
shop_preferences:
shopfront_requires_login: "Shopfront requires login?"
shopfront_requires_login_tip: "Choose whether customers must login to view the shopfront."
shopfront_requires_login_false: "Public"

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

@@ -86,6 +86,7 @@ feature %q{
choose 'Own'
# Require login to view shopfront
within(".side_menu") { click_link "Shop Preferences" }
expect(page).to have_checked_field "enterprise_require_login_false"
choose "Require customers to login"
@@ -170,7 +171,6 @@ feature %q{
@enterprise.reload
expect(@enterprise.owner).to eq user
expect(page).to have_checked_field "enterprise_visible_true"
expect(page).to have_checked_field "enterprise_require_login_true"
click_link "Business Details"
page.should have_checked_field "enterprise_charges_sales_tax_true"
@@ -190,6 +190,7 @@ feature %q{
click_link "Shop Preferences"
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"
end
describe "producer properties" do