137 Commits

Author	SHA1	Message	Date
Rob Harrington	21e4f40616	Implementing primary taxon ordering on the shopfront	2014-12-19 14:05:23 +11:00
Rob Harrington	fcb14f32d2	Validating user input for shopfront taxon order	2014-12-19 14:04:02 +11:00
Rob Harrington	f145a7ed65	Moving taxons into its own module, adding preferred shopfront taxon order to enterprise	2014-12-19 14:04:02 +11:00
Rob Harrington	3fa1832e7b	Adding shop closed message preference	2014-12-19 14:04:01 +11:00
Rob Harrington	a489aa7ad9	Fixing enterprise feature spec, adding first shop preference	2014-12-19 14:04:00 +11:00
Rob Harrington	a8dde3bbb9	Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry	2014-11-26 15:16:53 +11:00
Rob Harrington	ee2ee5dba7	Adding an enterprise welcome email	2014-11-12 15:20:51 +11:00
Rob Harrington	e1823212d6	Reconfirmation email not required when we already know about new email address for enterprise	2014-11-06 21:19:22 +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	be042af751	Add explicit select statement to prevent scope being read only	2014-11-06 15:54:59 +11:00
Rohan Mitchell	abeabd5b1c	Add Enterprise#ready_for_checkout?	2014-10-31 14:04:43 +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	977c508833	Make enterprise limit error messages more specific	2014-10-30 13:02:16 +11:00
Rob Harrington	cc0e205f50	Merge master into onbaording	2014-10-24 15:36:59 +11:00
Rob Harrington	d0c3502f27	Adding trial progress bar	2014-10-24 12:32:05 +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
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	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	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
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	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	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
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
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
Rafael Schouten	bd922085c4	icons and entity category logic	2014-09-18 15:14:55 +10:00
Rafael Schouten	21628ed069	Merge branch 'master' into ent_types_frontend2	2014-09-17 17:45:55 +10:00