273 Commits

Author	SHA1	Message	Date
Will Marshall	d7f8d2f5c7	Reworking some broken tests	2014-04-29 15:13:59 +10:00
Rohan Mitchell	126ddd0a75	Add explicit wait before inconsistently failing lookup	2014-04-25 18:59:33 +10:00
Rohan Mitchell	c8f50216ab	Increase default_wait_time on order_cycles_spec in an attempt to prevent inconsistent failures in CI	2014-04-25 18:06:09 +10:00
Rohan Mitchell	91d9b546d2	Merge branch 'foreign-keys'	2014-04-25 16:06:54 +10:00
Rohan Mitchell	85db8859bb	On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage	2014-04-24 15:51:39 +10:00
Rohan Mitchell	d0585b4d05	Admin order cycle listing does not show order cycles that enterprise users don't have access to	2014-04-24 14:43:33 +10:00
Rohan Mitchell	d16d970952	BPE uses soft-delete	2014-04-24 13:20:16 +10:00
Rob H	2e51518b5b	CMS spec being weird	2014-04-24 11:28:53 +10:00
Rob H	76f05d13d7	Slow specs on CI	2014-04-24 10:50:35 +10:00
Will Marshall	3ed569b24a	Patching a couple of borked specs	2014-04-24 09:52:29 +10:00
Rob H	b37a701d39	Merge branch 'api_fixes' into bom	2014-04-23 12:03:01 +10:00
Rob H	669ec0eee7	Fix failing API specs	2014-04-23 12:02:27 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +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	6452ebf67d	Make spec more robust	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	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
Rohan Mitchell	e792107d7b	Make order cycle specs more robust	2014-04-09 15:02:40 +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	366555d9a7	Remove old column toggle from BOM	2014-04-05 10:08:37 +11:00
Rob H	8e54bf1e2e	Enterprise users are aurthorised to view BOM	2014-04-04 09:11:56 +11:00
Rob H	771ccc6e76	Merge branch 'capybara-fails' into bom	2014-03-28 13:52:17 +11:00
Rob H	73271fa45a	Fix BOM regression bugs caused by capybara upgrade	2014-03-28 13:50:10 +11:00
Rob H	4d65427d18	Fix BPE regression bugs caused by capybara upgrade	2014-03-28 12:11:36 +11:00
Will Marshall	d8160bc6d5	Partially fixing the visible issue	2014-03-27 16:12:18 +11:00
Rob H	ab14bf70ab	Merge branch 'bpe_issues' into bom	2014-03-27 15:39:37 +11:00
Will Marshall	adcd5e1c8d	Fixing a regression issue	2014-03-27 14:30:52 +11:00
Rohan Mitchell	3104d285ca	Order cycle admin JS uses exchanges.incoming instead of role	2014-03-27 09:30:53 +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
Rob H	048b8b43cc	Bulk Actions only apply to visible line items	2014-03-20 16:54:24 +11:00
Rohan Mitchell	c563057809	Merge branch 'new-enterprises-form'	2014-03-20 15:34:09 +11:00
Rob H	ed0b7da20f	BOM page has a fancy calculation box for managing group buys	2014-03-20 14:40:24 +11:00
Rohan Mitchell	af88d0f91b	Fix regression: Invisible checkbox causing ambiguity for capybara	2014-03-20 11:07:13 +11:00
Rohan Mitchell	811b0cb36a	Admin can remove a master variant from an order cycle when further variants have been added	2014-03-20 10:27:55 +11:00
Maikel Linke	fcd9389fe3	spec for pickup details in enterprise form removed	2014-03-19 20:42:21 +11:00
Rohan Mitchell	8f0625daf8	Move product-related spec out of variants and into its proper home	2014-03-14 11:18:59 +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
Rohan Mitchell	0d97397084	Fix fragile specs (ordering)	2014-03-12 15:00:20 +11:00
Rohan Mitchell	93a661ac08	Do not show product unit fields when creating a new product - make this interface less confusing	2014-03-12 12:35:52 +11:00
Rohan Mitchell	af31d0cb8f	Reformat	2014-03-12 12:35:52 +11:00
Rohan Mitchell	68eaa61732	Enterprise user can delete product images	2014-03-12 12:35: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