363 Commits

Author	SHA1	Message	Date
Rohan Mitchell	7cc2bc4fde	Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.	2015-06-18 13:11:11 +10:00
Rohan Mitchell	7412e92665	Merge branch 'master' into optimise-shopfront	2015-06-10 16:39:02 +10:00
Maikel Linke	7461009c3b	Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes	2015-06-05 14:23:58 +10:00
Maikel Linke	ffa960b02e	Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor	2015-06-05 13:48:24 +10:00
Maikel Linke	e35b39c7cf	Handle invalid referer URLs ... Rescues URI::InvalidURIError of URL(request.referer).	2015-06-05 12:43:49 +10:00
Rohan Mitchell	f09fad464e	Merge branch 'master' into optimise-shopfront	2015-06-05 07:28:05 +10:00
Rohan Mitchell	3846d16822	Add methods to load fees for a number of variants in one go	2015-06-04 16:22:06 +10:00
Rohan Mitchell	486c2f9b42	WIP: Skip EnterpriseFeeApplicator step when computing fees	2015-06-04 12:13:04 +10:00
Rohan Mitchell	cf0031d9a5	WIP: Optimise enterprise fee calculation	2015-06-04 11:53:09 +10:00
Rob Harrington	3855ae1337	Fixing bug on OC interface that prevented hubs from pulling their own products through	2015-06-03 16:18:44 +08:00
Maikel Linke	7302963605	inventory report: filter was broken because filter_to_order_cycle returned nil ... [skip ci]	2015-06-03 15:11:32 +10:00
Rohan Mitchell	69c54e1d70	Only load activated relatives for EnterpriseInjectionData	2015-05-29 12:08:21 +10:00
Rohan Mitchell	31b726613d	Avoid loading enterprise injection data when it's not be needed due to caching	2015-05-27 15:44:01 +10:00
Rob Harrington	65a6329132	Products and inventory reports scopes products to visible in permissions	2015-05-20 16:19:08 +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
Rohan Mitchell	70b5ac4785	Add column for whether the order has been paid for	2015-05-15 16:55:52 +10:00
Rohan Mitchell	f7642b2a1b	When blank values are submitted, do not override defaults	2015-05-15 16:51:04 +10:00
Rohan Mitchell	3d4a0f8407	Xero invoices report: Preserve form fields on submit, do not show rows with no cost	2015-05-15 15:27:46 +10:00
Rohan Mitchell	3640a71ab8	Reorder methods	2015-05-15 15:05:18 +10:00
Rohan Mitchell	ca37efdd26	Display whether there is tax included in shipping	2015-05-15 12:44:48 +10:00
Rohan Mitchell	dc8270ed72	Display amounts on xero invoice report	2015-05-15 12:35:20 +10:00
Rohan Mitchell	5660e3737e	Extract order rows generation to method	2015-05-15 12:35:19 +10:00
Rohan Mitchell	c5b618b1f4	Admin can customise some fields on Xero invoices report ... Add require for xero invoices report spec	2015-05-15 12:35:14 +10:00
Rohan Mitchell	0a2f2e0fba	Output summary data without customisation ... Add route for xero invoices report Add require for reports controller decorator	2015-05-15 12:35:05 +10:00
Rohan Mitchell	38e1bd4139	Fix indentation	2015-05-15 12:17:16 +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	d8f5669fbb	Renaming granted > related_enterprises_granted	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	2072744870	User can enter the number of months back to search for order cycles from which to build relationships	2015-04-12 11:38:18 +10:00
Rob Harrington	0f9fbe6e8c	Preventing relationships from being created with self	2015-04-12 10:53:22 +10:00
Rob Harrington	bc89018ee1	Refer to the right variable doofus	2015-04-11 23:24:50 +10:00
Rob Harrington	88bae32971	Adding method: user_manages_coordinator_or(enterprise) to make code a bit more terse	2015-04-11 23:00:34 +10:00
Rob Harrington	6f81a9ba18	Save common permission method results as instance variables	2015-04-11 22:53:57 +10:00
Rob Harrington	22a37cdc8a	Rename managed_producers_in as managed_participating_producers	2015-04-11 22:44:32 +10:00
Rob Harrington	9c376f0b00	Rename managed_hubs_in as managed_participating_hubs	2015-04-11 22:32:15 +10:00
Rob Harrington	59a2c84857	Rename managed_enterprises_in as managed_participating_enterprises	2015-04-11 22:30:21 +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	1e6fd94663	Adding rake task to create E2E relationships with P-OC based on past order_cycles	2015-04-10 12:51:15 +10:00
Rob Harrington	c28ebf63ab	As participating Hub, I cannot edit incoming exchanges despite being granted P-OC by the producer	2015-04-09 13:41:43 +10:00
Rob Harrington	b1624a733e	Editable variants for incoming exchanges for hubs include those for producers that have granted my hub P-OC	2015-04-08 13:38:37 +10:00
Rob Harrington	b8ce6ed0fc	Coordinator can see any enterprises that are already in the order cycle	2015-04-08 13:28:49 +10:00