70 Commits

Author	SHA1	Message	Date
Rob Harrington	903ed7e507	Merge branch 'master' into variable_weights ... Conflicts: app/assets/javascripts/admin/bulk_order_management.js.coffee app/views/spree/admin/orders/bulk_management.html.haml app/views/spree/api/line_items/bulk_show.v1.rabl spec/features/admin/bulk_order_management_spec.rb	2015-05-21 17:31:33 +10:00
Rob Harrington	79a59e2e81	Add order_with_distributor factory	2015-05-21 13:34:32 +10:00
Lynne Davis	2f463474fb	Adding specs for variable weight adjustment via builk order management	2015-05-09 19:10:55 +01:00
Rob Harrington	68b4cb59be	Fixing bulk management specs broken by making order_cycles filter update dates	2015-05-07 12:50:57 +10:00
Rob Harrington	66669e66ab	Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts	2014-12-12 15:43:05 +11:00
Rob Harrington	45bcee16ef	Pulling out obsolete setup in BOM spec to make it more like BPE spec, see if that helps with intermittent fails	2014-11-27 09:44:13 +11:00
Rob Harrington	c6d463bf25	Revert "Pending bulk order mgmt specs" ... This reverts commit eead8d665f.	2014-09-20 18:06:42 +10:00
Rob Harrington	eead8d665f	Pending bulk order mgmt specs	2014-09-17 11:39:20 +10:00
Rob H	ee4a1925fe	Bulk Order Management works with navigation helper override	2014-09-06 00:34:27 +10:00
Rob H	d8c1823328	Fix broken specs	2014-08-08 14:05:54 +10:00
Will Marshall	b757629bfa	Minor test tweaks	2014-05-29 11:52:46 +10:00
Will Marshall	f25617dde7	Tweaks for laura, reworking authentication workflow, tidying up checkout	2014-05-09 16:42:51 +10:00
Rohan Mitchell	87b605b604	Remove specific default_wait_time setting in BOM - this value is globally increased in spec_helper	2014-05-09 08:55:44 +10:00
Rob H	dcf048d631	Merge branch 'temp' into ng-cleanup	2014-05-07 13:08:13 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00
Rob H	2e7cf612d6	Fix broken BOM spec	2014-05-07 12:30:06 +10:00
Will Marshall	bbb70342b3	Merging	2014-05-02 15:35:43 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Rohan Mitchell	930bc2b7ce	Set increased Capybara.default_wait_time globally	2014-05-02 14:25:32 +10:00
Will Marshall	705e247eb8	Tweaking the bulk order management spec again	2014-05-02 12:41:04 +10:00
Will Marshall	8c319334db	Cleaning out the spree auth stuff	2014-05-02 12:34:19 +10:00
Rob H	b59aa53158	Add edit order button to BOM	2014-04-24 13:49:28 +10:00
Rob H	76f05d13d7	Slow specs on CI	2014-04-24 10:50:35 +10:00
Rob H	669ec0eee7	Fix failing API specs	2014-04-23 12:02:27 +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
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	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
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
Rohan Mitchell	af31d0cb8f	Reformat	2014-03-12 12:35:52 +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	0726d591ac	BOM: can filter by order cycle	2014-03-06 10:50:27 +11:00
Rob H	2a713245a8	BOM: date filter refactor and works with pending changes	2014-03-05 10:14:35 +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