raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,441 Commits 18 Branches 452 Tags
258573f5a67b328366e041e7d0f4e1846d2efd05
Commit Graph

603 Commits

Author SHA1 Message Date
Rohan Mitchell
0b030a85ff Incrementally load products 2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f Display products in table 2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720 Do not show producers in hubs list 2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31 Show list of hubs to select for managing variant overrides 2014-11-21 13:49:09 +11:00
Rob Harrington
79a83ee206 Adding users and enterprises report, controller action and template 2014-11-14 16:36:22 +11:00
Rob Harrington
65a5960fcc WIP: Add route for User and Enterprise report 2014-11-14 16:36:22 +11:00
Rohan Mitchell
43bac4079f Show hubs that are not ready for checkout so that we can view SEFH - Sample :/ 2014-11-13 15:21:02 +11:00
Rob Harrington
898af0a55e Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice 2014-11-06 21:19:21 +11:00
Rob Harrington
51e768e722 Refactor EnterpriseSet to accept a collection as an argument 2014-11-06 16:29:09 +11:00
Rob Harrington
93e3d87fcb Errors on bulk update for enterprise index do not allow user to list all enterprises 2014-11-06 11:01:44 +11:00
Rohan Mitchell
fdbb274667 Allow browsing products (but not cart/checkout) for hubs that are not ready for checkout 2014-11-05 14:29:36 +11:00
Rohan Mitchell
15b05de7f2 Fix specs: Distributors require shipping and payment method 2014-11-01 10:42:38 +11:00
Rohan Mitchell
8488b8e469 When user has selected a hub that is not ready for checkout, unselect it 2014-10-31 15:02:58 +11:00
Rohan Mitchell
94d50f220f Display an error message to admin when there are hubs in order cycles that are not ready for checkout 2014-10-31 12:22:02 +11:00
Rohan Mitchell
f0d3b987d4 Show hubs as unavailable when they do not have available payment and shipping methods 2014-10-31 12:22:02 +11:00
Rob Harrington
65d13e0490 Show error messages on enterprise index page 2014-10-30 13:02:16 +11:00
Rob Harrington
6155600cb2 Set environment for payment methods unless admin 2014-10-24 18:15:48 +11:00
Rob Harrington
8385bff55e Make admins get multi enterprise dashboard 2014-10-24 17:59:58 +11:00
Rob Harrington
cc0e205f50 Merge master into onbaording 2014-10-24 15:36:59 +11:00
Rob Harrington
8b819539e7 Fixing specs 2014-10-24 14:52:59 +11:00
Rob Harrington
96516a8ff3 User can switch between trialling a shopfront and not trialling a shopfront 2014-10-24 14:12:47 +11:00
Rob Harrington
20e2cb4ecc Set visibility to false for enterprises created through registration process 2014-10-24 13:31:20 +11:00
Rohan Mitchell
aea8ab4c7f Move #manages_one_enterprise? from User model to Permissions 2014-10-23 16:44:16 +11:00
Rob Harrington
e1cf5ceb57 Can set producer_profile_only using welcome page 2014-10-23 16:42:00 +11:00
Rob Harrington
d94ca0174a Registration process sets sells to 'unspecified' 2014-10-23 16:42:00 +11:00
Rob Harrington
b11c291df1 Add set_sells controller action for enterprises 2014-10-23 11:39:33 +11:00
Rob Harrington
fef97314cb Adding basic layout of welcome page for new users 2014-10-22 18:26:18 +11:00
Rob Harrington
7113875a45 Adding welcome page to overview controller 2014-10-22 16:49:32 +11:00
Rob Harrington
3d938b3450 Shifting dashboard rendering from partials to templates 2014-10-22 12:30:07 +11:00
Rob Harrington
8bf472e970 Split dashboard into single and multiple enterprise views 2014-10-22 12:21:25 +11:00
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
Rob Harrington
81715aaf5d Remove unrequired store registration action 2014-10-17 11:01:39 +11:00
Rob Harrington
c4d47ccc20 Change enterprise attributes defined in reg controller 2014-10-17 11:01:38 +11:00
Rob Harrington
28807d4f4d Merge migrate_ent_types into reg 2014-10-17 10:20:48 +11:00
Rafael Schouten
027189ac3c rename check methods 2014-10-16 16:26:49 +11:00
Rob Harrington
7db68795a4 Redirect to admin root after confirmation 2014-10-16 16:06:54 +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
6fa7d9cbcb Registration controller checks number of owned enterpises 2014-09-25 12:10:45 +10:00
Rob Harrington
509cf6250a Explicitly sort managed products 2014-09-19 18:32:03 +10:00
Rob Harrington
07275574b6 Manager can't bulk update owner 2014-09-19 18:31:50 +10:00
Rob Harrington
5d2d619d66 Assigning @spree_api_key for store 2014-09-19 18:31:33 +10:00