468 Commits

Author	SHA1	Message	Date
Rohan Mitchell	71020a14ef	Fix payments coming up as $0, credit card charges failing for the same reason	2014-06-12 11:49:54 +10:00
Will Marshall	dbf4f503a9	Restoring my clever flash refactoring	2014-06-10 11:14:52 +10:00
Rohan Mitchell	dc60409c85	Move paid column next to order totals	2014-06-10 10:31:53 +10:00
Rohan Mitchell	be644bdcc3	Revert "Reworking flash messages hooray" ... This reverts commit c9d0091cd9.	2014-06-06 16:59:47 +10:00
Will Marshall	c9d0091cd9	Reworking flash messages hooray	2014-06-06 16:41:28 +10:00
Will Marshall	82ab14a33e	Starting on on the map	2014-06-06 14:04:45 +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
Will Marshall	cd09f70ed3	Compacting down our flash messages	2014-06-04 17:13:19 +10:00
Rohan Mitchell	a99e18990d	Readability	2014-06-04 14:27:17 +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
Will Marshall	5b58bf2c71	Adding our own custom unauthorized page	2014-05-30 11:24:37 +10:00
Rob H	9b10a2cb94	Added 'Add Another' link to new product page. Altered redirects	2014-05-29 12:13:55 +10:00
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Rohan Mitchell	c2f762d570	Enterprise user can only see relationships involving their enterprises	2014-05-22 11:27:19 +10:00
Rohan Mitchell	06955a024f	Enterprise user can only create relationships with their own enterprises as parent	2014-05-22 11:02:03 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	b9a9937541	Attempting to create a relationship with invalid data shows an error message	2014-05-21 11:29:11 +10:00
Rohan Mitchell	9b2a80c6b5	Admin can create enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	aa53d82386	Add stub page for managing enterprise relationships	2014-05-21 11:29:11 +10:00
Will Marshall	391b1da04c	adding session token to order test	2014-05-21 10:46:03 +10:00
Will Marshall	ef91f8d17f	Redirecting if cart is empty and activating the empty cart link	2014-05-20 16:05:28 +10:00
Will Marshall	36aba8049f	Starting to rework login behaviour when hitting /admin	2014-05-20 16:05:28 +10:00
Will Marshall	da69167b4c	Putting error messages on checkout into error flash for easier debugging	2014-05-20 16:05:28 +10:00
Will Marshall	61cf35a5b9	Adding attr_accessors and paperclip file uploads	2014-05-20 12:18:28 +10:00
Will Marshall	0958602418	Starting on migrations and admin forms	2014-05-20 12:18:27 +10:00
Will Marshall	eab9c28d2e	Adding groups to this branch, also tidying up the shop stuff for Laura	2014-05-16 14:00:33 +10:00
Rob H	93dedb690d	Change overview controller to class_eval	2014-05-16 10:03:35 +10:00
Rob H	fd6f4d04df	Merge branch 'master' into ent-makeover	2014-05-15 17:05:05 +10:00
Rob H	7cdfb4bab2	Add methods and fees to sidebar on enterprise edit page	2014-05-15 14:52:19 +10:00
Will Marshall	5f712a8984	Removing code	2014-05-14 15:16:29 +10:00
Will Marshall	151702d685	Catching order cycle expiry and redirecting	2014-05-14 11:51:25 +10:00
Rob H	c98d2e71d8	Add scroll pane to admin dashboard	2014-05-09 17:20:53 +10:00
Will Marshall	573d479e08	Fixing test regressions	2014-05-09 16:43:57 +10:00
Rohan Mitchell	04379101e1	Change to new production hostname: openfoodnetwork.org.au	2014-05-09 16:39:39 +10:00
Rob H	05e01d02c4	Merge branch 'master' into ent-makeover	2014-05-09 15:58:17 +10:00
Rob H	01c5822fcc	Add basic dashboard to admin section	2014-05-09 15:48:58 +10:00
Rohan Mitchell	87179669a6	Change to new production hostname: openfoodnetwork.org.au	2014-05-09 11:34:52 +10:00
Will Marshall	0df2eabf95	Moving useless assets	2014-05-09 10:32:39 +10:00
Will Marshall	d9f462ba81	Moving useless assets	2014-05-09 10:12:40 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00