172 Commits

Author	SHA1	Message	Date
Continuous Integration	c76021462c	Auto-merge from CI [skip ci]	2015-06-16 14:12:16 +10:00
Rob Harrington	d0b7550629	Removing screenshot from spec	2015-06-12 01:49:39 +08:00
Rohan Mitchell	6f513fee77	Merge branch 'master' into redesign	2015-05-29 15:20:21 +10:00
Rohan Mitchell	5e5628d0c3	Fix shops path for spec	2015-05-13 14:31:40 +10:00
Rohan Mitchell	0ac7dbf23b	Update spec references to removed file logo.jpg	2015-05-13 14:27:43 +10:00
Rob Harrington	a75a76840d	Merging master into require_standard_variant	2015-04-17 21:18:24 +10:00
Rohan Mitchell	0d9ba4257d	Merge branch 'properties'	2015-04-17 15:25:51 +10:00
Rohan Mitchell	042e076b58	Fix tax-related spec failures	2015-04-17 14:46:32 +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	a93633a626	Show tax on order confirmation emails	2015-04-17 13:41:14 +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	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
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
Rohan Mitchell	ccc1f3df40	Feature specs test email sending through delayed jobs	2015-04-16 16:54:43 +10:00
Rohan Mitchell	768cfab591	Change field text at checkout	2015-04-16 10:59:15 +10:00
Rob Harrington	06f10398da	Adding product property filter to shop page	2015-03-06 11:22:52 +11:00
Rohan Mitchell	7a5c56cbca	Do not show out of stock lines on order confirmation page	2015-01-29 13:19:04 +11:00
Rohan Mitchell	41e42c78c4	Update spec link name	2015-01-16 17:25:38 +11:00
Rohan Mitchell	20bde803c8	Display overridden prices when products are in the cart	2015-01-12 14:58:35 +11:00
Rohan Mitchell	6b43354386	Restructure spec	2015-01-12 14:37:43 +11:00
Rohan Mitchell	d52b6b34e3	Spec: do not subtract stock from overrides that do not override count_on_hand	2015-01-12 11:33:53 +11:00
Rohan Mitchell	4583e29ae3	When order is placed, subtract stock from variant override	2015-01-12 11:23:53 +11:00
Rohan Mitchell	4bf8716786	Extract complete_checkout to method	2015-01-07 16:29:15 +11:00
Rohan Mitchell	c0030ddb13	use_short_wait can now take a flexible wait time	2015-01-07 16:28:03 +11:00
Rohan Mitchell	370133b875	Fix minor spec issues	2015-01-07 16:06:23 +11:00
Rohan Mitchell	2bad590ef4	Order confirmation and order objects use overridden prices	2014-12-19 16:51:11 +11:00
Rohan Mitchell	c3995ee4d5	Checkout shows overridden prices	2014-12-19 16:51:11 +11:00
Rohan Mitchell	94684e9963	Show overridden price in shopping cart	2014-12-19 16:51:11 +11:00
Rohan Mitchell	b0f5d0170c	Spec that overridden price with fees appears in quick cart	2014-12-18 13:32:28 +11:00
Rohan Mitchell	5fcb2982fa	Fees are calculated correctly for items with variant overrides	2014-12-18 11:53:17 +11:00
Rohan Mitchell	1d3800696e	Variant overrides can override stock levels	2014-12-18 10:46:47 +11:00
Rohan Mitchell	0832a8f63d	Viewing products shows overridden prices	2014-12-17 16:00:25 +11:00
Rohan Mitchell	23c7715929	Cosmetic change	2014-12-17 14:03:54 +11:00
Rob Harrington	38440dd70a	Ammending checkout specs for two emails on placement of order	2014-11-26 23:16:11 +11:00
Rohan Mitchell	8c2adb2a05	Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue	2014-11-01 12:11:50 +11:00
Rohan Mitchell	f5b20b7afc	Give distributors a payment and shipping method where required	2014-10-31 16:02:43 +11:00
Rohan Mitchell	e2d88e615b	Fix broken spec	2014-10-31 16:00:28 +11:00
Rohan Mitchell	7aefa05efd	Fix specs broken by requirement for valid shipping and payment method	2014-10-31 14:48:08 +11:00
Rafael Schouten	b821107c27	bugfix migration ad specs	2014-09-27 18:14:10 +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	5007fd8ec3	Shipping method 1 is used, so shipping method amount is zero	2014-09-11 22:27:05 +10:00
Rohan Mitchell	69d1111c73	Fix expected payment amount	2014-09-10 17:00:51 +10:00
Rohan Mitchell	c297b7014a	Charge customers for their shipping fee	2014-09-10 14:01:36 +10:00
Rob H	b8fadb50ae	Special Instructions in checkout are actually wired up	2014-09-06 12:00:27 +10:00
Rob H	bfd9ffd84a	Adding missing data-bindings for country/state	2014-08-28 14:25:21 +10:00
Rohan Mitchell	4ceaec0ef5	Do not error when checking out with a pre-loaded shipping/billing address	2014-08-22 17:34:42 +10:00