628 Commits

Author	SHA1	Message	Date
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	f6b0863279	Make cost breakdowns consistent throughout checkout	2014-11-26 13:07:40 +11:00
Rob Harrington	9bd3909449	Merge master into pretty-emails	2014-11-21 14:43:01 +11:00
Rohan Mitchell	58fdc48b9f	Display products in table	2014-11-21 13:49:09 +11:00
Rohan Mitchell	f9b4c07219	Add initial VariantOverride model with price lookup	2014-11-21 13:49:09 +11:00
Rob Harrington	5e3f1e4a3b	Adding bugsnag notifier to work out what is happening with bug when adding variants to order	2014-11-21 12:37:56 +11:00
Rohan Mitchell	021cca4fca	Stylistic changes	2014-11-21 08:41:41 +11:00
Rob Harrington	ebaaf2a136	Display line items in confirmation email with fees included in item totals	2014-11-20 20:17:18 +11:00
Rob Harrington	20341ecbc1	Send bugsnag notification when order confirmation email fails	2014-11-20 12:04:51 +11:00
Rob Harrington	c9d0721acd	Rewire order confirmation email so that two separate emails are sent, one for customers and one for shop owners	2014-11-19 11:03:00 +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	51e768e722	Refactor EnterpriseSet to accept a collection as an argument	2014-11-06 16:29:09 +11:00
Rob Harrington	b27a0986b7	Ensure collection is locked down before we start asssigning attributes to model set	2014-11-06 16:28:24 +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	65d13e0490	Show error messages on enterprise index page	2014-10-30 13:02:16 +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	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