752 Commits

Author	SHA1	Message	Date
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	1aca4657d9	Oops, switch managed_products to editable_products for Api::ProductsController	2015-05-20 20:59:06 +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
Rob Harrington	312a6299a8	Making where clause unambiguous	2015-05-15 21:19:16 +10:00
Lynne Davis	662c7fe368	Removing notes to myself from this file	2015-05-09 19:10:55 +01:00
Lynne Davis	f7ade48e86	Update DB schema to store updatable weight on items sold	2015-05-09 19:10:55 +01:00
Continuous Integration	3d0880857a	Auto-merge from CI [skip ci]	2015-05-08 16:24:39 +10:00
Rob Harrington	f88fdac710	Adding module - doh!	2015-05-07 12:50:56 +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	7ffe0f042e	Moving accessible_by scope on Enterprise to permissions	2015-05-07 12:50:55 +10:00
Rob Harrington	f79fba52be	Hiding personal details of customers, where the user does not manage the distributor of the order or the coordinator of the order cycle	2015-05-07 12:50:55 +10:00
Rob Harrington	4259b466f5	Using new order and line item permissions to fetch items to display in Orders and Fullfillment reports	2015-05-07 12:50:55 +10:00
Rob Harrington	28bf7037db	Updating methods for retrieving allowed producers, distributors and order cycles for order and fulfillment reports	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
Rohan Mitchell	d9404d3332	Merge branch 'master' into single-order-patches	2015-05-06 17:29:23 +10:00
Rob Harrington	8788322492	Alllowing payments in payment reports to access soft-deleted payment methods	2015-05-06 11:10:50 +10:00
Rohan Mitchell	03ae740cd6	Revert "Display header for Xero invoices report" ... This reverts commit a6cecdcc25.	2015-05-01 14:55:26 +10:00
Maikel Linke	7c55285708	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches	2015-05-01 14:50:51 +10:00
Maikel Linke	e6e063670c	Allow managers to remove line items from order ... Managers of an order cycle and the distributor of an order are allowed to remove a line item from the order.	2015-05-01 14:49:34 +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	5efc0a5110	quick fix: update fees after updating order	2015-04-30 16:29:51 +10:00
Maikel Linke	f6d87eee87	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-29 13:20:44 +10:00
Maikel Linke	f94a5a975a	Edit Order: resend button uses new pretty template.	2015-04-24 15:31:45 +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	5d6f265c0a	Moving spree namespaced serializers into admin	2015-04-22 21:02:06 +10:00
Rob Harrington	c43eb9ef72	Merge branch 'email_user' into properties	2015-04-17 15:17:37 +10:00
Rob Harrington	456a6f94f5	On enterprise confirmation: create a new user based on enterprise contact email if one does not already exist, and add it as a manager	2015-04-17 10:24:37 +10:00
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
Rohan Mitchell	7f973604e5	Add columns to customer totals report: order cycle, payment method, customer code, tags, billing address	2015-04-16 10:59:15 +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	b24cad7aeb	Providing access to order_cycle_permissions in order cycles controller	2015-04-11 23:25:30 +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	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	2280a71b23	Replace for_order_cycle rabl template with a serializer	2015-04-10 09:25:40 +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	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	d516795774	Fetching Enterprise Fees for order cycle, using new enterprisefee serializer	2015-04-06 13:06:21 +10: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	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