9694 Commits

Author	SHA1	Message	Date
Rob Harrington	6798d394bb	Use unspecified rather than unconfirmed	2014-10-22 14:50:22 +11:00
Rob Harrington	7ff4306991	Adding 'unspecified' option to 'sells' on Enterprise	2014-10-22 13:13:21 +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	9e0f8100d9	only producers have product permissions	2014-10-18 08:28:08 +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
Rafael Schouten	b71a40ae6d	show all permitted enterprises in order cycle summery	2014-10-18 03:26:57 +11:00
Rafael Schouten	577cb06371	make navCallback actually versatile	2014-10-18 01:42:29 +11:00
Rob Harrington	338ba74652	Only show enterprise partial when no enterprises exist	2014-10-17 17:15:49 +11:00
Rohan Mitchell	deedafde9a	WIP: Simple order cycle form loads and displays correct info	2014-10-17 16:55:55 +11:00
Rohan Mitchell	d8b648d531	Extract name and timing form from order cycles	2014-10-17 16:51:03 +11:00
Rohan Mitchell	078d2bac11	Extract factories from order cycles admin angular	2014-10-17 16:50:16 +11:00
Rohan Mitchell	f060da9c8d	Rename angular app order_cycle -> admin.order_cycles	2014-10-17 14:13:27 +11:00
Rob Harrington	b2565991e6	Merge branch 'master' into reg_and_ent_types	2014-10-17 12:33:21 +11:00
Rob Harrington	eda0b16a5f	Make state abbreviations upper case	2014-10-17 12:29:51 +11:00
Rob Harrington	e9a3f8ce91	Require user to choose producer or not	2014-10-17 12:29:51 +11:00
Rob Harrington	a6bc9e66f6	Only send one enterprise creation confirmation email	2014-10-17 12:29:51 +11:00
summerscope	b671543a95	Style and make pretty the finished step of profile creation	2014-10-17 12:25:04 +11:00
summerscope	4abc59f66d	Change styling on the enterprise name because we dont know what type it is yet	2014-10-17 12:02:21 +11:00
summerscope	4aa2aa5aee	Tweaking layout, text, styling for registration box	2014-10-17 11:56:25 +11:00
summerscope	2c5208ce6b	Change ent type page, simplify!	2014-10-17 11:17:53 +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
Rohan Mitchell	694dd0c329	Enterprise user selling own produce only sees simple order cycle listing	2014-10-17 10:52:36 +11:00
summerscope	4884734ab5	Align Continue buttons right consistently	2014-10-17 10:43:19 +11:00
Rob Harrington	28807d4f4d	Merge migrate_ent_types into reg	2014-10-17 10:20:48 +11:00
Rafael Schouten	9536b3e764	add navigation directive default	2014-10-17 07:58:08 +11:00
Rafael Schouten	f1280a31a6	Merge branch 'reports' into bugfix	2014-10-17 07:41:30 +11:00
Rafael Schouten	245c1eb305	use a directive for navigation check to attach it to the page instead of the controller	2014-10-17 07:40:08 +11:00
Rafael Schouten	1150e69500	fix visible bug	2014-10-17 03:59:48 +11:00
Rob Harrington	c7145f8dcd	Merge branch 'reg' of github.com:openfoodfoundation/openfoodnetwork into reg	2014-10-16 16:53:34 +11:00
Rafael Schouten	f145db46f1	use self.x	2014-10-16 16:49:49 +11:00
summerscope	8d01bb7ebf	Pretty responsive email template!!!!!!!!	2014-10-16 16:45:15 +11:00
Rafael Schouten	425105174e	return space remover	2014-10-16 16:26:50 +11:00
Rafael Schouten	c5afd8cebf	move visible filter to pages, and use category	2014-10-16 16:26:50 +11:00
Rafael Schouten	027189ac3c	rename check methods	2014-10-16 16:26:49 +11:00
Rafael Schouten	f0a3296e52	change enterprise category name ans use symbols instead of strings	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
Rob Harrington	a6480e6831	Merge in enterprise confirmation	2014-10-16 11:52:10 +11:00
Rob Harrington	63e50dc88c	Fiddle with alert styling	2014-10-16 11:34:06 +11:00
Rafael Schouten	fd7191f476	add missing orders_and_distributors perm	2014-10-16 05:26:38 +11:00
Rafael Schouten	9343c3608b	allow supplier enterprise manager to see bulk coop reports	2014-10-16 04:29:33 +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	0d715ce615	split report permissions	2014-10-16 04:29:16 +11:00
Rob Harrington	96878f5dcb	Don't require confirmation for enterprises where the email address has already been confirmed for another enterprise	2014-10-15 17:22:56 +11:00
Rob Harrington	0940af6b66	Remove bad pry	2014-10-15 16:21:11 +11:00
Rob Harrington	e0e8ba814f	Show explanation of confirm process on final page of registration	2014-10-15 16:20:45 +11:00