492 Commits

Author	SHA1	Message	Date
Rohan Mitchell	42b951c972	Variants controller #search filters by distribution	2014-07-16 10:31:12 +10:00
Rohan Mitchell	94902268e2	Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated.	2014-07-04 14:39:27 +10:00
Rohan Mitchell	aa5767cd30	Remove paypal image button from checkout, fix redirect to paypal	2014-06-27 11:52:36 +10:00
Rob H	9b126df5b6	Add variant display_name to reports	2014-06-23 14:31:16 +10:00
Will Marshall	8bb5f75ea0	Temporary fix to get staging working	2014-06-20 13:51:21 +10:00
Will Marshall	7f4816c9a5	Adding new producer modal and dereferencing shopfront	2014-06-19 14:00:37 +10:00
Will Marshall	738fdfcd49	Merge branch 'laura_and_will'	2014-06-19 12:11:12 +10:00
Will Marshall	b9561ecf20	Minor refactoring from code review with Rohan	2014-06-19 11:41:24 +10:00
Will Marshall	224a70c11f	Refactoring JSON injection a bit further	2014-06-18 16:43:57 +10:00
Rohan Mitchell	cf4e7b18b4	Redirect to enterprises index page after updating producer properties	2014-06-18 15:43:22 +10:00
Will Marshall	deb6c8a05a	Refactoring the RABL injection and the Hubs/Producers/Enterprises services	2014-06-18 15:40:02 +10:00
Rohan Mitchell	c3cec34186	Redirect to enterprises page after updating producer properties	2014-06-18 15:28:41 +10:00
Rohan Mitchell	27fa93dbb4	Admin can remove producer properties	2014-06-18 15:28:41 +10:00
Rohan Mitchell	84cd56cfdc	Admin can list and create producer properties	2014-06-18 15:28:41 +10:00
Rob H	6809d70397	Redirect user back to enterprise edit page after saving	2014-06-18 13:18:33 +10:00
Rob H	45b16d52dd	Add visible checkbox to enterprises index page to allow bulk editing of visibility	2014-06-18 11:44:47 +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
Will Marshall	9bbfc0a393	Starting a set of small functional changes	2014-06-17 12:35:03 +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	c21d5cc3dc	Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors.	2014-06-12 14:59:27 +10:00
Rohan Mitchell	b970f54f53	Admin UI soft-deletes variants, not hard delete	2014-06-12 14:59:27 +10:00
Rohan Mitchell	9dc02e5eac	Add product soft-delete API action	2014-06-12 14:59:26 +10:00
Rohan Mitchell	e6c7acdff3	Add soft-delete method to variant	2014-06-12 14:59:26 +10:00
Rohan Mitchell	177e03eae2	Fix payments coming up as $0, credit card charges failing for the same reason	2014-06-11 13:19:14 +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