1990 Commits

Author	SHA1	Message	Date
Rob Harrington	6b10a4a775	Restoring enterprise permalinks when they cause errors	2015-01-22 10:19:43 +11:00
Rob Harrington	4088bdc236	Clean up permalink checker	2015-01-22 10:19:43 +11:00
Rob Harrington	9b78963d5a	Adding a javascript interface for checking permalinks and user input on enterprise console	2015-01-22 10:19:43 +11:00
Rob Harrington	c3659612ed	enterprise routes use permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	7a6cd98646	Fixing failing spec, missing permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	9286c82b43	Removing obsolete methods	2015-01-22 10:19:42 +11:00
Rob Harrington	c330e49a7f	Moving permalink check action to enterprise controller	2015-01-22 10:19:42 +11:00
Rob Harrington	e2268e53bb	Adding action to check uniquness of enterprise permalink against existing routes	2015-01-22 10:19:41 +11:00
Rob Harrington	9f0aeb5adf	Adding unique permalink to enterprises	2015-01-22 10:19:41 +11:00
Rohan Mitchell	41e42c78c4	Update spec link name	2015-01-16 17:25:38 +11:00
Rob Harrington	1d80bee595	Cart item total reflects total number of items in the cart	2015-01-16 16:06:51 +11:00
summerscope	d2d3a577ea	Merging master into this branch to make it easy to pull for staging push	2015-01-15 17:38:35 +11:00
Rohan Mitchell	dcc04ea538	On enterprise edit page, do not show side menu links we don't have permission to	2015-01-15 13:43:39 +11:00
Rohan Mitchell	2d82f76a43	Fix changed var in ability spec	2015-01-15 13:43:39 +11:00
Rohan Mitchell	d5437e1508	edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise	2015-01-15 13:43:39 +11:00
Rohan Mitchell	f0bd9c1065	Fix failing specs due to addition of another enterprise	2015-01-15 13:43:39 +11:00
Rohan Mitchell	f6e9c9494c	Enterprise user can edit profiles it has permission to	2015-01-15 13:43:39 +11:00
Rohan Mitchell	90ad2e2b7d	Allow enterprises with 'edit profile' permission to edit enterprises	2015-01-15 13:43:39 +11:00
Rohan Mitchell	cfb69ae7d2	Add Permissions#editable_enterprises	2015-01-15 13:43:38 +11:00
Rohan Mitchell	a93a824b83	Admin can grant permission for an enterprise to edit the profile of another	2015-01-15 13:43:38 +11:00
Rohan Mitchell	307cc313df	Stub scope_to_hub in spec that wasn't expecting it	2015-01-13 11:46:41 +11:00
Rohan Mitchell	0431e0048c	Merge branch 'master' into variant-overrides-frontend ... Conflicts: app/controllers/shop_controller.rb app/views/shop/products/_form.html.haml spec/controllers/shop_controller_spec.rb	2015-01-12 16:48:51 +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	a4d4622521	Add VariantOverride.decrement_stock	2015-01-12 10:39:23 +11:00
Rohan Mitchell	20f650b472	Add VariantOverride.stock_overriden?	2015-01-12 09:32:02 +11:00
Rohan Mitchell	e9f32f5329	Spec that shipping category can be set when creating new products	2015-01-09 12:46:36 +11:00
Rohan Mitchell	7e55262ce9	Extract most everything to private methods - neatly groups concerns together	2015-01-09 11:28:39 +11:00
Rohan Mitchell	bbc887a692	Test the exact value, not the truncated value	2015-01-09 11:26:25 +11:00
Rohan Mitchell	6f36c0463c	Separate data preparation from test conditions	2015-01-09 11:26:25 +11:00
Rohan Mitchell	592ac7856a	Variable naming	2015-01-09 11:26:25 +11:00
Rohan Mitchell	261dea37e9	Spec formatting	2015-01-09 11:26:25 +11:00
Lynne Davis	1ad13f0359	Cleanup of git to remove unnecessary commits from pull request	2015-01-09 11:26:24 +11:00
Rohan Mitchell	ac59665e3c	Test validations without creating models in database	2015-01-08 09:48:33 +11:00
Rohan Mitchell	e4efda2f96	Move model spec into validations block	2015-01-08 09:37:35 +11:00
Rohan Mitchell	a9b91bc52a	Tighten spec: setting tax category should succeed	2015-01-08 09:35:18 +11:00
Rohan Mitchell	f90ee33c89	Use the tax category factory provided by Spree	2015-01-08 09:27:29 +11:00
Rohan Mitchell	087ccb52f9	Merge branch 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown	2015-01-08 09:09:20 +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	85882a73ff	Merge branch 'lin-d-hop-266reportsbranch'	2014-12-19 16:51:38 +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	1e1a070b2b	Scope Variant#price_in	2014-12-19 16:51:10 +11:00
Rob Harrington	170b14d0f5	Tightening up expectations in shop controller spec	2014-12-19 15:39:13 +11:00
Rob Harrington	a810fc88ac	Dedicated new enterprise form	2014-12-19 14:05:24 +11:00