226 Commits

Author	SHA1	Message	Date
Rohan Mitchell	a90666467a	Add helper support to Reports DSL	2015-07-23 11:45:19 +10:00
Rohan Mitchell	cc9d0defca	Use class attributes instead of class variables to avoid leakage between subclasses	2015-07-23 11:04:36 +10:00
Rohan Mitchell	142e1d6d9a	Report outputs rules as array for use by OrderGrouper	2015-07-23 10:46:20 +10:00
Rohan Mitchell	1d39fb4438	Report rules can define a summary row	2015-07-23 10:37:47 +10:00
Rohan Mitchell	07eb857a8d	Report can define nested rules	2015-07-23 10:24:10 +10:00
Rohan Mitchell	66f64fc413	Report can define basic rules	2015-07-23 10:08:38 +10:00
Rohan Mitchell	c7a1ca29f4	Report can define and retrieve columns	2015-07-23 09:52:59 +10:00
Rohan Mitchell	0a5e8fe629	Report class can define and retrieve header	2015-07-23 09:36:09 +10:00
Rohan Mitchell	de7f3a9e5c	When an on-demand variant has overridden stock levels, make it not on-demand	2015-07-16 10:05:07 +10:00
Lynne Davis	f21f57a42c	Additions for packing reports, sans refactoring	2015-07-15 14:44:49 +10:00
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
Rob Harrington	30af5d4278	Enterprise relatives include self where appropriate for serialized injection data	2015-06-15 19:45:29 +08: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
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	22230294ab	Merge branch 'master' into optimise-shopfront	2015-06-03 10:07:42 +10:00
Rohan Mitchell	69c54e1d70	Only load activated relatives for EnterpriseInjectionData	2015-05-29 12:08:21 +10:00
Rohan Mitchell	7486daa2a3	Merge branch 'master' into require_standard_variant ... Conflicts: spec/controllers/spree/admin/variants_controller_spec.rb spec/lib/open_food_network/permissions_spec.rb spec/lib/open_food_network/products_and_inventory_report_spec.rb spec/models/enterprise_spec.rb	2015-05-28 15:08:13 +10:00
Rohan Mitchell	7f43dbf9bb	Fix further intermittent failures in permissions spec	2015-05-28 10:58:12 +10:00
Rohan Mitchell	97e49c2bdb	Replace 'array.sort.should == expected.sort' pattern with match_array	2015-05-28 10:46:08 +10:00
Rohan Mitchell	ccf1e2951c	Fix intermittent failure in permissions spec	2015-05-28 10:45:47 +10:00
Rob Harrington	5d47dc2fdb	Sort array so that order doesn't cause spec fail	2015-05-22 15:03:21 +10:00
Rob Harrington	e931f4b31f	Merge branch 'master' into require_standard_variant	2015-05-22 12:22:54 +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	f7642b2a1b	When blank values are submitted, do not override defaults	2015-05-15 16:51:04 +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
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	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	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +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	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
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	4dcfec1de9	make enterprises_for_order_cycle permissions more correct	2015-04-08 12:12:02 +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