raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,846 Commits 18 Branches 451 Tags
5c7ab2efa30493d2fe8f6cbdd1306bc511b33421
Commit Graph

549 Commits

Author SHA1 Message Date
Rob H
5c7ab2efa3 Restrict editing of ownership and type in enterprise api controller 2014-09-12 12:47:16 +10:00
Rob H
6ee3010fa7 Differentiation of on-boarding process by url 2014-09-12 11:00:34 +10:00
Rob H
f1ef8ba3c7 Getting signup to work and authentication to load in reg specific template 2014-09-11 17:07:07 +10:00
Rob H
f1f9a2e7fc Updating on later pages of registration process 2014-09-11 17:07:06 +10:00
Rob H
69b1d14cc4 Adding authorize to api enterprise create 2014-09-11 17:07:05 +10:00
Rob H
7dc42c9e39 Creating an enterprise works in registration process 2014-09-11 17:07:05 +10:00
Rob H
3d4e00a03c Swtich API key injection over to helper 2014-09-11 17:07:05 +10:00
Rob H
c92aa41e28 Adding introduction and details pages to registration process 2014-09-11 16:34:19 +10:00
Rob H
595aa760cb Loads registration page with authentication 2014-09-11 16:34:19 +10:00
Rob H
e83e2295ed Adding some extra controller-level specs for enterprise ownership 2014-09-11 14:54:51 +10:00
Rob H
138e0281a3 Specify owner for enterprise create action 2014-09-11 14:39:14 +10:00
Rohan Mitchell
c297b7014a Charge customers for their shipping fee 2014-09-10 14:01:36 +10:00
Rob H
6540bb8efc Adding select field for enterprise type to index when super admin 2014-09-07 19:51:14 +10:00
Rob H
b8fadb50ae Special Instructions in checkout are actually wired up 2014-09-06 12:00:27 +10:00
Rob H
58dcdbd9c4 Restricting ability to change enterprise type at the controller level 2014-09-05 18:30:15 +10:00
Rohan Mitchell
94683f1eaa Check authorisation for bulk update products 2014-09-01 11:15:00 +10:00
Rohan Mitchell
c81503d95f Include producers I have permission to in BPE producers choice 2014-09-01 10:44:09 +10:00
Rohan Mitchell
e0645dfbd9 Fetch managed products via OpenFoodNetwork::Permissions 2014-09-01 09:42:50 +10:00
Rohan Mitchell
7f74854a2f For OC, fetch all enterprises we have access to, including those via E2E relationships 2014-08-29 16:38:23 +10:00
Rohan Mitchell
0b61872d96 Revert 5ede8d1, reinstating a4be0ff..7b89e6a 2014-08-29 16:38:10 +10:00
Rob H
5ede8d169f Revert a4be0ff..7b89e6a for deployment 2014-08-28 14:32:57 +10:00
Rohan Mitchell
a5debc19dc Permit edits to exchanges involving enterprises permitted via E2E relationships 2014-08-28 10:09:50 +10:00
Rohan Mitchell
8548a1a67e Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class 2014-08-28 10:09:50 +10:00
Rob H
435819acc4 Removing unit text from total units column 2014-08-25 20:29:24 +10:00
Rob H
310d1b3726 Zeus server does not crash when editing controllers 2014-08-25 20:29:24 +10:00
Rohan Mitchell
cb615ba994 Render enterprise relationships JSON with AMS instead of rabl 2014-08-25 13:07:31 +10:00
Rohan Mitchell
9ddfb1584b Admin can delete enterprise roles 2014-08-15 16:09:06 +10:00
Rohan Mitchell
6e17f0aaa2 Admin can create enterprise roles 2014-08-15 16:09:05 +10:00
Rohan Mitchell
1d77812ab8 Admin can list enterprise roles 2014-08-15 16:09:04 +10:00
Rob H
a7b3bbee74 Overriding payment method load_data to hide Bogus Gateways 2014-08-09 12:52:00 +10:00
Rob H
d80166e80d Restrict access to show_provider_preferences action on payment methods controller 2014-08-08 17:47:50 +10:00
Rob H
f19af52556 WIP: angularised provider settings for payment method works on create (for admin only at this stage) 2014-08-08 17:47:50 +10:00
Rob H
f021d260b1 Require payment_methods to be associated with at least one hub 2014-08-08 17:47:50 +10:00
Rob H
d6aae0050f Angularise payment method provider UI 2014-08-08 17:47:50 +10:00
Rob H
25d7adac83 WIP: Replace configuration menu on payment methods edit page 2014-08-08 17:47:49 +10:00
Rob H
5fea15e8a9 Better error reporting for failed save on BPE 2014-08-08 14:05:54 +10:00
Rob H
d9692312ac WIP: swapping filters over to drop downs 2014-08-08 14:05:52 +10:00
Rob H
2f5b5e7ee5 Inject taxons into BPE 2014-08-08 14:05:52 +10:00
Rob H
aaddccfae4 Injecting producer information into BPE 2014-08-08 14:05:51 +10:00
Rob H
27e992ebcb Staggered loading of products in BPE 2014-08-08 14:05:51 +10:00
Rob H
b9f49344b4 BPE: Switch column toggle to dropdown, clean up specs 2014-08-08 14:05:51 +10:00
Rob H
1abbc7fa86 Switch data injection for BPE over to AMS 2014-08-08 14:05:50 +10:00
Rob H
30a14edb06 Adding 'Total Units' field to supplier report 2014-08-07 14:21:01 +10:00
Will Marshall
20d7484134 Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee
 2014-07-28 13:43:31 +10:00
Rohan Mitchell
fd3040d394 Call reset order callback when order completed via paypal 2014-07-25 12:44:14 +10:00
Rohan Mitchell
50f74038b2 Fix redirect to paypal for better spree paypal express 2014-07-25 12:44:14 +10:00
Rohan Mitchell
3b28981400 Adapt cancel redirect for better spree paypal express 2014-07-25 12:44:14 +10:00
Rohan Mitchell
3dd7b296be Show order notes (special instructions) on report and confirmation email 2014-07-24 15:13:23 +10:00
Rob H
c8ddf86a9f Add failure block to create respond_override for creating products 2014-07-23 14:56:12 +10:00
Will Marshall
edaba844d9 Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-18 17:02:19 +10:00