143 Commits

Author	SHA1	Message	Date
Rohan Mitchell	42b951c972	Variants controller #search filters by distribution	2014-07-16 10:31:12 +10:00
Rob H	9b126df5b6	Add variant display_name to reports	2014-06-23 14:31:16 +10:00
Rob H	0611947306	Merge branch 'master' into sm-makeover	2014-06-18 10:39:40 +10:00
Rob H	004548a4fe	Rearrange shipping method edit page	2014-06-18 10:21:21 +10:00
Rob H	8412d740ff	Move distributors into sidebar for new & edit shipping methods screen	2014-06-12 16:10:30 +10:00
Rohan Mitchell	b970f54f53	Admin UI soft-deletes variants, not hard delete	2014-06-12 14:59:27 +10:00
Rohan Mitchell	dc60409c85	Move paid column next to order totals	2014-06-10 10:31:53 +10:00
Rohan Mitchell	1d44cbf506	Show distribution charge on report	2014-06-06 09:47:16 +10:00
Rohan Mitchell	1a7b32d1ff	Show hub and customer name on total row	2014-06-06 09:47:16 +10:00
Rohan Mitchell	673293f273	Add extra shipping columns	2014-06-06 09:47:16 +10:00
Rohan Mitchell	13e2da42eb	Add producer column, remove Packed? and Shipped? columns	2014-06-06 09:47:16 +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
Rob H	66d6de9dfc	Merge master (with primary taxons restored)	2014-05-30 15:45:48 +10:00
Rob H	69376e7f4b	Merge in master	2014-05-30 15:10:13 +10:00
Will Marshall	368fbd2383	Patching up admin redirects to be MOAR UNIVERSAL	2014-05-30 12:52:14 +10:00
Will Marshall	1a47a7486e	Automatically closing the accordion if the form is already valid	2014-05-30 11:58:22 +10:00
Rob H	9b10a2cb94	Added 'Add Another' link to new product page. Altered redirects	2014-05-29 12:13:55 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Will Marshall	df82627bd1	Starting to rework login behaviour when hitting /admin	2014-05-20 15:47:00 +10:00
Rob H	93dedb690d	Change overview controller to class_eval	2014-05-16 10:03:35 +10:00
Rob H	c98d2e71d8	Add scroll pane to admin dashboard	2014-05-09 17:20:53 +10:00
Rob H	01c5822fcc	Add basic dashboard to admin section	2014-05-09 15:48:58 +10:00
Rob H	2b283405e7	Only admin and users of distributors can access admin orders	2014-04-13 10:09:17 +10:00
Rob H	8e54bf1e2e	Enterprise users are aurthorised to view BOM	2014-04-04 09:11:56 +11:00
Rohan Mitchell	353d2a4d9c	Do not error when creating variant for product without non-unit option type	2014-02-27 11:28:07 +11:00
Rohan Mitchell	7b80518621	On admin variant edit page, do not show option values for unit-related option types	2014-02-19 11:29:26 +11:00
Rob H	00dfa62f43	Basic listing of orders on BOM page	2014-01-17 14:56:26 +08:00
Rohan Mitchell	cbe46bffed	Merge branch 'bpe_paginate' ... Conflicts: config/ng-test.conf.js	2014-01-09 12:07:42 +11:00
Rob H	177782fac5	Status message works when updating products with filters applied	2014-01-06 18:20:00 +08: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	c695bafe69	Reworking the way the Reports works so we have more granular control over what shows	2013-11-21 16:45:59 +11:00
Rohan Mitchell	dfcf567f26	Sort payment methods by name	2013-11-21 14:42:28 +11:00
Will Marshall	612a80ec15	A little refactoring, some comment removal	2013-11-21 14:28:23 +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
Rohan Mitchell	27b8c4508f	Split product distribution editing into its own admin page	2013-11-13 15:22:17 +11:00
Rohan Mitchell	48f18a93de	Order shipping methods by name, not distributor	2013-11-07 16:25:43 +11:00
Rohan Mitchell	0755b515d1	Only show shipping methods that enterprise user has access to	2013-11-07 16:25:43 +11:00
Rohan Mitchell	89f93cae77	Rename namespaced includes from open_food_web to open_food_network	2013-10-18 17:43:18 +11:00
Rohan Mitchell	57f7d489ff	Rename OpenFoodWeb namespace to OpenFoodNetwork	2013-10-18 17:29:55 +11:00
Rohan Mitchell	8ccad4b53a	Return an error code when bulk product edit save fails	2013-10-18 16:23:25 +11:00
Rohan Mitchell	3b5e6f5742	When viewing shipping methods, only show those for the distributor I select	2013-10-18 10:01:11 +11:00
Rohan Mitchell	e6041aaf2f	Enterprise user can view, create and edit payment methods	2013-10-18 09:09:53 +11:00
Rohan Mitchell	358ca25f31	Admin can assign multiple distributors to a shipping method	2013-10-17 11:16:26 +11:00
Rohan Mitchell	751801653e	Bulk product update with >25 products succeeds	2013-10-16 14:36:22 +11:00