2228 Commits

Author	SHA1	Message	Date
Rob Harrington	992fb2347d	Merging master branch into require_standard_variant	2015-04-29 14:30:49 +10:00
Rob Harrington	ed7b763ecf	UnitsCtrl can interpret unit_value_with_description without a separating space	2015-04-24 12:15:35 +10:00
Rob Harrington	05c350b5ff	Refactoring unitsCtrl	2015-04-24 11:27:47 +10:00
Rob Harrington	c66a7e44b6	Updating product model specs to reflect changes to properties	2015-04-23 15:37:41 +10:00
Rob Harrington	0251d8962d	Adding sku to BPE	2015-04-22 21:02:07 +10:00
Rob Harrington	e546388784	Rename properties_h to properties_including_inherited	2015-04-22 21:02:07 +10:00
Rob Harrington	976c24cf4c	properties_h uses inherit_properties flag, and returns property id rather than presentation	2015-04-22 21:02:07 +10:00
Rob Harrington	f610a709e1	Adding inherits_properties to BPE	2015-04-22 21:02:06 +10:00
Rob Harrington	5d6f265c0a	Moving spree namespaced serializers into admin	2015-04-22 21:02:06 +10:00
Rob Harrington	a75a76840d	Merging master into require_standard_variant	2015-04-17 21:18:24 +10:00
Rob Harrington	ff2e6d9ca4	Test deletion rather than destruction on variant model spec	2015-04-17 17:25:13 +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
Rohan Mitchell	042e076b58	Fix tax-related spec failures	2015-04-17 14:46:32 +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	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	0bdb8f7241	User can set whether an enterprise charges sales tax when registering	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	a93633a626	Show tax on order confirmation emails	2015-04-17 13:41:14 +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	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	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	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
Rob Harrington	28486f9e76	Only adds standard variant on create	2015-04-17 11:25:17 +10:00
Rob Harrington	869551a17c	Adding a standard variant again	2015-04-17 11:25:17 +10:00
Rob Harrington	13a910c372	Replace validates_associated on master with current spree method for error reporting master saves	2015-04-17 11:25:17 +10:00