raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 21 Branches 450 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

298 Commits

Author SHA1 Message Date
Rafael Schouten
89ce4ba632 Merge branch 'master' into bugfix 
Conflicts:
	app/models/enterprise.rb
 2014-10-21 08:51:23 +11:00
Rafael Schouten
08cd273be3 Merge branch 'migrate_ent_types' into bugfix 
Conflicts:
	app/models/spree/ability_decorator.rb
 2014-10-18 07:37:41 +11:00
Rob Harrington
b2565991e6 Merge branch 'master' into reg_and_ent_types 2014-10-17 12:33:21 +11:00
Rohan Mitchell
0e03b5f209 Admin can change the format that Spree::Images are stored/served in 2014-10-16 12:41:11 +11:00
Rafael Schouten
46df14c0d9 refator reports controller a little 2014-10-16 04:29:33 +11:00
Rafael Schouten
e44fed2ff0 add authorization to reports listings on index page 2014-10-16 04:29:33 +11:00
Rafael Schouten
20a94b4365 Merge branch 'master' into migrate_ent_types 
Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb
 2014-10-07 10:52:26 +11:00
Rafael Schouten
b3520c4385 Bugfix for specs 2014-10-02 16:49:32 +10:00
Rob Harrington
5f4b2a752b Product controller loads correct data for create and update actions 2014-10-02 12:32:26 +10:00
Rafael Schouten
5c0d846643 bugfix sells and is_distributor specs and code 2014-09-28 11:55:46 +10:00
Rafael Schouten
beb85e862a get type > sells migration mostly working 2014-09-27 15:21:27 +10:00
Rob Harrington
509cf6250a Explicitly sort managed products 2014-09-19 18:32:03 +10:00
Rob H
bcca8c5c0d Merging master into all the things 2014-09-12 13:28:30 +10:00
Rohan Mitchell
e50bbeaefb Edit product form shows permitted suppliers 2014-09-12 11:33:47 +10:00
Rohan Mitchell
033fe88513 New product form shows permitted suppliers 2014-09-12 11:07:59 +10:00
Rob H
3d4e00a03c Swtich API key injection over to helper 2014-09-11 17:07:05 +10:00
Rohan Mitchell
b7708d750b Check authorisation for bulk update products 2014-09-05 15:10:15 +10:00
Rohan Mitchell
fbd4f98fa9 Include producers I have permission to in BPE producers choice 2014-09-05 15:10:15 +10:00
Rohan Mitchell
4af704b1d0 Fetch managed products via OpenFoodNetwork::Permissions 2014-09-05 15:10:14 +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
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
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
Will Marshall
33611ddb20 Renaming Product to Products and starting to figure out cart 2014-07-17 15:04:39 +10:00
Will Marshall
cd033c300e Reworking order populator and controller to handle replacement of line items rather than addition 2014-07-16 16:00:28 +10:00
Rohan Mitchell
42b951c972 Variants controller #search filters by distribution 2014-07-16 10:31:12 +10:00
Rob H
9b126df5b6 Add variant display_name to reports 2014-06-23 14:31:16 +10:00
Rob H
0611947306 Merge branch 'master' into sm-makeover 2014-06-18 10:39:40 +10:00
Rob H
004548a4fe Rearrange shipping method edit page 2014-06-18 10:21:21 +10:00
Rob H
8412d740ff Move distributors into sidebar for new & edit shipping methods screen 2014-06-12 16:10:30 +10:00
Rohan Mitchell
b970f54f53 Admin UI soft-deletes variants, not hard delete 2014-06-12 14:59:27 +10:00
Rohan Mitchell
9dc02e5eac Add product soft-delete API action 2014-06-12 14:59:26 +10:00