34725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maikel Linke	03fd148f41	showing profile modals on groups/hubs	2015-04-17 16:58:49 +10:00
Rob Harrington	72d553ef0c	Test actual deletion of variants	2015-04-17 16:51:02 +10:00
Rob Harrington	63353ebace	Don't try and delete the only variant, that will never work!	2015-04-17 16:49:14 +10:00
Rohan Mitchell	a1673afff0	Allow more time for phantomjs, required by first admin spec where assets are compiled	2015-04-17 15:46:51 +10:00
Rohan Mitchell	0d4dbd23fd	Remove redundant spec line, test that sells is not changed	2015-04-17 15:42:42 +10:00
Rohan Mitchell	0d9ba4257d	Merge branch 'properties'	2015-04-17 15:25:51 +10:00
Rob Harrington	c43eb9ef72	Merge branch 'email_user' into properties	2015-04-17 15:17:37 +10:00
Rob Harrington	46690faffb	Fixing Darkswarm Angular Product Controller spec	2015-04-17 15:14:19 +10:00
Rob Harrington	32f14bca00	Preventing fitting of selectors when there are none	2015-04-17 15:10:41 +10:00
Rohan Mitchell	042e076b58	Fix tax-related spec failures	2015-04-17 14:46:32 +10:00
Rob Harrington	6d96a7a60b	Specifiy that allSelectors attribute on filterSelectors directive is optional	2015-04-17 14:43:09 +10:00
Rob Harrington	c8bf207187	Fixing trial expiry test	2015-04-17 14:33:47 +10:00
Rohan Mitchell	9e8483348f	Fix spec - enterprise needs to charge sales tax for tax to be charged	2015-04-17 13:41:38 +10:00
Rohan Mitchell	81324f3cc4	Do not charge tax on shipments when distributor does not charge sales tax	2015-04-17 13:41:38 +10:00
Rohan Mitchell	0b8a619274	When the order does not have a hub, all tax rates apply	2015-04-17 13:41:38 +10:00
Rohan Mitchell	048c6a8ee8	Include only the bare minimum of helpers into JS template context to avoid intermittent SASS @include issues	2015-04-17 13:41:38 +10:00
Rohan Mitchell	3e8801b12b	Do not charge sales tax on items or on enterprise fees when the distributor of the order does not charge sales tax	2015-04-17 13:41:38 +10:00
Rohan Mitchell	a6a5fdfb3b	Require that the user selects whether their enterprise charges sales tax	2015-04-17 13:41:38 +10:00
Rohan Mitchell	0bdb8f7241	User can set whether an enterprise charges sales tax when registering	2015-04-17 13:41:38 +10:00
Rohan Mitchell	05551aa2a9	Make helpers available to javascript templates	2015-04-17 13:41:38 +10:00
Rohan Mitchell	9bbc151cae	Admin can set enterprises to charge or not charge sales tax	2015-04-17 13:41:38 +10:00
Rohan Mitchell	08fef890ec	Do not show tax lines if there is no tax on the order	2015-04-17 13:41:14 +10:00
Rohan Mitchell	a93633a626	Show tax on order confirmation emails	2015-04-17 13:41:14 +10:00
Rohan Mitchell	4bd1ff2011	Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication	2015-04-17 13:40:08 +10:00
Rohan Mitchell	2914990444	Add save_and_open spec helper method to open HTML emails in the browser	2015-04-17 13:40:08 +10:00
Rohan Mitchell	3ce2c5b84f	Show tax on order confirmation page	2015-04-17 13:40:08 +10:00
Rohan Mitchell	77d7255243	Use short syntax for rendering partials	2015-04-17 13:39:10 +10:00
Rohan Mitchell	6bb926f811	Do not show tax in checkout	2015-04-17 13:39:09 +10:00
Rohan Mitchell	829d11d4b2	Deliver a warning if attempting to create an invalid taxed_product from factory	2015-04-17 13:39:09 +10:00
Rohan Mitchell	beec910445	Display tax in cart	2015-04-17 13:39:09 +10:00
Rohan Mitchell	68f0e51c02	Change add_product_to_cart spec helper to use OrderPopulator, reducing inconsistencies in order adjustments, tax etc.	2015-04-17 13:39:09 +10:00
Rohan Mitchell	210c76eddc	Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout	2015-04-17 13:39:09 +10:00
Rohan Mitchell	e75c6a8e1d	Add helper to display total tax on an order	2015-04-17 13:39:09 +10:00
Rob Harrington	b44f2bcdf5	Fixing trial expiry test	2015-04-17 13:30:36 +10:00
Rob Harrington	f13b52411d	Merge branch master into properties	2015-04-17 13:23:33 +10:00
Rob Harrington	0cf8b017b9	Pulling out taxons and properties placeholders from producer and product modals	2015-04-17 13:20:01 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rob Harrington	9ee25c4e42	Making spec better	2015-04-17 11:25:18 +10:00
Rob Harrington	2d7fb3fd67	Updating name of spec	2015-04-17 11:25:18 +10:00
Rob Harrington	7596270154	A few more changes to tidy up standard variant migration	2015-04-17 11:25:18 +10:00
Rob Harrington	5d9e861ee4	Working migration to complete deprecation of master variants	2015-04-17 11:25:18 +10:00
Rob Harrington	447a5481a3	WIP: Building migration to duplicate master variants	2015-04-17 11:25:18 +10:00
Rob Harrington	8248e382f3	Greying out disabled action button	2015-04-17 11:25:18 +10:00
Rob Harrington	4b182f9248	Can't delete final variant on a product from BPE	2015-04-17 11:25:18 +10:00
Rob Harrington	2b47c9145a	Cannot delete last variant of product	2015-04-17 11:25:17 +10:00
Rob Harrington	fcb3bc894b	Cleanup	2015-04-17 11:25:17 +10:00
Rob Harrington	a223a2d662	Cannot remove all variants from a product	2015-04-17 11:25:17 +10:00
Rob Harrington	5e2fe56c22	Cleanup	2015-04-17 11:25:17 +10:00
Rob Harrington	89afbc80a6	Set initial on_hand to 0	2015-04-17 11:25:17 +10:00
Rob Harrington	971723964e	Update outdated spec	2015-04-17 11:25:17 +10:00