3189 Commits

Author	SHA1	Message	Date
Lynne Davis	d77f775c4c	Moving commits from 1241 to trigger build on UK staging	2016-12-19 15:06:43 +00:00
Continuous Integration	b075ed373a	Merge remote-tracking branch 'origin/master' into HEAD	2016-12-16 13:46:08 +11:00
Lynne Davis	cad3464f56	Adjusted BOM spec to reflect currency symbol changes	2016-12-09 11:40:55 +00:00
Rohan Mitchell	bbcaef20a8	Add unit specs for Spree::Admin::NavigationHelper	2016-12-09 11:24:58 +11:00
Rohan Mitchell	43726a0b23	Fix inventory link not appearing on menu	2016-12-08 10:38:29 +11:00
Rohan Mitchell	6e6efea328	Fix groups link not appearing on menu	2016-12-08 10:38:23 +11:00
Maikel Linke	a2a6ce1b3e	Revert "TEMP: Remove override for no-longer-present method" ... This reverts commit a3b91dabe5. Conflicts: app/helpers/spree/admin/navigation_helper_decorator.rb	2016-12-08 10:38:21 +11:00
Maikel Linke	3a69c958ef	Hide super admin menu items for enterprise users ... Imported temporarily missing Spree functionality. This patch becomes obsolete with another Spree upgrade.	2016-12-08 10:38:21 +11:00
Rohan Mitchell	d4fd66461e	Add retry to flaky specs	2016-11-25 14:37:47 +11:00
Rohan Mitchell	071ba5285d	Put timecop config in spec support	2016-11-25 14:28:05 +11:00
Rohan Mitchell	6795237a2d	Put timecop into safe mode and fix leaky Timecop.freeze	2016-11-25 14:14:42 +11:00
Rohan Mitchell	57363e2da5	When a product is deleted, touch the supplier and distributors	2016-11-25 14:14:42 +11:00
Rohan Mitchell	da9a3ce9f3	Refresh products cache when product is deleted (cf. destroyed)	2016-11-25 14:14:42 +11:00
Rohan Mitchell	c4318030d3	Fix spec: Second visit doesn't actually reload the page	2016-11-25 14:14:42 +11:00
Rohan Mitchell	dabac50128	Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products	2016-11-25 14:14:42 +11:00
Rohan Mitchell	9b656eaf4f	Property / ProducerProperty changes update distributor enterprise cache	2016-11-25 14:14:42 +11:00
Rohan Mitchell	22080a9a08	Property / ProducerProperty changes update supplier enterprise cache	2016-11-25 14:14:42 +11:00
Rohan Mitchell	1ea4f4274c	Add enterprise cache invalidation for order cycle changes	2016-11-25 14:14:42 +11:00
Rohan Mitchell	e8848451a5	Spacing	2016-11-25 14:14:42 +11:00
Rohan Mitchell	f4f38b4183	Re-apply shop property filters - including performance regression ... This reverts commit 7d149ed198.	2016-11-25 14:14:42 +11:00
Rob Harrington	268c8dbcdd	Moving Customers and CustomerResource services to admin.resource module	2016-11-25 11:46:51 +11:00
Rob Harrington	3de69987e6	Changing convention for angular resource services to generic 'byID' object and 'all' array	2016-11-25 10:37:01 +11:00
Rob Harrington	cbbb047fc1	Expunge all mentions of includeBlank and blankOption from angular services	2016-11-25 10:37:01 +11:00
Rohan Mitchell	631b19084a	Fix intermittent failure via FK when deleted taxon is primary taxon on p2	2016-11-25 09:37:05 +11:00
Rohan Mitchell	b7e9ffc9da	Fix enterprise user being denied access to admin when spree dash configured (as on production)	2016-11-24 13:35:49 +11:00
Rohan Mitchell	d8ce0e7d58	A user without enterprises does not have access to the dashboard, so it's not meaningful to spec	2016-11-24 13:35:04 +11:00
Rohan Mitchell	5913004e14	Fix datepicker error parsing date	2016-11-09 11:47:57 +11:00
Rohan Mitchell	d574b8943b	WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM	2016-11-04 09:39:17 +11:00
Rohan Mitchell	3e565ad7cb	Mark admin enterprises form dirty when property removed	2016-11-04 09:39:17 +11:00
Rohan Mitchell	4117b32ebd	Fix specs: We had no permission to update the specified supplier (how did this ever work?)	2016-11-04 09:39:17 +11:00
Rohan Mitchell	7a68cc7da1	Remove spec for product distributions	2016-11-04 09:39:17 +11:00
Rohan Mitchell	a1535d6c04	Catch flash messages after fadeout	2016-11-04 09:39:17 +11:00
Rohan Mitchell	f33df883a0	Fix link_to_remove_fields - does not immediately delete the field	2016-11-04 09:39:17 +11:00
Rohan Mitchell	8ce917a422	Work around click obscuration	2016-11-04 09:39:17 +11:00
Rohan Mitchell	fdd6400cb8	Fix perms for API soft delete	2016-11-04 09:39:17 +11:00
Rohan Mitchell	0e354f8fc1	Remove unused currency config vars: decimal_mark, thousands_separator	2016-11-04 09:39:17 +11:00
Rohan Mitchell	a6a0bdb063	Sanitize values before they're used	2016-11-04 09:39:17 +11:00
Rohan Mitchell	a3b91dabe5	TEMP: Remove override for no-longer-present method	2016-11-04 09:39:17 +11:00
Rohan Mitchell	1765ba0422	Fix spec dependent on product on_demand	2016-11-04 09:39:17 +11:00
Rohan Mitchell	376c4c3e0e	Fix factories - base_product and base_variant removed	2016-11-04 09:39:17 +11:00
Rohan Mitchell	a0b740f52d	Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments	2016-11-04 09:39:17 +11:00
Rohan Mitchell	9989b76b7d	Integrate from Spree fork: Calculators work against LineItems	2016-11-04 09:39:17 +11:00
Bing Xie	fb08759bec	Add more tests	2016-10-21 14:45:04 +11:00
Rob Harrington	e57a25d05f	Replacing local storage library with actively maintained one: grevory/angular-local-storage	2016-10-21 10:51:36 +11:00
Rob Harrington	b59a1cc232	Using true/false instead of YES/NO for address defaults and billing same as shipping	2016-10-21 10:51:36 +11:00
Bing Xie	d48b00c77c	Fix failed user spec	2016-10-21 10:51:36 +11:00
Bing Xie	b0402daf32	Fix failed customers filter spec	2016-10-21 10:51:36 +11:00
Bing Xie	21ed37189a	Only search customers in user managed enterprises	2016-10-21 10:51:36 +11:00
Bing Xie	2f241485a2	Set default addresses for user or customer	2016-10-21 10:51:36 +11:00
Bing Xie	f14ca87eb5	Set new address for user	2016-10-21 10:51:36 +11:00