1069 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	e48a25983a	Starting a working forgot password system	2014-03-27 15:11:11 +11:00
Will Marshall	adcd5e1c8d	Fixing a regression issue	2014-03-27 14:30:52 +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
Will Marshall	2be9ad7dd0	Starting with our own passwords controller	2014-03-27 13:52:02 +11:00
Rob H	a260a3fa56	BOM: Fixed bug causing Order Cycles filter to break in some cases	2014-03-27 13:32:26 +11:00
Will Marshall	b5f1464ce9	Patching more regression issues	2014-03-27 13:01:06 +11:00
Will Marshall	3976694dad	Patching up some regressions	2014-03-27 13:01:05 +11:00
Will Marshall	17bb1f9d25	Getting the tests working once more	2014-03-27 13:01:05 +11:00
Will Marshall	61e6050e3a	Fixing up some more minor regression bugs	2014-03-27 13:01:03 +11:00
Will Marshall	e4bb2f1cdf	Keeping Foundation 4 and 5 parallel	2014-03-27 13:01:02 +11:00
Will Marshall	bf7d12b40e	Upgrading Foundation, starting to work through regression issues	2014-03-27 13:01:01 +11:00
Will Marshall	0690fcda48	Reworking the way the Sidebar works	2014-03-27 11:54:25 +11:00
Rohan Mitchell	93db813b3a	Make current_producers helper more resilient	2014-03-27 10:25:05 +11:00
Rohan Mitchell	ce2882de35	OrderCycleFormApplicator uses exchanges.incoming instead of role	2014-03-27 09:49:08 +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
Rohan Mitchell	20745825bf	Fix finding producers for shopfront, moving to SQL-land in the process. Woo.	2014-03-26 12:56:58 +11:00
Rohan Mitchell	ec0191806a	Update specs to explicitly specify exchange direction	2014-03-26 12:17:49 +11:00
Rohan Mitchell	abf83b0e58	Find only outgoing exchanges for Enterprise scopes using with_order_cycles_outer	2014-03-26 12:07:06 +11:00
Rohan Mitchell	ac8990f7e7	Rename enterprises_spec to singular for consistency	2014-03-26 11:46:51 +11:00
Rohan Mitchell	f184f0c246	Fix inappropriate intimacy: Extract exchange-specific queries from OrderCycle back into exchange	2014-03-26 11:43:32 +11:00
Rohan Mitchell	ac92d0919a	Add incoming boolean field to Exchange, determine exchange direction from this field rather than sender/receiver roles	2014-03-26 11:19:35 +11:00
Will Marshall	57ca48dc4a	Fixing one failing spec	2014-03-21 15:18:28 +11:00
Will Marshall	40d1563cd9	Adding our own user registrations controller, reworking sidebar a touch	2014-03-21 15:18:27 +11:00
Will Marshall	74fb266748	Adding some requirement filters to the Orders controller	2014-03-21 15:18:27 +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	7302d0552e	Fixing js specs	2014-03-21 13:11:04 +11:00
Rob H	b329aed0f2	BOM: Can toggle columns, and interface rearrange	2014-03-21 13:00:12 +11:00
Will Marshall	dbc8e1bcf1	Reworking the tests for the new app	2014-03-20 16:58:57 +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	4aace221ea	Enterprise user can reorder product properties and update product images	2014-03-20 11:41:08 +11:00
Rohan Mitchell	af88d0f91b	Fix regression: Invisible checkbox causing ambiguity for capybara	2014-03-20 11:07:13 +11:00
Rohan Mitchell	638e922ae2	Do not allow customer to purchase the obsolete master of a product	2014-03-20 10:56:46 +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
Maikel Linke	7d30d8e28f	old deface files deleted. spec for enterprise form updated	2014-03-19 20:42:21 +11:00
Will Marshall	ba770d8eac	Removing the add to cart spec	2014-03-19 15:28:48 +11:00
Will Marshall	49dc371219	Adding the missing bulk buy spec	2014-03-19 15:25:36 +11:00
Will Marshall	a1c8a35e79	Disabling CMS specs	2014-03-19 15:19:15 +11:00
Will Marshall	09e6caf039	Archiving and disabling old checkout spec	2014-03-19 14:34:51 +11:00
Will Marshall	dc8418cb4c	Removing the taxonomy spec, with a comment about some possibly redundant spree overrides	2014-03-19 14:29:46 +11:00
Will Marshall	9f36bc1383	Removing dud specs from suppliers spec	2014-03-19 14:25:13 +11:00