2263 Commits

Author	SHA1	Message	Date
Rohan Mitchell	cdbf02ca20	EnterpriseRelationship.relatives can find activated enterprises only	2015-05-29 12:07:43 +10:00
Rohan Mitchell	75f1f673ad	Update spec for EnterpriseSerializer	2015-05-27 16:26:31 +10:00
Rohan Mitchell	e74390a013	Remove controller specs for @active_distributors, now set via helper	2015-05-27 16:26:08 +10:00
Rohan Mitchell	41bc67e2d8	Add benchmark for product serialisation	2015-05-27 15:44:02 +10:00
Rohan Mitchell	e1b4c3b1e4	Add benchmarking test for inject_enterprises	2015-05-27 15:44:02 +10:00
Rohan Mitchell	2c92b5a751	Find all supplied and distributed taxons	2015-05-27 15:44:01 +10:00
Rohan Mitchell	cf79b90044	Load relatives of all enterprises in one go	2015-05-27 15:44:01 +10:00
Rohan Mitchell	704955a185	Load active distributors where they're needed rather than in most controllers	2015-05-27 15:44:01 +10:00
Rohan Mitchell	f0e909c92b	Look up the shipping services (pickup, delivery) that different hubs provide	2015-05-27 15:44:01 +10:00
Rohan Mitchell	769edbe9d5	Find the earliest closing times for each distributor in an active order cycle	2015-05-27 15:44:01 +10:00
Rohan Mitchell	99cb09c6f7	When loading products for shopfront, load all variants in one go	2015-05-27 15:44:01 +10:00
Rob Harrington	903ed7e507	Merge branch 'master' into variable_weights ... Conflicts: app/assets/javascripts/admin/bulk_order_management.js.coffee app/views/spree/admin/orders/bulk_management.html.haml app/views/spree/api/line_items/bulk_show.v1.rabl spec/features/admin/bulk_order_management_spec.rb	2015-05-21 17:31:33 +10:00
Rob Harrington	79a59e2e81	Add order_with_distributor factory	2015-05-21 13:34:32 +10:00
Rob Harrington	0b28771364	Removing unrequired specs for variant/product 'units_show'	2015-05-20 21:06:20 +10:00
Rob Harrington	3431c687b8	Making sure every created by factories has a distributor	2015-05-20 20:54:27 +10:00
Rob Harrington	8132f07d88	Adding visible products method to permissions	2015-05-20 15:53:10 +10:00
Rob Harrington	01d4cf6ecf	Renaming managed_products permissions method to editable_products	2015-05-20 15:02:36 +10:00
Rob Harrington	0ad2978926	Removing old managed route from api orders controller and switching BOM over to use new controller action	2015-05-20 11:48:48 +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	ef064819f9	Add spec for order_cycle_management report access	2015-05-15 10:41:29 +10:00
Lynne	90dd1ea4a2	Merge pull request #1 from openfoodfoundation/variable_weights ... Merging	2015-05-09 19:25:30 +01:00
Lynne Davis	4d025ee7a9	Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.	2015-05-09 19:10:55 +01:00
Lynne Davis	2f463474fb	Adding specs for variable weight adjustment via builk order management	2015-05-09 19:10:55 +01:00
Rohan Mitchell	6fb3fa55a1	Allow extended time for all parts of this spec to fix intermittent fails	2015-05-07 14:23:58 +10:00
Rob Harrington	f3f0766279	Adding a distributor to order cycle to fix broken feature spec	2015-05-07 12:50:57 +10:00
Rob Harrington	0d5ce5ff57	Fixing issues with reports controller spec	2015-05-07 12:50:57 +10:00
Rob Harrington	68b4cb59be	Fixing bulk management specs broken by making order_cycles filter update dates	2015-05-07 12:50:57 +10:00
Rob Harrington	a7019e7e78	Adding permissions method for order report enterprises	2015-05-07 12:50:56 +10:00
Rob Harrington	bd66091d75	Push logic for checking of user super admin status down into private method	2015-05-07 12:50:56 +10:00
Rob Harrington	5806f50a84	Renaming granting > related_enterprises_granting	2015-05-07 12:50:56 +10:00
Rob Harrington	5cd528a87d	Removing obsolete related_enterprises_with permission method	2015-05-07 12:50:56 +10:00
Rob Harrington	f0f7e0ee2f	Making permissions method managed_and_related_enterprise_with method more specific	2015-05-07 12:50:56 +10:00
Rob Harrington	7ffe0f042e	Moving accessible_by scope on Enterprise to permissions	2015-05-07 12:50:55 +10:00
Rob Harrington	0a03483e36	Adding permissions methods for visible and editable orders and line_items	2015-05-07 12:50:55 +10:00
Rob Harrington	b5c7607d67	Order cycle filter resets date filters on BOM	2015-05-07 12:50:55 +10:00
Rob Harrington	9ab16d8cec	Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer'	2015-05-07 12:50:54 +10:00
Rob Harrington	d8c23d37ac	Update accessible_by scope on enterprise, to read from permissions	2015-05-07 12:50:54 +10:00
Rob Harrington	89b153dc2c	Update AJAX request to use sells instead of deprecated is_distributor attribute	2015-05-07 12:50:54 +10:00
Rohan Mitchell	7b4130972b	Fix first feature spec sometimes timing out	2015-05-06 18:12:17 +10:00
Rohan Mitchell	e91de69d5a	Merge branch 'master' into pin-refunds	2015-05-01 14:58:19 +10:00
Rohan Mitchell	03ae740cd6	Revert "Display header for Xero invoices report" ... This reverts commit a6cecdcc25.	2015-05-01 14:55:26 +10:00
Rohan Mitchell	153604dd64	Merge branch 'single-order-patches'	2015-05-01 14:39:17 +10:00
Rohan Mitchell	a6cecdcc25	Display header for Xero invoices report	2015-05-01 11:59:52 +10:00
Maikel Linke	af78859db6	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-30 17:18:02 +10:00
Maikel Linke	5efc0a5110	quick fix: update fees after updating order	2015-04-30 16:29:51 +10:00
Rohan Mitchell	b498c28632	Payments can be refunded	2015-04-30 15:49:48 +10:00
Rohan Mitchell	8184a7c7b2	Pin payments can't void or credit, but they can refund	2015-04-30 15:49:48 +10:00
Rohan Mitchell	b09ae550c8	Add spec for payment actions	2015-04-30 15:49:48 +10:00
Rohan Mitchell	a207f50aeb	Merge branch 'master' into delay-devise-emails ... Conflicts: script/run_tests.sh	2015-04-30 12:29:06 +10:00
Maikel Linke	f6d87eee87	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-29 13:20:44 +10:00