1912 Commits

Author	SHA1	Message	Date
Rob Harrington	b3e67fa164	Take two on disabled logic	2015-01-15 17:34:04 +11:00
summerscope	d2277999cc	Undo change of logic on disabled state on Shopping cart button	2015-01-15 17:13:10 +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	891a9b06a8	Add expand icon on top of image thumbnail	2015-01-15 15:23:10 +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	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	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	6adb4194c2	Extract date range form to partial	2015-01-08 10:31:51 +11:00
Rohan Mitchell	b6f29c778e	Use haml syntax for defining divs	2015-01-08 10:23:37 +11:00
Rohan Mitchell	a438216189	Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2 ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-08 10:08:12 +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	85882a73ff	Merge branch 'lin-d-hop-266reportsbranch'	2014-12-19 16:51:38 +11:00
Rohan Mitchell	94684e9963	Show overridden price in shopping cart	2014-12-19 16:51:11 +11:00
Rob Harrington	6f95fa8546	Merge remote-tracking branch 'origin/shopfront-filters'	2014-12-19 15:40:01 +11:00
summerscope	813ef463a2	Tweak markup shopfront page to add icon	2014-12-19 14:53:25 +11:00
Rob Harrington	a810fc88ac	Dedicated new enterprise form	2014-12-19 14:05:24 +11:00
Rob Harrington	21e4f40616	Implementing primary taxon ordering on the shopfront	2014-12-19 14:05:23 +11:00
Rob Harrington	0fa289a443	Changing shopfront message into an alert box	2014-12-19 14:04:02 +11:00
Rob Harrington	f145a7ed65	Moving taxons into its own module, adding preferred shopfront taxon order to enterprise	2014-12-19 14:04:02 +11:00
Rob Harrington	a38e27e504	Adapting taxon autocompleter to allow multiple selection of taxons	2014-12-19 14:04:02 +11:00
Rob Harrington	9f086facdb	Hiding link to shopfront for non-distributors	2014-12-19 14:04:01 +11:00
Rob Harrington	c5bf228cb9	Removing hashes from side menu links	2014-12-19 14:04:01 +11:00
Rob Harrington	b18163bfaf	Remove separate long description injection, use full enterprise serializer instead	2014-12-19 14:04:01 +11:00
Rob Harrington	3fa1832e7b	Adding shop closed message preference	2014-12-19 14:04:01 +11:00
Rob Harrington	d5df73c6a2	Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular	2014-12-19 14:04:01 +11:00
Rob Harrington	5a24f2c0e2	WIP: adding shopfront message to shop	2014-12-19 14:04:00 +11:00
Rob Harrington	435bc177f8	Hiding side menu elements by filtering rather than by making invisible	2014-12-19 14:04:00 +11:00
Rob Harrington	a489aa7ad9	Fixing enterprise feature spec, adding first shop preference	2014-12-19 14:04:00 +11:00
Rob Harrington	33d4f03a99	Adding shop preferences pane, fiddling with icons	2014-12-19 14:04:00 +11:00
Rob Harrington	612c8a95b2	Adding icons to enterprise edit side menu	2014-12-19 14:04:00 +11:00
Rob Harrington	abdcdea1a2	Adding payment methods partial to new enterprirse edit screen	2014-12-19 14:04:00 +11:00
Rob Harrington	412b431f36	Fixing up tbody positions	2014-12-19 14:03:59 +11:00
Rob Harrington	25e608d9fb	Adding shipping methods partial to redone enterprise form	2014-12-19 14:03:59 +11:00
Rob Harrington	0ea1adfdff	Adding a partial for enterprise fees to enterprise form	2014-12-19 14:03:59 +11:00
Rob Harrington	76acd706ea	Adding ability to show and hide menu items	2014-12-19 14:03:59 +11:00
Rob Harrington	eb2a6f0ef5	Splitting contact and social into two separate partials	2014-12-19 14:03:59 +11:00
Rob Harrington	b10d623f26	Rearrange columns for action buttons on enterprise form	2014-12-19 14:03:58 +11:00
Rob Harrington	f86d4a1996	Pulling headings out of enterprise form partials, displaying each conditionally	2014-12-19 14:03:24 +11:00
Rob Harrington	d8349bc037	menu refers to SideMenu object	2014-12-19 13:52:02 +11:00
Rob Harrington	39ca0ce3dc	WIP: Adding a side_menu to the enterprise form	2014-12-19 13:52:01 +11:00
Rob Harrington	b0c86f83ee	Splitting enterprise edit page into partials	2014-12-19 13:52:01 +11:00
summerscope	f36c881f52	Add clear filters feature to Producers page	2014-12-19 13:02:07 +11:00