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

Only show shipping methods that enterprise user has access to

Browse Source
This commit is contained in:
Rohan Mitchell
2013-11-07 11:56:45 +11:00
parent a526439643
commit 0755b515d1
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/spree/admin/shipping_methods_controller_decorator.rb
View File

@@ -12,11 +12,11 @@ module Spree
!current_ability.has_block?(params[:action], model_class)
model_class.accessible_by(current_ability, action).
by_distributor # This line added
managed_by(spree_current_user).by_distributor # This line added
else
model_class.scoped.
by_distributor # This line added
managed_by(spree_current_user).by_distributor # This line added
end
# This block added

10
app/models/spree/shipping_method_decorator.rb
View File

@@ -2,6 +2,16 @@ Spree::ShippingMethod.class_eval do
has_and_belongs_to_many :distributors, join_table: 'distributors_shipping_methods', :class_name => 'Enterprise', association_foreign_key: 'distributor_id'
attr_accessible :distributor_ids
scope :managed_by, lambda { |user|
if user.has_spree_role?('admin')
scoped
else
joins(:distributors).
where('distributors_shipping_methods.distributor_id IN (?)', user.enterprises).
select('DISTINCT spree_shipping_methods.*')
end
}
scope :for_distributor, lambda { |distributor|
joins(:distributors).
where('enterprises.id = ?', distributor)

15
spec/features/admin/shipping_methods_spec.rb
View File

@@ -59,8 +59,10 @@ feature 'shipping methods' do
let(:enterprise_user) { create_enterprise_user }
let(:distributor1) { create(:distributor_enterprise, name: 'First Distributor') }
let(:distributor2) { create(:distributor_enterprise, name: 'Second Distributor') }
let(:distributor3) { create(:distributor_enterprise, name: 'Third Distributor') }
let(:sm1) { create(:shipping_method, name: 'One', distributors: [distributor1]) }
let(:sm2) { create(:shipping_method, name: 'Two', distributors: [distributor2]) }
let(:sm3) { create(:shipping_method, name: 'Three', distributors: [distributor3]) }
before(:each) do
enterprise_user.enterprise_roles.build(enterprise: distributor1).save
@@ -84,7 +86,18 @@ feature 'shipping methods' do
shipping_method.distributors.should == [distributor1]
end
it "shows me only payment methods for the enterprise I select" do
it "shows me only shipping methods I have access to" do
sm1
sm2
sm3
visit spree.admin_shipping_methods_path
page.should have_content sm1.name
page.should have_content sm2.name
page.should_not have_content sm3.name
end
it "shows me only shipping methods for the enterprise I select" do
sm1
sm2