83 Commits

Author	SHA1	Message	Date
Maikel Linke	cd7721a127	Using date and time of current timezone ... Using Time.zone.now and Date.current instead of Time.now and Date.today. This should make all specs timezone independent.	2015-12-10 11:38:41 +11:00
Maikel Linke	c4fb4a8510	Removing Suburbs from the code ... Suburbs are not used any more. Removing the last code bits should avoid confusion and save a tiny bit of test time.	2015-12-04 10:37:55 +11:00
Rohan Mitchell	3f8235593a	When enterprise is deleted, delete relationships	2015-07-10 09:42:09 +10:00
Rohan Mitchell	c5526c78d9	Make enterprise name unique	2015-06-17 15:01:46 +10:00
Rob Harrington	359328a96e	Producers and distributors lists include self where appropriate	2015-06-03 16:18:44 +08:00
Continuous Integration	c14de4e97f	Auto-merge from CI [skip ci]	2015-05-29 14:29:23 +10:00
Rohan Mitchell	7486daa2a3	Merge branch 'master' into require_standard_variant ... Conflicts: spec/controllers/spree/admin/variants_controller_spec.rb spec/lib/open_food_network/permissions_spec.rb spec/lib/open_food_network/products_and_inventory_report_spec.rb spec/models/enterprise_spec.rb	2015-05-28 15:08:13 +10:00
Maikel Linke	e4f93863fd	Finding unique permalink before validation.	2015-05-28 11:27:40 +10:00
Rohan Mitchell	97e49c2bdb	Replace 'array.sort.should == expected.sort' pattern with match_array	2015-05-28 10:46:08 +10:00
Rob Harrington	e931f4b31f	Merge branch 'master' into require_standard_variant	2015-05-22 12:22:54 +10:00
Rohan Mitchell	1531c476e3	Merge branch 'master' into require_standard_variant ... Conflicts: spec/controllers/spree/admin/variants_controller_spec.rb	2015-05-08 13:45:31 +10:00
Rob Harrington	7ffe0f042e	Moving accessible_by scope on Enterprise to permissions	2015-05-07 12:50:55 +10:00
Rob Harrington	d8c23d37ac	Update accessible_by scope on enterprise, to read from permissions	2015-05-07 12:50:54 +10:00
Rohan Mitchell	700cb73b8f	Send enterprise confirmation emails asynchronously	2015-04-21 16:19:02 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rohan Mitchell	e9fbd74e88	Send emails via jobs instead of synchronously	2015-04-16 16:54:43 +10:00
Rohan Mitchell	e570352a1b	Grant fewer permissions on enterprise creation	2015-04-16 10:59:15 +10:00
Rohan Mitchell	fa4741eb65	Update auto-creation of E2E links: more specific and restricted link creation	2015-02-26 13:49:15 +11:00
Rohan Mitchell	636ed2ad0d	Make bi-directional relationships	2015-02-13 09:24:48 +11:00
Rohan Mitchell	1d61e91afd	When enterprise created, grant permission to all co-owned enterprises, not just hubs	2015-02-13 09:24:48 +11:00
Rohan Mitchell	7ac888ae00	Admin can grant create_variant_overrides permission	2015-01-30 11:56:05 +11:00
Rob Harrington	36430d3bad	Enterprise permalink generator handles blank permalink case	2015-01-22 10:19:46 +11:00
Rob Harrington	7520552fd7	Removing spec for testing empty permalink, since we now force permalink to be created when empty	2015-01-22 10:19:46 +11:00
Rob Harrington	3e5ea3fe63	Adding automatic permalink generation on enterprise creation	2015-01-22 10:19:45 +11:00
Rob Harrington	6b10a4a775	Restoring enterprise permalinks when they cause errors	2015-01-22 10:19:43 +11:00
Rob Harrington	9f0aeb5adf	Adding unique permalink to enterprises	2015-01-22 10:19:41 +11:00
summerscope	d2d3a577ea	Merging master into this branch to make it easy to pull for staging push	2015-01-15 17:38:35 +11:00
Rob Harrington	fcb14f32d2	Validating user input for shopfront taxon order	2014-12-19 14:04:02 +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
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
Rafael Schouten	069b9ce91d	fix email length validation spec	2014-10-22 17:49:44 +11:00
Rob Harrington	565d6739b3	Add 'activated' scope to enterprises	2014-10-22 15:13:52 +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	cae8d566df	Explicit confirmed_at to ensure that confirmation emails are sent	2014-10-17 17:49:18 +11:00
Rob Harrington	28807d4f4d	Merge migrate_ent_types into reg	2014-10-17 10:20:48 +11:00
Rafael Schouten	6fd9741daf	use build instead of create, and reorganise code	2014-10-16 16:51:09 +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	6e699b2e8b	Mailer tests	2014-10-15 11:52:04 +11:00
Rafael Schouten	5dd9879b96	validate description max lenth	2014-10-12 21:57:01 +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	a0494b136f	test that email is validated	2014-10-03 17:32:04 +10:00