788 Commits

Author	SHA1	Message	Date
Rob Harrington	f499cc375b	Adding confirmed_at to enterprise factory	2014-10-17 17:32:27 +11:00
Rob Harrington	5b3ff9160d	Fix Registration spec	2014-10-17 17:15:16 +11:00
Rob Harrington	b2565991e6	Merge branch 'master' into reg_and_ent_types	2014-10-17 12:33:21 +11:00
Rob Harrington	81715aaf5d	Remove unrequired store registration action	2014-10-17 11:01:39 +11:00
Rob Harrington	c4d47ccc20	Change enterprise attributes defined in reg controller	2014-10-17 11:01:38 +11:00
Rob Harrington	28807d4f4d	Merge migrate_ent_types into reg	2014-10-17 10:20:48 +11:00
Rohan Mitchell	0e03b5f209	Admin can change the format that Spree::Images are stored/served in	2014-10-16 12:41:11 +11:00
Rohan Mitchell	7e23479f3a	Consistency	2014-10-16 12:08:12 +11:00
Rob Harrington	a6480e6831	Merge in enterprise confirmation	2014-10-16 11:52:10 +11:00
Rob Harrington	20cb11a298	Update registration spec	2014-10-15 16:28:52 +11:00
Rob Harrington	9b275cc5f0	WIP: Shuffling around order of cards in registration	2014-10-09 17:26:31 +11:00
Rafael Schouten	20a94b4365	Merge branch 'master' into migrate_ent_types ... Conflicts: app/serializers/api/admin/enterprise_serializer.rb	2014-10-07 10:52:26 +11:00
Rafael Schouten	f0c9e7cd44	fix for tests, remove open in new tab	2014-10-04 13:12:36 +10:00
Rafael Schouten	884c111240	fix failing tests	2014-10-04 11:56:35 +10:00
Rafael Schouten	4c1fc5671f	Minor fixes	2014-10-02 10:43:17 +10:00
Rafael Schouten	4fde0ad2d7	Merge branch 'master' into migrate_ent_types	2014-10-01 16:11:20 +10:00
Rafael Schouten	5c0d846643	bugfix sells and is_distributor specs and code	2014-09-28 11:55:46 +10:00
Rafael Schouten	b821107c27	bugfix migration ad specs	2014-09-27 18:14:10 +10:00
Rob Harrington	4b2f1cefa0	Spliting order management abilities out of product management abilities	2014-09-26 17:11:11 +10:00
Rob Harrington	9520eeeb15	can specify attributes for create_enterpise_user	2014-09-25 11:56:18 +10:00
Rob Harrington	ed91cd6463	Make sure d1 != d2	2014-09-24 20:48:52 +10:00
Rob Harrington	c6d463bf25	Revert "Pending bulk order mgmt specs" ... This reverts commit eead8d665f.	2014-09-20 18:06:42 +10:00
Rob Harrington	544e6e074a	Stop being lazy	2014-09-19 14:38:59 +10:00
Rob Harrington	d3e72b5a2a	Adding images to registration process	2014-09-19 12:41:24 +10:00
Rob Harrington	0fdbcc0023	Make dates consistent	2014-09-17 11:39:39 +10:00
Rob Harrington	eead8d665f	Pending bulk order mgmt specs	2014-09-17 11:39:20 +10:00
Rob Harrington	22e61d9834	TEMP: spit out variables in failing oc spec	2014-09-16 23:47:34 +10:00
Rob Harrington	279c5925ef	Add helpers to registration spec to counter JS weirdness	2014-09-16 23:46:34 +10:00
Rob H	143545da0d	Try newer syntax to fix spec failing on CI	2014-09-12 23:41:26 +10:00
Rob H	0815775bc3	Temporary fix for race condition in registration spec	2014-09-12 17:22:54 +10:00
Rob H	cb7033eea0	Registration spec checks enterprise created and updated	2014-09-12 16:42:10 +10:00
Rohan Mitchell	25a889375c	Fix unreliable spec	2014-09-12 16:39:47 +10:00
Rohan Mitchell	b41029d5d0	Spec reliability: Explicitly set a $0 calculator for shipping method	2014-09-12 16:11:31 +10:00
Rob H	d2c5533549	Remove use_short_wait	2014-09-12 16:10:38 +10:00
Rob H	05d8c825c7	Enterprise User should NOT see form elements for changing type	2014-09-12 13:40:47 +10:00
Rob H	bcca8c5c0d	Merging master into all the things	2014-09-12 13:28:30 +10:00
Rohan Mitchell	e50bbeaefb	Edit product form shows permitted suppliers	2014-09-12 11:33:47 +10:00
Rohan Mitchell	033fe88513	New product form shows permitted suppliers	2014-09-12 11:07:59 +10:00
Rob H	6ee3010fa7	Differentiation of on-boarding process by url	2014-09-12 11:00:34 +10:00
Rob H	043cc915e7	Removing save_screenshot calls	2014-09-11 22:40:03 +10:00
Rob H	5007fd8ec3	Shipping method 1 is used, so shipping method amount is zero	2014-09-11 22:27:05 +10:00
Rob H	a7a99b5048	Pending registration spec	2014-09-11 18:15:33 +10:00
Rob H	ef8f611458	Adding countries and states to registration	2014-09-11 17:07:05 +10:00
Rob H	7dc42c9e39	Creating an enterprise works in registration process	2014-09-11 17:07:05 +10:00
Rob H	c92aa41e28	Adding introduction and details pages to registration process	2014-09-11 16:34:19 +10:00
Rob H	ad56594fe9	Removing obsolete spec	2014-09-11 15:19:24 +10:00
Rob H	c0e4a22a6e	Adding enterprise_limit form element to user edit page	2014-09-11 15:19:24 +10:00
Rob H	9085741f3c	Removing enterprises form from user edit page	2014-09-11 15:19:23 +10:00
Rob H	eb6af408d7	Trailing spaces crusader: one man, a million trailing spaces	2014-09-11 15:19:23 +10:00
Rob H	60297eb5c8	Hide 'New Enterprise' link on index page when user has reached limit	2014-09-11 15:19:23 +10:00