Commit Graph

292 Commits

Author SHA1 Message Date
Rohan Mitchell
a384f5e3d4 Merge branch 'buildkite' into customer-totals-report-and-perms-fix 2015-04-16 14:08:39 +10:00
Rohan Mitchell
318957551f Freeze time to make spec repeatable 2015-04-16 14:07:38 +10:00
Rohan Mitchell
2e021941d1 Fix bug where new enterprises should be created as hubs, but aren't 2015-04-16 10:59:15 +10:00
Rob Harrington
e3138c3cd2 Renaming order_cycle_enterprises_for as visible_enterprises 2015-04-11 22:25:23 +10:00
Rob Harrington
26d55baa35 Moving order cycle permissions to their own permissions class 2015-04-11 21:11:10 +10:00
Rob Harrington
72403fd021 Fixing broken enterprise controller spec 2015-04-10 13:16:21 +10:00
Rob Harrington
60a3d8e0d1 Restrict bulk updating order cycles at controller level 2015-04-09 12:27:43 +10:00
Rob Harrington
adc1b639bc Merge remote-tracking branch 'origin/master' into complex_oc 2015-04-08 14:38:27 +10:00
Rob Harrington
61a9e2f7cc Add a referer for all admin enterprise controller specs 2015-04-08 14:36:56 +10:00
Rob Harrington
104a8ddecf Refactor order_cycle_enterpises_for permission method, now requires an order cycle 2015-04-08 13:00:17 +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
ca1a5b5f8d Ignoring any new producer properties submitted by the user 2015-04-02 08:54:35 +11:00
Rob Harrington
35b27fcfd2 Delegating responsibility for returning an empty scope when no options are passed to order_cycle_enterprises_for 2015-03-27 16:16:10 +11:00
Rob Harrington
45f6042d3d Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator 2015-03-27 16:16:10 +11:00
Rohan Mitchell
8037811735 Only make new enterprises as hubs when current user *owns*, not just manages a hub. 2015-03-27 14:38:21 +11:00
Rohan Mitchell
0ed1eeffd6 When registering a new enterprise, if user is signed in, owns a hub and is not making a producer, the new enterprise becomes a hub 2015-03-27 14:05:58 +11:00
Rohan Mitchell
09a102bd8b When an enterprise user with a hub creates a new producer, it does not default to sells any #453 2015-03-27 12:02:20 +11:00
Rohan Mitchell
a6f0d8f69a Show a nice error message instead of 500 error when deleting a referenced order cycle 2015-03-16 12:42:35 +11:00
Rohan Mitchell
1a44e74a9d When enterprise user creates an enterprise, make it a hub if they have other hubs 2015-03-13 16:06:42 +11:00
Rob Harrington
8de6f983a2 User must set the coordinator first when creating an order cycle 2015-02-27 17:24:36 +11:00
Rob Harrington
a62f48441d Restrict ability to change managers of enterprises using update action 2015-02-12 11:34:58 +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
Rob Harrington
b0a29801b6 Making spec controller product request spec a little bit more robust 2015-01-22 10:20:03 +11:00
Rob Harrington
c3659612ed enterprise routes use permalink 2015-01-22 10:19:42 +11:00
Rob Harrington
7a6cd98646 Fixing failing spec, missing permalink 2015-01-22 10:19:42 +11:00
Rob Harrington
9286c82b43 Removing obsolete methods 2015-01-22 10:19:42 +11:00
Rob Harrington
c330e49a7f Moving permalink check action to enterprise controller 2015-01-22 10:19:42 +11:00
Rob Harrington
e2268e53bb Adding action to check uniquness of enterprise permalink against existing routes 2015-01-22 10:19:41 +11:00
Rohan Mitchell
0431e0048c Merge branch 'master' into variant-overrides-frontend
Conflicts:
	app/controllers/shop_controller.rb
	app/views/shop/products/_form.html.haml
	spec/controllers/shop_controller_spec.rb
2015-01-12 16:48:51 +11:00
Rob Harrington
170b14d0f5 Tightening up expectations in shop controller spec 2014-12-19 15:39:13 +11:00
Rob Harrington
21e4f40616 Implementing primary taxon ordering on the shopfront 2014-12-19 14:05:23 +11:00
Rohan Mitchell
2ea7bdbec6 Move controller spec to serializer spec 2014-12-17 14:01:59 +11:00
Rob Harrington
3be437485a Redirecting any spree checkout_state redirects to our checkout controller 2014-12-11 14:53:11 +11:00
Maikel Linke
349b7de11a Using simple_order_cycle
Before: 2 minutes 58.3 seconds
After:  35.04 seconds
2014-11-28 14:02:55 +11:00
Maikel Linke
73b8f37d77 Using simple_order_cycle
Before: 2 minutes 8.7 seconds
After:  16.11 seconds
2014-11-28 13:55:06 +11:00
Maikel Linke
082a3cd9ab Creating simple_order_cycle instead of order_cycle
Speedup on my machine:
 1 minute 44.52 seconds
 21.9 seconds
2014-11-28 12:29:47 +11:00
Rohan Mitchell
43bac4079f Show hubs that are not ready for checkout so that we can view SEFH - Sample :/ 2014-11-13 15:21:02 +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
93e3d87fcb Errors on bulk update for enterprise index do not allow user to list all enterprises 2014-11-06 11:01:44 +11:00
Rohan Mitchell
fdbb274667 Allow browsing products (but not cart/checkout) for hubs that are not ready for checkout 2014-11-05 14:29:36 +11:00
Rohan Mitchell
15b05de7f2 Fix specs: Distributors require shipping and payment method 2014-11-01 10:42:38 +11:00
Rohan Mitchell
0cf4e01dde Fix specs: Expect proper query chain 2014-11-01 10:39:29 +11:00
Rohan Mitchell
8488b8e469 When user has selected a hub that is not ready for checkout, unselect it 2014-10-31 15:02: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
96516a8ff3 User can switch between trialling a shopfront and not trialling a shopfront 2014-10-24 14:12:47 +11:00
Rob Harrington
e1cf5ceb57 Can set producer_profile_only using welcome page 2014-10-23 16:42:00 +11:00
Rob Harrington
b11c291df1 Add set_sells controller action for enterprises 2014-10-23 11:39:33 +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