raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,276 Commits 18 Branches 452 Tags
ea17e475a605fdffd58ee80074d2d8cbaf85d8b2
Commit Graph

105 Commits

Author SHA1 Message Date
Rohan Mitchell
ea17e475a6 When viewing enterprise fees, only show those for the enterprise I select 2013-10-18 14:44:01 +11:00
Rohan Mitchell
91f14dcd4c Enterprise manager can create/edit enterprise fees 2013-10-18 13:56:22 +11:00
Rohan Mitchell
3b5e6f5742 When viewing shipping methods, only show those for the distributor I select 2013-10-18 10:01:11 +11:00
Rohan Mitchell
c07c52085a Enterprise user can view and create shipping methods 2013-10-18 09:35:53 +11:00
Rohan Mitchell
e6041aaf2f Enterprise user can view, create and edit payment methods 2013-10-18 09:09:53 +11:00
Rohan Mitchell
631bc631fb Do not show order cycle debug info in production 2013-10-16 10:39:32 +11:00
Rohan Mitchell
a6877c6981 Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page. 2013-10-16 10:37:09 +11:00
Rohan Mitchell
1d4198d402 Removing a supplier exchange removes variants from distribution 2013-09-30 09:46:39 +10:00
Rohan Mitchell
19349c805f Destroy supplied products when a supplier is destroyed 2013-09-23 14:58:26 +10:00
Rohan Mitchell
d100d12ebe When a variant is removed from supply to an order cycle, remove it from distribution also 2013-09-20 11:11:59 +10:00
Rohan Mitchell
00fe10e847 Reposition order cycle admin debug info 2013-09-20 09:29:26 +10:00
Rohan Mitchell
2e1de9a6d3 Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error 2013-08-23 14:00:31 +10:00
Rohan Mitchell
8a092697ee Enterprise manager can clone an order cycle 2013-08-22 17:11:53 +10:00
Rohan Mitchell
f1fa90d7c3 Clone order cycles 2013-08-22 16:53:11 +10:00
Andrew Spinks
82726d032c Add enterprise roles for order cycles. 2013-08-16 11:34:07 +10:00
Rohan Mitchell
19e7537b64 Style order cycle fees 2013-08-16 10:36:41 +10:00
Rohan Mitchell
290607b5bf CrUD for order cycle exchange fees 2013-08-16 10:22:29 +10:00
Rohan Mitchell
715ec9b21a Send enterprise id along with exchange enterprise fees 2013-08-16 10:22:29 +10:00
Rohan Mitchell
f67a6fa3fb Extract coordinator fees to partial 2013-08-14 09:48:45 +10:00
Rohan Mitchell
4120bc3dca Output exchange fees as JSON 2013-08-14 09:48:45 +10:00
Rohan Mitchell
4a893fd548 Style 2013-07-30 13:49:38 +10:00
Rohan Mitchell
4a0e35deef Clear coordinator fees when coordinator changes 2013-07-30 13:46:30 +10:00
Rohan Mitchell
d64bcf0e94 Remove coordinator fees 2013-07-30 11:55:21 +10:00
Rohan Mitchell
dc7f8986a0 Click to add coordinator fee 2013-07-30 11:34:10 +10:00
Rohan Mitchell
ae0f82b479 Display only coordinator fees belonging to the selected coordinator 2013-07-30 11:34:10 +10:00
Rohan Mitchell
43474d6408 Display coordinator fees on admin edit order cycle 2013-07-30 11:34:10 +10:00
Rohan Mitchell
13a1809d6c Load enterprise fees in controllers 2013-07-30 11:34:10 +10:00
Rohan Mitchell
f613da30d0 Output order cycle coordinator fees in JSON 2013-07-30 11:34:10 +10:00
Rohan Mitchell
fe61cddda6 Merge branch 'local-organics' 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb
 2013-07-23 11:40:03 +10:00
Rohan Mitchell
fb999732ee Rename enterprises admin extended description to profile info, add distributor info field 2013-04-26 13:10:32 +10:00
Rob H
046eb256ff Fix issues causing enterprise fee tests to break 2013-02-15 14:10:56 +11:00
Rohan Mitchell
662aaf75bf When editing an order cycle, distributor collection details are loaded 2013-01-22 09:34:07 +11:00
Rohan Mitchell
c75738893e Display supplier name on products for distribution 2013-01-18 14:35:06 +11:00
Rohan Mitchell
074d5715e7 Only provide distributors as coordinating enterprises. Order by name. 2013-01-18 14:26:56 +11:00
Rohan Mitchell
87d5ffeee2 Add fields for outgoing exchange collection details 2013-01-18 14:24:17 +11:00
Rohan Mitchell
d8a7570a61 Display accurate counts for distributed products 2013-01-18 12:21:35 +11:00
Rohan Mitchell
33b9d45f43 Distributors and products displayed on edit 2013-01-18 11:59:32 +11:00
Rohan Mitchell
0a2ce30bb6 Only show variants for distribution that are supplied to the order cycle 2013-01-18 11:52:01 +11:00
Rohan Mitchell
1a0ef85030 Test distributor exchanges are created with order cycles 2013-01-18 11:40:36 +11:00
Rohan Mitchell
8f17df0e45 Name exchange elements independently 2013-01-17 11:36:56 +11:00
Rohan Mitchell
3991199c30 Only show products for distribution that have been supplied to the order cycle 2013-01-17 10:49:59 +11:00
Rohan Mitchell
8f05c69696 Display all supplied products for distribution 2013-01-15 12:31:57 +11:00
Rohan Mitchell
f3f0f37716 Return to indexing for exchanges - this way new entries without an id get an index 2013-01-15 12:21:57 +11:00
Rohan Mitchell
850d65958b Build Enterprise.supplied_products, an array of all products supplied by any enterprise 2013-01-15 12:21:13 +11:00
Rohan Mitchell
a10eb0d0c7 List and add distributor exchanges 2013-01-11 15:53:51 +11:00
Rohan Mitchell
bb13ec0e02 Rename methods 2013-01-11 10:40:56 +11:00
Rohan Mitchell
d3189e333b Count selected variants on an exchange 2013-01-11 10:36:27 +11:00
Rohan Mitchell
a9fb10b0ca Do not show master selection if there are variants 2013-01-10 16:25:29 +11:00
Rohan Mitchell
3186b703a2 Apply basic styling for order cycle product selection 2013-01-10 15:57:22 +11:00
Rohan Mitchell
e46d61075e Simplify field naming 2013-01-10 15:33:56 +11:00