349 Commits

Author	SHA1	Message	Date
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Rohan Mitchell	aa1c28b163	Move enterprises api controller out of spree namespace	2014-04-11 19:08:55 +10:00
Will Marshall	96913ad922	Changing the order confirmation text with Kirsten	2014-04-11 13:33:13 +10:00
Rob H	ff531f0e18	Producers can only list line items which contain products they supply	2014-04-11 09:39:01 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Rob H	6228cc0c55	BOM: Add order cycle column	2014-04-10 15:34:23 +10:00
Rob H	5c7d36ba9b	BOM: interface cleanup and adding 'Clear All' button for filters	2014-04-10 15:29:09 +10:00
Rob H	645b6d5a8f	BOM: change datetimepickers to datepickers	2014-04-10 10:51:55 +10:00
Rob H	c5d5f5a9e6	BOM: view information about max quantities ordered	2014-04-10 10:33:57 +10:00
Will Marshall	fcb04481c4	Fixing a nil chain bug	2014-04-08 17:55:09 +10:00
Will Marshall	1e04a3b5f7	Changing the confirm email text a little bit	2014-04-07 14:31:02 +10:00
Rob H	aad5ad4bc0	BOM interface cleanup	2014-04-06 19:22:17 +10:00
Rob H	0a6230088d	Make BOM bulk action dropdown pretty	2014-04-06 17:39:53 +10:00
Rob H	5cec4feb7e	Remove search boxes from filter BPE filter boxes	2014-04-05 10:17:21 +11:00
Rob H	366555d9a7	Remove old column toggle from BOM	2014-04-05 10:08:37 +11:00
Rob H	980797493d	Create dropdown list for toggling columns	2014-04-04 19:36:06 +11:00
Will Marshall	5c999fd9cf	Adding a signup confirmation email	2014-04-04 12:36:33 +13:00
Will Marshall	403ad797ac	Tidying up the cart	2014-04-01 12:42:42 +11:00
Will Marshall	e51f1b508d	Fixing the empty cart button	2014-04-01 12:39:47 +11:00
Rob H	00df441bc2	Re-add changes to variant bulk show to fix 'I'm a teapot' fails	2014-03-28 16:47:52 +11:00
Will Marshall	5d36dc5b4f	Moving User Account to darkswarm	2014-03-28 16:02:32 +11:00
Rob H	ee147c232e	WIP: Remove changes to variant bulk show casuing issues	2014-03-28 14:41:03 +11:00
Rob H	771ccc6e76	Merge branch 'capybara-fails' into bom	2014-03-28 13:52:17 +11:00
Rob H	4d65427d18	Fix BPE regression bugs caused by capybara upgrade	2014-03-28 12:11:36 +11:00
Rob H	ab14bf70ab	Merge branch 'bpe_issues' into bom	2014-03-27 15:39:37 +11:00
Rob H	dae2d9db9e	BPE: Set defaults for price and on_hand to prevent 'I'm a teapot' error (418) on update	2014-03-27 15:38:44 +11:00
Rob H	9c65dd2ace	BOM: add warning message about missing unit values to group buy calc box	2014-03-27 14:18:00 +11:00
Rob H	0c2e215fef	BOM: Add a method to check that all selected variants have a unit_value	2014-03-27 14:11:19 +11:00
Rob H	cd1086ce05	WIP: Bulk calculation box work with shared resources	2014-03-26 16:44:26 +11:00
Rob H	cbd3722380	Merge branch 'master' into bom	2014-03-21 13:47:50 +11:00
Rob H	f2729f9e80	Add more columns to BOM	2014-03-21 13:46:48 +11:00
Rob H	b329aed0f2	BOM: Can toggle columns, and interface rearrange	2014-03-21 13:00:12 +11:00
Will Marshall	6e5c93526c	Moving everything to a single Angular application	2014-03-20 16:58:57 +11:00
Rob H	8c998e6fa8	BOM: columns are sortable	2014-03-20 15:39:13 +11:00
Rob H	ed0b7da20f	BOM page has a fancy calculation box for managing group buys	2014-03-20 14:40:24 +11:00
Will Marshall	c6f1d43dbd	Reworking the shipping confirmation	2014-03-19 16:09:45 +11:00
Will Marshall	01503632f2	Changing cart titles	2014-03-19 10:52:26 +11:00
Will Marshall	9c26d23cb5	Greying the buttons like a boss	2014-03-19 10:48:49 +11:00
Will Marshall	a8547a9e64	Adjustments toggling	2014-03-19 10:45:40 +11:00
Will Marshall	d5b1cc3303	Swapping buttons	2014-03-19 10:40:30 +11:00
Will Marshall	96ce982ea3	Reworking the checkout into Darkswarm, patching up tests	2014-03-18 15:58:22 +11:00
Will Marshall	ac78ab91fe	Fixing up some regression issues	2014-03-14 16:54:43 +11:00
Will Marshall	a954f2c21a	Basic Darkswarm version of the Order Confirmation page	2014-03-14 16:11:40 +11:00
Rob H	c86cfe092f	BOM: Add bulk delete action	2014-03-14 09:37:28 +11:00
Rob H	9a291e28ec	Add bulk action checkboxes to BOM	2014-03-12 18:25:51 +11:00
Rob H	bed1c171b6	BOM: display product name and unit	2014-03-07 14:46:40 +11:00
Rob H	b6bd07abd3	BOM: show name from billing address	2014-03-07 12:56:39 +11:00
Rob H	641796ed64	BOM: and quick search	2014-03-06 16:32:23 +11:00
Rob H	200e3fef77	Merge branch 'master' into bom	2014-03-06 12:52:36 +11:00
Rob H	0726d591ac	BOM: can filter by order cycle	2014-03-06 10:50:27 +11:00