41 Commits

Author	SHA1	Message	Date
Rob Harrington	1b52564d58	Rerouting welcome page to be an enterprise action, updates to copy for package selection	2015-06-12 01:49:38 +08: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
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
Rob Harrington	fc55a000b8	Adding managed controller action which uses new order serializer to render json	2015-05-20 11:48:13 +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	0d5ce5ff57	Fixing issues with reports controller spec	2015-05-07 12:50:57 +10:00
Maikel Linke	5efc0a5110	quick fix: update fees after updating order	2015-04-30 16:29:51 +10:00
Maikel Linke	a937fd3c61	Using variant overrides in variant seach on order edit page	2015-04-23 11:37:10 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rob Harrington	8ed6653dc4	Ignoring any new product properties submitted by a non-admin user	2015-04-02 08:55:20 +11:00
Rob Harrington	dcb24cf06c	Controller method to allow enterprise users to search for other users which share management of their enterprises	2015-02-12 11:34:58 +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
Rob Harrington	7113875a45	Adding welcome page to overview controller	2014-10-22 16:49:32 +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	b821107c27	bugfix migration ad specs	2014-09-27 18:14:10 +10:00
Rohan Mitchell	b7708d750b	Check authorisation for bulk update products	2014-09-05 15:10:15 +10:00
Rob H	d80166e80d	Restrict access to show_provider_preferences action on payment methods controller	2014-08-08 17:47:50 +10:00
Rob H	f19af52556	WIP: angularised provider settings for payment method works on create (for admin only at this stage)	2014-08-08 17:47:50 +10:00
Rob H	f430267304	Specs for show_provider_preferences	2014-08-08 17:47:50 +10:00
Rohan Mitchell	42b951c972	Variants controller #search filters by distribution	2014-07-16 10:31:12 +10:00
Rohan Mitchell	f18141c9bb	Use controller login helpers	2014-07-16 10:29:58 +10:00
Rohan Mitchell	634af96a66	Update reports controller spec for multi-order-cycle params	2014-06-06 09:47:16 +10:00
Rob H	66a47f053c	Amend products controller spec to include requirement for primary_taxon_id	2014-05-30 16:21:04 +10:00
Rob H	66d6de9dfc	Merge master (with primary taxons restored)	2014-05-30 15:45:48 +10:00
Will Marshall	20873b6e45	Patching a minor regression spec	2014-05-30 14:21:21 +10:00
Will Marshall	368fbd2383	Patching up admin redirects to be MOAR UNIVERSAL	2014-05-30 12:52:14 +10:00
Rob H	9b10a2cb94	Added 'Add Another' link to new product page. Altered redirects	2014-05-29 12:13:55 +10:00
Rohan Mitchell	0d97397084	Fix fragile specs (ordering)	2014-03-12 15:00:20 +11:00
Will Marshall	cdd64d438a	Adding another trivial sort to a test	2014-01-16 13:23:57 +11:00
Rohan Mitchell	c08c42b087	Fix inconsistent test fails - insignificant ordering	2014-01-08 15:11:46 +11:00
Will Marshall	6e36142809	Making some changes to the data on the products inventory page	2013-12-13 11:39:45 +11:00
Will Marshall	b3bf3a8378	Adding the plumbing for Customers reports, and one tiny refactor to products	2013-11-22 14:56:57 +11:00
Will Marshall	f642d6532a	Removing reundant Group Buys spec now we've removed Group Buys	2013-11-21 14:06:46 +11:00
Will Marshall	d703e1836f	Working build of P&I report	2013-11-21 14:06:24 +11:00
Will Marshall	6a11b2685f	Controller plumbing for Product & Inventory report	2013-11-20 13:58:01 +11:00
David Cook	fe513d42c4	Rename 'Order Cycles' report group to 'Orders & Fulfillment'	2013-09-18 09:25:51 +10:00
David Cook	80bfc5ce53	Ensure Supplier enterprise users can only view their own products in reports	2013-08-30 15:17:27 +10:00
David Cook	9de5a0061e	Enterprise user can only view their own distributors in reports (and remove redundant feature test)	2013-08-23 16:09:37 +10:00
David Cook	f1c2582e65	WIP: Test for enterprise user access in reports	2013-08-22 12:49:39 +10:00