246 Commits

Author	SHA1	Message	Date
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
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
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +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
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
Will Marshall	5f712a8984	Removing code	2014-05-14 15:16:29 +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
Rohan Mitchell	7931a2e8da	Test managed products API access for all user types	2014-04-24 13:20:16 +10:00
Rohan Mitchell	6c86254a90	Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e6d988ff34	Nest variant soft delete route under product resource	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e28a450875	Add API call to soft-delete a variant	2014-04-24 13:20:16 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Rob H	c68aeb4c36	Only show orders I am distributing in the API	2014-04-16 14:54:50 +10:00
Rob H	2b283405e7	Only admin and users of distributors can access admin orders	2014-04-13 10:09:17 +10:00
Rohan Mitchell	aa1c28b163	Move enterprises api controller out of spree namespace	2014-04-11 19:08:55 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Rob H	8e54bf1e2e	Enterprise users are aurthorised to view BOM	2014-04-04 09:11:56 +11:00
Will Marshall	5d36dc5b4f	Moving User Account to darkswarm	2014-03-28 16:02:32 +11:00
Will Marshall	74fb266748	Adding some requirement filters to the Orders controller	2014-03-21 15:18:27 +11:00
Will Marshall	51b6ac3e68	Fixing one regression bug	2014-03-18 17:03:09 +11:00
Will Marshall	49789c865e	No longer copying old ship address from pickup, adding phone to custom shipping address	2014-03-18 16:47:28 +11:00
Will Marshall	a954f2c21a	Basic Darkswarm version of the Order Confirmation page	2014-03-14 16:11:40 +11:00
Will Marshall	b5019f12b4	Fixing up a couple of bugs introduced to the old step workflow	2014-03-04 15:07:00 +11:00
Will Marshall	3db601f362	Merge branch 'master' into checkout	2014-02-27 16:29:21 +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
Will Marshall	a0abd9c95a	Merge branch 'master' into checkout	2014-02-26 15:52:37 +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
Will Marshall	7af1d72ef9	Working login and signup forms for checkout, specs, redirect back to checkout on success	2014-02-07 16:07:18 +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
Rohan Mitchell	ef56574d82	Pass quantity to OrderPopulator	2014-01-08 11:37:38 +11:00
Rob H	177782fac5	Status message works when updating products with filters applied	2014-01-06 18:20:00 +08:00
Will Marshall	751e98443f	Removing LOADS of code	2013-12-19 16:47:27 +11:00
Will Marshall	985cebb44a	Massaging the form to push orders to the cart: some refactoring still required	2013-12-19 15:51:51 +11:00
Will Marshall	e98031e581	Fixing some minor report bugs	2013-12-13 10:12:41 +11:00
Rohan Mitchell	4c72170742	Remove unnecessary require	2013-12-05 15:16:51 +11:00