1234 Commits

Author	SHA1	Message	Date
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
Rob H	43863069e9	Minor fix to BOM group buy calc box	2014-03-20 16:07:14 +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
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
Will Marshall	84955d3647	Merging master	2014-03-06 16:53:03 +11:00
Will Marshall	904a25fd18	Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx	2014-03-06 16:48:30 +11:00
Will Marshall	12f39ce511	Patching up some more address bugs	2014-03-06 16:46:56 +11:00
Rob H	641796ed64	BOM: and quick search	2014-03-06 16:32:23 +11:00
Will Marshall	d677116ea3	Overring before_address to conform to our new checkout as necessary	2014-03-06 16:24:08 +11:00
Will Marshall	cc3fb27490	Restoring the old checkout, but NOW our new checkout is broken	2014-03-06 16:16:00 +11:00
Rob H	200e3fef77	Merge branch 'master' into bom	2014-03-06 12:52:36 +11:00
Will Marshall	a40a0499e4	Reducing the number of country and state options	2014-03-06 11:33:38 +11:00
Will Marshall	2301f2372f	Defaulting the quantity fields to nil	2014-03-06 11:04:11 +11:00
Will Marshall	e146bb0dd0	Adding Quick Checkout link	2014-03-06 11:01:25 +11:00
Rob H	0726d591ac	BOM: can filter by order cycle	2014-03-06 10:50:27 +11:00
Will Marshall	56646ca5e3	Getting some form state into the Order	2014-03-06 10:26:51 +11:00
Rohan Mitchell	07caf99488	Enterprise user can delete product properties	2014-03-05 16:52:06 +11:00
Rohan Mitchell	922d817748	Product list view: For product with variants, show product price as min(variant prices)	2014-03-05 16:16:42 +11:00
Will Marshall	7d0fdead7a	Refactoring the way we default shipping_method_id	2014-03-05 15:49:47 +11:00
Will Marshall	3c108d3366	Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx	2014-03-05 15:31:41 +11:00
Rohan Mitchell	b89c84e8bd	BPE: Do not show product price when product has variants	2014-03-05 15:08:54 +11:00
Rohan Mitchell	637ccc113b	Do not show products that have no stock available to the current distribution	2014-03-05 13:54:02 +11:00
Rohan Mitchell	17debd9fad	On product list view, do not show variants that are out of stock	2014-03-05 13:54:02 +11:00
Rohan Mitchell	8234812157	Do not include master when outputting variants for oc/d	2014-03-05 13:54:02 +11:00
Rohan Mitchell	ec6f70c145	On product list view, only show variants that are a member of the current order cycle	2014-03-05 13:54:02 +11:00
Will Marshall	19350eeade	Adding the 'same as billing address' JS	2014-03-05 12:29:49 +11:00
Rob H	1635e7338e	Add ditributors and suppliers to OC show API	2014-03-05 12:17:08 +11:00
Rob H	fc65eefcfd	Add basic order cycle API	2014-03-05 12:00:26 +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	b5019f12b4	Fixing up a couple of bugs introduced to the old step workflow	2014-03-04 15:07:00 +11:00
Will Marshall	1d5addb06e	Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses	2014-02-28 13:41:02 +11:00
Will Marshall	86a8b926f3	Adding conditions to the autopopulator for shipping address	2014-02-28 11:53:45 +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
Will Marshall	4daeac0b14	Removing JMigrate warnings	2014-02-27 16:15:06 +11:00
Will Marshall	c1cdf3e331	Removing some dud debugging stuff, fiddling with the checkout spec	2014-02-27 16:11:17 +11:00
Will Marshall	19fa7200f3	Fixing the login redirection issue	2014-02-27 14:47:56 +11:00
Will Marshall	91a8e1c071	Fixing a Javascript bug	2014-02-27 14:47:33 +11:00
Will Marshall	18f92fbff5	Fixing a nil.id bug	2014-02-27 14:04:04 +11:00
Rohan Mitchell	8bb742b3f2	Alphabetise suppliers when adding new product	2014-02-27 11:33:02 +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
Will Marshall	85606b2a0d	Merge branch 'master' into checkout	2014-02-27 10:41:39 +11:00