607 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	d0c3502f27	Adding trial progress bar	2014-10-24 12:32:05 +11:00
Rohan Mitchell	aea8ab4c7f	Move #manages_one_enterprise? from User model to Permissions	2014-10-23 16:44:16 +11:00
Rob Harrington	2e0d5eb829	Adding set_sells action to enterprises	2014-10-23 10:27:53 +11:00
Rob Harrington	565d6739b3	Add 'activated' scope to enterprises	2014-10-22 15:13:52 +11:00
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	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
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	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	f145db46f1	use self.x	2014-10-16 16:49:49 +11:00
Rafael Schouten	f0a3296e52	change enterprise category name ans use symbols instead of strings	2014-10-16 16:26:49 +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	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	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	c76a3815c0	Add unconfirmed scope	2014-10-15 15:45:47 +11:00
Rob Harrington	1bdc55cb33	Adding confirmed scope to enterprises	2014-10-15 13:03:39 +11:00
Rob Harrington	908c242d36	Confirmation email when creating enterprise	2014-10-15 10:48:05 +11:00
Rafael Schouten	5dd9879b96	validate description max lenth	2014-10-12 21:57:01 +11:00
Rob Harrington	b8b19368df	WIP: Making enterprise emails confirmable	2014-10-10 16:54:38 +11:00
Rohan Mitchell	d5ea2a0206	Make Enterprise and EnterpriseGroup promo images jpg format	2014-10-10 15:40:05 +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	922e335e83	add is_hub to model	2014-10-06 15:42:23 +11:00
Rafael Schouten	cc6af82823	move reports abilitiy to can manage products block, producers need to use this too	2014-10-06 15:40:41 +11:00
Rafael Schouten	2f76a7ba80	add comment for hub sells own case	2014-10-05 01:44:12 +10:00
Rafael Schouten	ff4f8f63af	Merge branch 'master' into raf_bugfix ... Conflicts: app/views/spree/order_mailer/confirm_email.text.haml	2014-10-02 19:06:30 +10:00
Rafael Schouten	b3520c4385	Bugfix for specs	2014-10-02 16:49:32 +10:00
Rafael Schouten	1e84e4fa85	own and any instead of single and full for abilities	2014-10-02 13:11:19 +10:00
Rafael Schouten	4fde0ad2d7	Merge branch 'master' into migrate_ent_types	2014-10-01 16:11:20 +10:00
Rob Harrington	5497f229e1	Ignoring enterprise ownership before_validations when no owner set	2014-10-01 11:49:46 +10:00
Rafael Schouten	beb85e862a	get type > sells migration mostly working	2014-09-27 15:21:27 +10:00
Rob Harrington	4b2f1cefa0	Spliting order management abilities out of product management abilities	2014-09-26 17:11:11 +10:00
Rob Harrington	299b0fe5be	Allowing all enterprise users to access products	2014-09-26 15:01:23 +10:00
Rafael Schouten	e9c8547ca3	fix enterprsie model logic	2014-09-26 15:01:23 +10:00
Rob Harrington	1e31dd88ee	Remove unrequired functions, add has_hub_listing	2014-09-25 17:19:57 +10:00
Rafael Schouten	6069127733	validate contact email	2014-09-25 15:16:50 +10:00
Rafael Schouten	da620f3723	Merge branch 'master' into ent_types_frontend	2014-09-25 10:09:42 +10:00
Rafael Schouten	f8d5b7ede8	refactor enterprise types to six options	2014-09-24 23:30:43 +10:00
Rob Harrington	17ce80a417	Allow new user to create enterprises	2014-09-19 18:31:23 +10:00
Rafael Schouten	e4991d4528	reorganise and document enterprise categories	2014-09-19 16:44:28 +10:00
Rob Harrington	d3e72b5a2a	Adding images to registration process	2014-09-19 12:41:24 +10:00
Rafael Schouten	0d5106d571	refactor enterprise type logic and fix icons	2014-09-18 18:15:28 +10:00