3883 Commits

Author	SHA1	Message	Date
Rob Harrington	afe77925ba	Allow request to specify a return value when calling user_passwords#edit	2015-04-17 10:21:25 +10:00
Rob Harrington	5940ff2b2c	Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead	2015-04-16 16:56:27 +10:00
Rob Harrington	0c155e6e3a	Display message when email has not been confirmed for new enterprise	2015-04-15 15:32:17 +10:00
Rob Harrington	b24cad7aeb	Providing access to order_cycle_permissions in order cycles controller	2015-04-11 23:25:30 +10:00
Rob Harrington	6ac45f3dc8	Renaming order_cycle_exchanges as visible_exchanges	2015-04-11 22:26:55 +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	02f8f293da	Only allow managers or coordinator to add/remove fees from exchanges	2015-04-11 18:32:04 +10:00
Rob Harrington	24e3c9a9e1	Adding bugsnag notify block for catching naughty phantom fees	2015-04-10 16:41:10 +10:00
Rob Harrington	72403fd021	Fixing broken enterprise controller spec	2015-04-10 13:16:21 +10:00
Rob Harrington	96c173414b	Adding has_permission method to enterprise_relationship	2015-04-10 12:48:27 +10:00
Rob Harrington	226e2f0e2c	Fixing error caused by order show template doing a lookup based on current distributor rather than order distributor	2015-04-10 09:26:20 +10:00
Rob Harrington	2280a71b23	Replace for_order_cycle rabl template with a serializer	2015-04-10 09:25:40 +10:00
Rob Harrington	81a745420e	Only check editable status of variants when actually selecting	2015-04-09 15:24:45 +10:00
Rob Harrington	69004ac477	Select all box only selects variants I have permission to edit	2015-04-09 13:29:25 +10:00
Rob Harrington	430320e3f9	Oopsie!	2015-04-09 13:28:41 +10:00
Rob Harrington	60a3d8e0d1	Restrict bulk updating order cycles at controller level	2015-04-09 12:27:43 +10:00
Rob Harrington	8a3126f117	Using helper to disable form elements on order cycle index page	2015-04-09 11:11:46 +10:00
Rob Harrington	c7157ce7bd	Applying new helper to order cycle name and timing partial	2015-04-09 11:11:06 +10:00
Rob Harrington	133f7e4ec7	Add viewing_as_coodinator_of? helper method	2015-04-09 11:10:56 +10:00
Rob Harrington	fbcfe9b2a4	Add viewing_as_coordiantor flag to serialized order cycles and a managed flag to serialized enterprises for_order_cycle(s)	2015-04-09 10:31:17 +10:00
Rob Harrington	adc1b639bc	Merge remote-tracking branch 'origin/master' into complex_oc	2015-04-08 14:38:27 +10:00
Rob Harrington	f6e635466b	Rearranging elements on the order cycle form a little bit	2015-04-08 14:31:18 +10:00
Rob Harrington	32cc17745a	Non-coordinating user cannot alter important attributes of order cycle	2015-04-08 14:12:49 +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	ae1681b790	Not 1! Zero!	2015-04-06 23:29:15 +10:00
Rob Harrington	36c5cdf556	Only show enterprises with fees in order cycle edit page	2015-04-06 14:08:10 +10:00
Rob Harrington	d516795774	Fetching Enterprise Fees for order cycle, using new enterprisefee serializer	2015-04-06 13:06:21 +10:00
Rob Harrington	7eb735f87e	Adding for_enterprises scope on enterprise fee	2015-04-06 10:24:40 +10:00
Rob Harrington	7448d41b27	Adding abilities for new for_order_cycle action	2015-04-06 10:23:39 +10:00
Rob Harrington	b7de8353bc	Renaming existing enterprise fee serializer as basic...	2015-04-06 09:47:37 +10:00
Rob Harrington	a4b80b1f33	Implement editable scope for variants on order cycles page	2015-04-06 09:15:14 +10:00
Rob Harrington	009b25a491	Adding an editable variants scope for incoming exchanges	2015-04-05 13:59:00 +10:00
Rob Harrington	d28fc7e42d	Hubs can see incoming exchanges of producers who have given them P-OC or whose variants they are actively distributing	2015-04-03 14:58:01 +11:00
Rob Harrington	a10de68430	only load permissions once in serializer	2015-04-02 15:55:03 +11:00
Rob Harrington	3b9824171a	Adding with_order_cycles_as_supplier_outer scope to Enterprise	2015-04-02 15:53:32 +11:00
Rob Harrington	5020eb4e32	And again: override redirect to index page when editing properties from edit page	2015-04-02 14:14:16 +11:00
Rob Harrington	cb376602f2	Override redirect to index page when editing properties from edit page	2015-04-02 14:03:51 +11:00
Rob Harrington	3aa5f6e023	Adding properties tab to admin enterprise edit form	2015-04-02 11:30:32 +11:00
Rob Harrington	8926e3765e	Replace free text with with select dropdown for product property names when not super admin	2015-04-02 08:57:15 +11:00
Rob Harrington	5b235f356e	Replace free text with with select dropdown for property names when not super admin	2015-04-02 08:56:36 +11: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	8d95ba2c69	Display full name of variant on order cycle edit form	2015-04-01 15:46:19 +11:00
Rob Harrington	94a88278a9	Ignore the unit_to_display when it is wholly contained within display_name or vice versa	2015-04-01 15:46:11 +11:00
Rob Harrington	588e036c1d	Adding SKU to customer totals report	2015-04-01 14:45:23 +11:00
Rob Harrington	aa7ddbcba4	Renaming Dist. column to Admin & Handling	2015-04-01 14:38:15 +11:00
Rob Harrington	54af6886c2	Line items with a quantity of zero return price_with_adjustments of 0.0	2015-04-01 12:34:22 +11:00
Rob Harrington	d49dd62124	Replace unused bugsnag notification with one to test for line items with a quantity of zero	2015-04-01 11:38:06 +11:00
Rob Harrington	6e77a5eebc	Using the correct method name duh	2015-03-27 16:47:12 +11:00