62 Commits

Author	SHA1	Message	Date
elf Pavlik	6d0dc438a7	i18n fixes after @sstead feedback in #799	2016-03-21 16:55:57 -06:00
Maikel Linke	02cc5adf78	Revert false HAML indent	2016-03-09 19:04:37 +11:00
elf Pavlik	8a390dd237	fixing test failing after i18n changes	2015-12-21 10:11:07 +01:00
julienFR88	5290d0be6b	add translation in /cache/code/ofn/openfoodnetwork/app/views/spree/admin	2015-12-21 10:11:07 +01:00
Rob Harrington	7a23f671a2	Restricting access to orders within Sales Tax Report ... Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for	2015-12-17 14:21:30 +11:00
Rob Harrington	d115eb816e	Restricting access to orders within Xero Invoices Report ... Managers of suppliers should not be able to generate xero invoices for orders they supply products for	2015-12-17 14:21:30 +11:00
Lynne Davis	7350dbb75e	Adding tweaks that have been missed from merges	2015-10-30 11:54:06 +11:00
Rohan Mitchell	b5bc4701fa	Detailed xero report	2015-09-22 09:15:55 +10:00
Rohan Mitchell	61a39ea82f	Cherry-pick 00927f7: Refactoring to move bulk out of reports_controller_decorator	2015-07-22 15:25:12 +10:00
Lynne Davis	c168dec14b	Adding packing reports as required by the UK contingent	2015-07-15 14:44:49 +10:00
Rohan Mitchell	f1899a7558	Merge branch 'master' into xero-report	2015-05-15 16:57:11 +10:00
Rohan Mitchell	a467d3c379	Add filtering to xero invoices report - order date range, hub and order cycle	2015-05-15 16:20:56 +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	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	924492ec5b	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-05-15 10:37:34 +10:00
Lynne Davis	9e61a7d083	Adding report type drop down to order_cycle_management_report	2015-04-26 11:03:32 +01:00
Rohan Mitchell	67c77cea81	Tidy up haml	2015-03-05 10:43:54 +11:00
Matt-Yorkley	d194e74eda	Rohan's suggested changes	2015-03-05 10:43:51 +11:00
Matt-Yorkley	371f966f63	sales tax view	2015-03-05 10:43:50 +11:00
Rohan Mitchell	6adb4194c2	Extract date range form to partial	2015-01-08 10:31:51 +11:00
Rohan Mitchell	b6f29c778e	Use haml syntax for defining divs	2015-01-08 10:23:37 +11:00
Rohan Mitchell	a438216189	Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2 ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-08 10:08:12 +11:00
Rohan Mitchell	e9f04c3c15	Clean up whitespace	2014-12-19 10:01:21 +11:00
Rohan Mitchell	0151ecbb32	Add additional rows to payment method selection	2014-12-19 09:51:32 +11:00
Rohan Mitchell	343af1f1e0	Rename report_shipping_options to report_shipping_method_options for symmetry with report_payment_method_options	2014-12-19 09:51:07 +11:00
Rohan Mitchell	4a30f27b3d	Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb spec/models/spree/order_spec.rb	2014-12-19 09:38:02 +11:00
Lynne Davis	eeae72352b	Renamed methods and vars to better fit naming conventions	2014-12-12 10:11:33 +00:00
Matt-Yorkley	4f153714a8	Reports pages improvements and i18n	2014-11-23 17:26:26 +00:00
Rob Harrington	d9d6b7bee4	Adding filtering to Users and Enterprises report	2014-11-14 16:36:22 +11:00
Rob Harrington	79a83ee206	Adding users and enterprises report, controller action and template	2014-11-14 16:36:22 +11:00
Lynne Davis	15f29f4c8e	266: Adding ability to search by distribution	2014-11-12 18:52:25 +00:00
Lynne Davis	932d571d2c	266: Updating to incorporate Rohans suggestions. Searching on payment method name rather than id	2014-11-12 11:47:26 +00:00
Lynne Davis	6f6ae309c6	266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet	2014-11-02 11:26:39 +00:00
Rohan Mitchell	4e6f07de8a	WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times	2014-06-12 11:49:55 +10:00
Rohan Mitchell	908f7871bb	Orders and fulfilment report handles order cycles with nil opening or closing times	2014-06-12 11:49:54 +10:00
Rohan Mitchell	1fab8c1e01	In orders and fulfilment reports, rename distributor -> hub and supplier -> producer	2014-06-06 09:47:16 +10:00
Rohan Mitchell	e5f0818065	Order and fulfilment reports can filter by multiple hubs, producers and order cycles	2014-06-06 09:47:16 +10:00
Rohan Mitchell	590ac6aa6d	Put orders and fulfilment report in grid layout	2014-06-06 09:47:15 +10:00
Will Marshall	e98031e581	Fixing some minor report bugs	2013-12-13 10:12:41 +11:00
Will Marshall	7bc754a598	Adding filtering to the products page	2013-11-28 13:44:21 +11:00
Will Marshall	27f99d1383	Working version of Customers reports without filters	2013-11-22 16:53:57 +11:00
Will Marshall	b3bf3a8378	Adding the plumbing for Customers reports, and one tiny refactor to products	2013-11-22 14:56:57 +11:00
Will Marshall	d703e1836f	Working build of P&I report	2013-11-21 14:06:24 +11:00
Will Marshall	6a11b2685f	Controller plumbing for Product & Inventory report	2013-11-20 13:58:01 +11:00
Will Marshall	5772fa9589	Boilerplate for the new Product and Inventory report, sans any functionality	2013-11-20 10:34:18 +11:00
David Cook	ad4301df90	Add supplier selection to Orders & Fulfillment Report	2013-09-18 12:34:43 +10:00
David Cook	4c2d6b38ea	Ensure 'No Order Cycle' remains selected after clicking 'Search'	2013-09-18 09:57:03 +10:00
David Cook	e57ad81934	Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports	2013-09-18 09:27:34 +10:00
David Cook	fe513d42c4	Rename 'Order Cycles' report group to 'Orders & Fulfillment'	2013-09-18 09:25:51 +10:00
David Cook	7e96ba909e	Show a list of Order Cycles report types in the description column	2013-09-13 09:59:35 +10:00