249 Commits

Author	SHA1	Message	Date
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
Rob H	641796ed64	BOM: and quick search	2014-03-06 16:32:23 +11:00
Rob H	483e9d80bc	BOM: filters work in combination	2014-03-06 13:21:31 +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
Rohan Mitchell	24d97bd754	Fix spec race condition	2014-03-06 10:36:49 +11:00
Rohan Mitchell	07caf99488	Enterprise user can delete product properties	2014-03-05 16:52:06 +11:00
Rohan Mitchell	b89c84e8bd	BPE: Do not show product price when product has variants	2014-03-05 15:08:54 +11:00
Will Marshall	66866f09b5	Adding the require ship address flag to admin UI:	2014-03-05 11:12:23 +11:00
Rob H	9f19e91e90	Merge branch 'master' into bom	2014-03-05 10:15:39 +11:00
Rob H	2a713245a8	BOM: date filter refactor and works with pending changes	2014-03-05 10:14:35 +11:00
Will Marshall	3db601f362	Merge branch 'master' into checkout	2014-02-27 16:29:21 +11:00
Will Marshall	d6c71d5416	Fixing a nil bug in the referrer handling on login	2014-02-27 16:24:10 +11:00
Rohan Mitchell	3196e28d88	Admin can assign units to a product	2014-02-27 11:29:39 +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
Rob H	41c61b3b12	BOM date filters work	2014-02-22 15:51:14 +11:00
Rob H	1f569e4be1	Add loading splash to BOM	2014-02-22 14:49:19 +11:00
Rob H	83e228dc63	Display message when no matching orders found for BOM	2014-02-22 11:48:24 +11:00
Rob H	1b10bf53c0	WIP: BOM loads with orders filtered by default date restrictions	2014-02-22 11:33:36 +11:00
Rob H	5ec7a10e16	Add date filter fields to BOM	2014-02-21 14:01:33 +11:00
Rohan Mitchell	6d1a202800	Fix grammar	2014-02-19 13:32:57 +11:00
Rohan Mitchell	acbf1ed680	Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI	2014-02-19 13:12:52 +11:00
Rohan Mitchell	3f9f24157c	Do not show unit value or description when product does not have a unit-related option type	2014-02-19 12:07:53 +11:00
Rohan Mitchell	3024bbbeb5	Edit unit value and description of variant	2014-02-19 11:56: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