1800 Commits

Author	SHA1	Message	Date
Rob Harrington	cc0e205f50	Merge master into onbaording	2014-10-24 15:36:59 +11:00
Rob Harrington	a157528974	Adding specs for single ent dash and remove product ability for profiles	2014-10-24 15:27:08 +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	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
Rohan Mitchell	bf61d12bfa	Merge branch 'simple-order-cycles' ... Conflicts: app/views/admin/order_cycles/_row.html.haml	2014-10-23 12:11:34 +11:00
Rob Harrington	b11c291df1	Add set_sells controller action for enterprises	2014-10-23 11:39:33 +11:00
Rohan Mitchell	ab76c66b68	Admin can update order cycles with simple interface	2014-10-23 11:38:15 +11:00
Rohan Mitchell	f7c1340f99	Admin can view an order cycle in the simple edit form	2014-10-23 11:08:27 +11:00
Rob Harrington	2e0d5eb829	Adding set_sells action to enterprises	2014-10-23 10:27:53 +11:00
Rohan Mitchell	56ebe688dc	Fix file naming	2014-10-23 10:22:03 +11:00
Rohan Mitchell	8b616e7d17	Add unit spec for order cycles simple create controller	2014-10-23 10:21:19 +11:00
Rohan Mitchell	2ad823a79d	Fix JS specs	2014-10-23 09:39:23 +11:00
Rohan Mitchell	94e1995469	Merge branch 'master' into simple-order-cycles	2014-10-23 09:36:03 +11:00
Rafael Schouten	069b9ce91d	fix email length validation spec	2014-10-22 17:49:44 +11:00
Rohan Mitchell	3e61aa7267	Simple interface remove coordinator fee	2014-10-22 17:26:22 +11:00
Rohan Mitchell	8fb95769bf	Fix tested values in spec	2014-10-22 17:07:45 +11:00
Rob Harrington	7113875a45	Adding welcome page to overview controller	2014-10-22 16:49:32 +11:00
Rob Harrington	45ed3a4cff	Only pushes activated enterprises through to the frontend	2014-10-22 15:39:49 +11:00
Rob Harrington	565d6739b3	Add 'activated' scope to enterprises	2014-10-22 15:13:52 +11:00
Rafael Schouten	a53cbb677d	fix report typos	2014-10-22 14:55:01 +11:00
Rafael Schouten	afa6119ec1	better coverage for enterprise abilities, hide products from non producers	2014-10-22 14:53:20 +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
Rafael Schouten	2a7dd8b8f1	update ability specs for reports	2014-10-18 06:53:38 +11:00
Rafael Schouten	b71a40ae6d	show all permitted enterprises in order cycle summery	2014-10-18 03:26:57 +11:00
Rob Harrington	361116a9ec	Explicitly set confirmed_at for unconfirmed enterprise	2014-10-17 18:31:35 +11:00
Rob Harrington	cae8d566df	Explicit confirmed_at to ensure that confirmation emails are sent	2014-10-17 17:49:18 +11:00
Rob Harrington	f499cc375b	Adding confirmed_at to enterprise factory	2014-10-17 17:32:27 +11:00
Rob Harrington	5b3ff9160d	Fix Registration spec	2014-10-17 17:15:16 +11:00
Rohan Mitchell	deedafde9a	WIP: Simple order cycle form loads and displays correct info	2014-10-17 16:55:55 +11:00
Rob Harrington	b2565991e6	Merge branch 'master' into reg_and_ent_types	2014-10-17 12:33:21 +11:00
Rob Harrington	a6bc9e66f6	Only send one enterprise creation confirmation email	2014-10-17 12:29:51 +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
Rob Harrington	28807d4f4d	Merge migrate_ent_types into reg	2014-10-17 10:20:48 +11:00
Rafael Schouten	f1280a31a6	Merge branch 'reports' into bugfix	2014-10-17 07:41:30 +11:00
Rafael Schouten	6fd9741daf	use build instead of create, and reorganise code	2014-10-16 16:51:09 +11:00
Rafael Schouten	a1d74649f3	rename spec and clear todo	2014-10-16 16:50:19 +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
Rohan Mitchell	7e23479f3a	Consistency	2014-10-16 12:08:12 +11:00
Rob Harrington	a6480e6831	Merge in enterprise confirmation	2014-10-16 11:52:10 +11:00
Rafael Schouten	1577c01a77	add reports abilities specs	2014-10-16 04:29:33 +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