15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
summerscope	d0f66a6053	Fixing label for cart popover to make it write name of product variant without page load	2015-03-13 18:10:59 +11:00
summerscope	d2fbf9f14d	Fixing logic for instance where collection instructions are not entered	2015-03-13 18:00:36 +11:00
Rohan Mitchell	8d3f25bb39	Fix intermittent 500 error when updating the cart	2015-03-13 17:50:01 +11:00
summerscope	7b1901253c	More work on filters for shopfront rewriting as compared to the rest of filter button styles	2015-03-13 17:32:33 +11:00
Rohan Mitchell	abaaf05631	Merge branch 'user-menu'	2015-03-13 17:00:37 +11:00
Rob Harrington	dd8c769ea9	Hiding fee breakdown on cart page for now	2015-03-13 16:50:57 +11:00
summerscope	864c9ec1da	This changes the user menu labels to show Account next to user email. ... Small tweak to user account page to make it less awful.	2015-03-13 16:49:26 +11:00
Rob Harrington	b0cfa6a17c	Shipping method prices displayed next to options in checkout	2015-03-13 16:18:49 +11:00
Rob Harrington	51258b242c	Merge remote-tracking branch 'origin/order-confirmation' into order-confirmation	2015-03-13 16:07:17 +11:00
summerscope	dc1dd2e243	Changing the class .filter-box for shopfront to .filter-shopfront ... This prevents the issue with inheritance / styling crossover	2015-03-13 16:06:46 +11:00
Rohan Mitchell	1a44e74a9d	When enterprise user creates an enterprise, make it a hub if they have other hubs	2015-03-13 16:06:42 +11:00
summerscope	e3bc7cf894	Styling for search alert on shopfront page	2015-03-13 15:36:06 +11:00
summerscope	e5cc9063e8	Changing the medium input styling to make it same height as taxon filters, and no animation to get big as we want the next row space for tags eventually	2015-03-13 15:35:45 +11:00
summerscope	88edaceee0	Adding a new color to brand colors - yellow light	2015-03-13 15:34:38 +11:00
summerscope	bce64a1ead	WIP product modals for shopfront	2015-03-13 15:34:11 +11:00
summerscope	c8c07ed700	Adding position fixed to modals - got lost somehow with upgrading foundation zurb	2015-03-13 12:59:26 +11:00
Rohan Mitchell	efbf2c7ffa	Display extended variant name in quick cart	2015-03-13 12:58:53 +11:00
summerscope	0258fc24f3	Moving comments to own line. New version of SASS does not like comments on same line as declarations.	2015-03-13 12:58:45 +11:00
Rohan Mitchell	6365434a94	Merge branch 'lin-d-hop-ordercyclemanagementreports2'	2015-03-13 10:53:03 +11:00
Rohan Mitchell	d9f90be38a	Fix indentation	2015-03-13 10:52:44 +11:00
Rohan Mitchell	008b43b1fc	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-03-13 10:47:49 +11:00
Rohan Mitchell	5609354136	Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs	2015-03-13 10:45:38 +11:00
Lynne Davis	d9e8ce2f0e	Fix bug in report that selecting multiple payment methods didn't work. Added spec as well	2015-03-12 17:16:51 +11:00
Rob Harrington	cce65aa462	Merge remote-tracking branch 'origin/master' into order-confirmation	2015-03-12 16:20:21 +11:00
Rob Harrington	44511b8b61	Only display shipping description if it exists	2015-03-12 16:18:30 +11:00
Rob Harrington	eb413ccc84	Committing schema changes	2015-03-12 16:18:07 +11:00
Rob Harrington	6cd6b751c8	Merge branch 'master' into order-confirmation	2015-03-12 15:34:49 +11:00
Rohan Mitchell	af95181245	Merge branch 'lin-d-hop-ordercyclemanagementreports2'	2015-03-12 12:30:49 +11:00
Rohan Mitchell	36fa4896ed	Syntax	2015-03-12 12:28:35 +11:00
Rohan Mitchell	7c723c04b6	Show yes/no instead of true/false	2015-03-12 12:23:02 +11:00
Rohan Mitchell	c85d5b86eb	Fix temperature_controlled migration - NOT NULL requires default value	2015-03-12 12:22:51 +11:00
Rohan Mitchell	1a97df1d21	Fix whitespace issues	2015-03-12 12:17:15 +11:00
Rohan Mitchell	a5716cf2c2	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-03-12 12:15:22 +11:00
Rohan Mitchell	b4e990a081	Merge branch 'reduce-supplier-list-in-order-cycles'	2015-03-12 11:55:46 +11:00
Rohan Mitchell	eccd97fc28	Merge branch 'master' into reduce-supplier-list-in-order-cycles	2015-03-12 11:55:14 +11:00
Rohan Mitchell	c4d4d10873	Reuse supplier/distributor list	2015-03-12 11:53:13 +11:00
Rohan Mitchell	1e5e009735	Spree init works when database has not been created, remove duplicate FK from db/schema.rb	2015-03-12 11:29:01 +11:00
Rob Harrington	274a7a3c73	Fixing up the one liner filter styling a bit	2015-03-12 09:56:06 +11:00
Victor Nava	f90f7565fb	Allow admins to delete Order Cycles	2015-03-11 18:08:09 +11:00
Victor Nava	208fa02ec0	Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page	2015-03-11 13:14:45 +11:00
Victor Nava	2c89573441	Shave off a few seconds when showing order_cycles#index by loading order_cycle_enterprises only once.	2015-03-11 11:59:25 +11:00
Paul Mackay	717b3b6494	#275: Fixes for testing aggregated orders.	2015-03-10 19:19:57 +00:00
summerscope	ea96759306	Take styling out of template into SASS	2015-03-10 14:59:46 +11:00
summerscope	d967905b83	Tweaking copy styles and removing references to Open Sans which not using. Silly laura mixing up repos	2015-03-10 14:59:26 +11:00
summerscope	f698408d40	Logic for delivery vs collection - making template	2015-03-10 14:58:58 +11:00
summerscope	75b0b290ae	More WIP trying to work on the cart template logic with Rohan	2015-03-10 14:12:43 +11:00
summerscope	21b18a8cc5	WIP commit so i can see what i messed up.	2015-03-10 12:31:53 +11:00
summerscope	91bf588bcc	Order details page add in mini thumbnail for product image	2015-03-10 12:03:21 +11:00
summerscope	a8de4dc039	WIP checkout page and order confirmation page. Working on making these pages more consistent to each other, to email confirmation, and to shopping experience.	2015-03-10 11:35:53 +11:00
summerscope	c7cf9695bc	WIP on cart menu trying to add the master name back in where a product has variante	2015-03-10 11:35:35 +11:00