17514 Commits

Author	SHA1	Message	Date
summerscope	8334ff736b	Styling for shopping cart buttons and spinner	2015-01-16 13:27:34 +11:00
summerscope	51687b5c2c	Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages	2015-01-16 13:27:16 +11:00
summerscope	21108b34b6	Add new animation for spinning	2015-01-16 13:26:40 +11:00
summerscope	2a21889216	Remove border on product thumbnail to clean up UI	2015-01-16 13:06:30 +11:00
summerscope	b451b94fd1	Improving styling on large thumbnail view of product images	2015-01-16 13:06:02 +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
Rob Harrington	b3e67fa164	Take two on disabled logic	2015-01-15 17:34:04 +11:00
Rob Harrington	ac34da4f24	Altering logic around disabled state for 'Your Shopping Cart' button	2015-01-15 17:19:48 +11:00
summerscope	d2277999cc	Undo change of logic on disabled state on Shopping cart button	2015-01-15 17:13:10 +11:00
summerscope	cdd6c2daf2	Styling product summary row to allow for hiding product thumb at a larger break point	2015-01-15 16:46:55 +11:00
summerscope	4a881a5aa5	Turn off product thumb at a larger break point	2015-01-15 16:46:18 +11:00
summerscope	d5d218c450	Make taxon flag smaller for smallest device breakpoint	2015-01-15 16:45:54 +11:00
summerscope	f8622be21d	Adding in new color variable	2015-01-15 16:45:29 +11:00
summerscope	676e7cb4d6	Make taxon flag 2 cols for small devices	2015-01-15 16:45:09 +11:00
summerscope	1dfbc88813	Change logic on disabled class on Your shopping cart button as this was swapped the wrong way around	2015-01-15 16:16:01 +11:00
summerscope	9db1c4c708	Adding in new color variable	2015-01-15 16:15:23 +11:00
summerscope	47a8731b8e	Styling for price column to distinguish between product added vs null	2015-01-15 16:01:49 +11:00
summerscope	932604bd69	Add in logic to style price column differently if nul vs has value	2015-01-15 16:01:00 +11:00
summerscope	4d7871a0bb	New grey color variable	2015-01-15 16:00:21 +11:00
summerscope	51c8891fac	Add animation to product title hover	2015-01-15 15:24:01 +11:00
summerscope	9b258e075b	Add styling and animation to img thumbnail	2015-01-15 15:23:36 +11:00
summerscope	891a9b06a8	Add expand icon on top of image thumbnail	2015-01-15 15:23:10 +11:00
Maikel Linke	4dc0701213	Side menu for enterprise group page	2015-01-15 15:04:21 +11:00
summerscope	b5879d51ac	Merging master into shopfront-filters branch	2015-01-15 14:15:25 +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	83754a01ef	Make side menu item visibility declarative	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	642de2f65f	Only show delete enterprise link when user has permission	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	a93a824b83	Admin can grant permission for an enterprise to edit the profile of another	2015-01-15 13:43:38 +11:00
Rohan Mitchell	2170c7ede1	Fix broken JS spec	2015-01-15 13:43:38 +11:00
Rob Harrington	06cf914119	Hopefully resolving order populator strangeness related to concurrency by ensuring a fresh list of line items	2015-01-15 12:10:05 +11:00
Maikel Linke	3e5dfda324	Removing old link to enterprise groups from configuration menu	2015-01-15 10:53:11 +11:00
Maikel Linke	13cbbcef40	Admin Tab Menu: converting .rb to .html.haml.deface ... Plus a new menu item for enterprise groups.	2015-01-15 10:26:27 +11:00
Maikel Linke	02a276b9c9	Producer and hub lists with search ... Fixing map display as well.	2015-01-14 15:18:46 +11:00
Maikel Linke	9f1a773a58	MapController: copy default config instead of referencing ... Copying makes it possible to have multiple independent maps.	2015-01-14 14:34:31 +11:00
Maikel Linke	0e510998a4	Handling missing options in shipping filter call	2015-01-14 14:33:37 +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	494bb1f3b4	Fix auto-reload nerfing scope_xx_to_hub	2015-01-12 14:24:15 +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	d40ffeef52	Remove old sidebar	2015-01-09 13:10:17 +11:00
Rohan Mitchell	27bc845b0b	Add correct markup for tax category required asterisk	2015-01-09 12:45:35 +11:00
Rohan Mitchell	22cb8b7a71	Two-space indentation, change 'Shipping categories' to 'Shipping category'	2015-01-09 12:33:26 +11:00
Rohan Mitchell	c6db1d440c	Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category ... Conflicts: app/overrides/spree/admin/products/new/replace_form.html.haml.deface app/views/spree/order_mailer/confirm_email.text.haml	2015-01-09 12:30:19 +11:00
Rohan Mitchell	6a42f62eb2	Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report	2015-01-09 11:49:59 +11:00
Rohan Mitchell	8db09d9590	Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-09 11:48:23 +11:00
Rohan Mitchell	51b0d7e0eb	Move private method to helper	2015-01-08 10:48:02 +11:00