6330 Commits

Author	SHA1	Message	Date
Rohan Mitchell	d6f21b24da	Add specs for producers and shops search by URL	2016-07-06 11:08:38 +10:00
Bing Xie	78b22c4a82	Fix incorrectly aligned columns	2016-06-30 21:38:10 +10:00
Continuous Integration	e252414263	Auto-merge from CI [skip ci]	2016-06-30 01:30:53 +10:00
Lynne Davis	320db21d5c	Updating spec with $ (not £) for automated testing	2016-06-29 16:30:11 +01:00
Maikel Linke	c253d73d11	Refactoring with feedback on pr #1073	2016-06-29 15:46:51 +10:00
Maikel Linke	08fdc8a5bd	Load producers of all or selected order cycles into shop	2016-06-29 12:57:09 +10:00
Rohan Mitchell	a5a00e9cef	Show taxons and properties on producer modal (seen on map, shop producer info)	2016-06-24 07:57:06 +10:00
Rohan Mitchell	4134cbfc9c	Include producer properties on producer listing	2016-06-24 07:57:06 +10:00
Rohan Mitchell	58379a5e28	Extract property merging to lib class	2016-06-24 07:57:06 +10:00
Rohan Mitchell	aae1689a27	Show product properties on producers page	2016-06-24 07:57:06 +10:00
Rohan Mitchell	4338f632f6	Add scope: Spree::Property.applied_by	2016-06-24 07:57:06 +10:00
Rohan Mitchell	fa0cc6f2c8	Add spec for filtering producers by taxon	2016-06-24 07:57:06 +10:00
Rob Harrington	d28c0159ab	Use have_selector x, count: y; instead of all(x).count.should == y	2016-06-17 16:44:02 +10:00
Rob Harrington	1e142aa628	Refactoring OrderCycleFormApplicator logic for improved update speed	2016-06-17 16:44:02 +10:00
Rob Harrington	6586e67a5c	Better messaging around deletion of customers	2016-06-17 14:47:04 +10:00
Rob Harrington	61969f5c84	Ensure CustomersController#update.json gives an appropriate response ... pendingChanges submits an empty string when a field is blank (rather than undefined)	2016-06-16 22:42:53 +10:00
Rob Harrington	a909f0ddb8	Merge remote-tracking branch 'origin/master' into pr/1033	2016-06-16 15:12:30 +10:00
Rob Harrington	25cdd4af8e	Preventing shop from being changed when unsaved customer changes exist ... Also making layout of filters on customer index more consistent with other pages	2016-06-16 15:10:16 +10:00
Continuous Integration	9ba07a2afb	Merge remote-tracking branch 'origin/master' into HEAD	2016-06-15 11:26:02 +10:00
Bing Xie	a39d15d685	Fix failed adds a new tag rule js test	2016-06-15 10:51:34 +10:00
Rob Harrington	8221f1f193	Use scope. to ensure that tag rule sorting is applied	2016-06-15 10:51:34 +10:00
Bing Xie	c83952571f	Fix failed test	2016-06-15 10:51:34 +10:00
Bing Xie	18a8efed5f	Resize window to fix failed test	2016-06-15 10:51:34 +10:00
Bing Xie	7aa8f2c73c	Fix failed tests	2016-06-15 10:51:34 +10:00
Bing Xie	41837eb31d	Tweak create order cycle spec	2016-06-15 10:51:34 +10:00
Bing Xie	860a537f30	Add save bar to bulk editing product page	2016-06-15 10:51:34 +10:00
Bing Xie	33fd88507d	Fix failed tests	2016-06-15 10:51:34 +10:00
Bing Xie	7994e2594a	Update create order cycle feature test	2016-06-15 10:51:34 +10:00
Bing Xie	baa6fda3e0	Use save bar in create order cycle page	2016-06-15 10:51:34 +10:00
Maikel Linke	db3637fe84	Allow removing customer codes	2016-06-10 18:14:19 +10:00
Maikel Linke	ee0a226388	Try to remove random failure from spec	2016-06-10 10:06:35 +10:00
Maikel Linke	5cd269411d	Trigger order button instead of click	2016-06-10 09:46:56 +10:00
Maikel Linke	ad1ef877c0	Warn about duplicate customer codes ... The admin customer page displays a warning you change a code to an existing one.	2016-06-10 09:09:56 +10:00
Rob Harrington	365c6b3a83	Streamlining button clicking on registration spec	2016-06-08 13:06:57 +10:00
Steve Pettitt	a504a10b52	Change to explicitly check complete state (default Spree::Order.complete scope checks only for presence of 'completed_at' timestamp)	2016-06-08 11:15:02 +10:00
Steve Pettitt	caf35d0ad7	Add a spec to exclude canceled orders (failing)	2016-06-08 11:15:02 +10:00
Maikel Linke	489feb4e01	Longer default page size for feature specs	2016-06-01 16:28:43 +10:00
Maikel Linke	89c3758bae	Avoid race conditions in feature specs	2016-06-01 16:15:44 +10:00
Rob Harrington	7028fbe288	Find current_customer via current_distributor and current_user rather than current_order ... Moving available_payment_methods to enterprises_helper, as per available_shipping_methods	2016-05-28 00:31:59 +10:00
Rob Harrington	07384edb2d	Can delete default tag rules	2016-05-27 22:00:08 +10:00
Rob Harrington	12e685bd92	Restricting number of tags for tag rules to one	2016-05-27 16:25:10 +10:00
Rob Harrington	6dd05ca4da	Intermittent fail hunting	2016-05-27 16:25:10 +10:00
Rob Harrington	a1c7a44fa0	Tag Rules can be rearranged in UI to set priority	2016-05-27 16:25:10 +10:00
Rob Harrington	cb9e3b43f9	Tag attributes are auto-initialized via directive if not present on object	2016-05-27 16:25:10 +10:00
Rob Harrington	011c8c74d9	Updating remove button character for tags in ngTagsInput	2016-05-27 16:25:10 +10:00
Rob Harrington	38e37a4dfa	Using new jasmine2 syntax in variant override spec	2016-05-27 16:25:10 +10:00
Rob Harrington	607b674c57	Refactoring tag rule logic, placing in TagRuleApplicator lib class	2016-05-27 16:25:10 +10:00
Rob Harrington	fa3b43a970	Adding default tag rules	2016-05-27 16:25:10 +10:00
Rob Harrington	bf0db2287b	More structured layout for Tag Rules UI	2016-05-27 16:25:10 +10:00
Rob Harrington	c568ac4d64	Re-adding button clicks removed in 885d489bc3	2016-05-27 16:25:10 +10:00