7241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Harrington	8859aa27ee	Slight refactor of order cycle enterprises	2015-04-08 10:33:32 +10:00
Rob Harrington	24062e5585	Adding permissions for outgoing hubs to see producers whose variants they are distributing, despite P-OC not existing	2015-04-08 10:15:50 +10:00
Rob Harrington	4a87798bb4	Variants belonging to a producer I manager that are already in an outgoing an exchange need not be editable	2015-04-06 23:30:43 +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	7ebea23fda	Adding route for now for_order_cycle action on enterprise fees	2015-04-06 10:23:08 +10:00
Rob Harrington	b7de8353bc	Renaming existing enterprise fee serializer as basic...	2015-04-06 09:47:37 +10:00
Rob Harrington	52dc313e70	Implementing editable variant scopes in order_cycle_applicator	2015-04-06 09:20:39 +10:00
Rob Harrington	a4b80b1f33	Implement editable scope for variants on order cycles page	2015-04-06 09:15:14 +10:00
Rob Harrington	f20844c2a0	Adding editable scope for variants in outgoing exchanges	2015-04-05 15:25:44 +10:00
Rob Harrington	136d361134	Fixing comment	2015-04-05 14:14:47 +10:00
Rob Harrington	009b25a491	Adding an editable variants scope for incoming exchanges	2015-04-05 13:59:00 +10:00
Rob Harrington	bf87394a76	Fixing order cycle feature spec	2015-04-05 10:58:06 +10:00
Lynne Davis	ff935af18b	Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.	2015-04-04 19:20:56 +01:00
Lynne Davis	ffd850c761	Adding specs for variable weight adjustment via builk order management	2015-04-04 19:20:41 +01:00
Lynne Davis	bf44a1c862	Update DB schema to store updatable weight on items sold	2015-04-04 19:20:27 +01: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	5d7659aa3c	Fixing product spec, using have_select2 instead of have_field	2015-04-02 14:36:19 +11:00
Rob Harrington	1e1d52cc47	Adding 'selected' option to have_select2 matcher	2015-04-02 14:35:39 +11:00
Rob Harrington	76648b97b0	Update spec, properties must exist for enterprise users before they can be assigned	2015-04-02 14:15:00 +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
Paul Mackay	d4cf44a6dd	Use COUNTRY_CODE instead of COUNTRY in application.yml.	2015-03-29 17:06:05 +01:00
Rob Harrington	6e77a5eebc	Using the correct method name duh	2015-03-27 16:47:12 +11:00
Rob Harrington	2d5118290b	Fixing broken order cycle feature specs	2015-03-27 16:19:52 +11:00
Rob Harrington	74b7feda53	coordinator of a simple order cycle has permission to add their own variants to outgoing exchanges	2015-03-27 16:16:13 +11:00
Rob Harrington	f5bacf71b7	Permissions for OrderCycleFormApplicator are determined internally	2015-03-27 16:16:13 +11:00
Rob Harrington	3817ef202c	Enterprises in simple OC create controller only load after OC initialises	2015-03-27 16:16:12 +11:00
Rob Harrington	aa170ef5f6	Order cycle simple create controller uses 'new' method on OC service to initialise	2015-03-27 16:16:12 +11:00
Rob Harrington	4d14acb64d	Don't send non-attributes of js order_cycle object to server	2015-03-27 16:16:12 +11:00
Rob Harrington	43d2eb4d22	Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs	2015-03-27 16:16:12 +11:00
Rob Harrington	887579ecb8	Use managed_by scope on Enterprise instead of user.enterprises	2015-03-27 16:16:12 +11:00
Rob Harrington	9430999540	Filtering exchange variants, for outgoing exchange variant count	2015-03-27 16:16:12 +11:00
Rob Harrington	193a061c44	Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to permissions	2015-03-27 16:16:11 +11:00