7241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
summerscope	b9a0579397	Add styling for image thumbnail - hide for small, show small thumbnail for big screens.	2015-03-10 11:35:03 +11:00
summerscope	de6abc3464	Turning off z-index this causes problems on shopping cart page. Needs testing to confirm does not break elsewhere.	2015-03-10 11:34:31 +11:00
Rob Harrington	0a300d1802	Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)	2015-03-06 19:03:46 +11:00
Rob Harrington	12c6878cbe	Using vanilla foundation	2015-03-06 19:02:15 +11:00
Rob Harrington	4c4490a9b7	Upgrading foundation-rails and sass	2015-03-06 19:01:39 +11:00
Rob Harrington	578475a403	Filter products list on shop by active properties	2015-03-06 16:14:11 +11:00
summerscope	881313edf9	Changing the logic on Shipping accordion on checkout to try to show shipping price against option. Not working.	2015-03-06 16:05:42 +11:00
Rohan Mitchell	381bfd383b	Allow enterprise fee with no tax category	2015-03-06 12:12:33 +11:00
Liv Galendez	266d6ef834	Fixed handling of distributors field	2015-03-06 11:55:35 +11:00
Victor Nava	3e2142c3cf	Remove the hover / pop-up over the # variants on admin order cycles index page	2015-03-06 11:33:03 +11:00
Rob Harrington	e948bf1591	Only render selector icons if the icon exists	2015-03-06 11:32:01 +11:00
Rob Harrington	06f10398da	Adding product property filter to shop page	2015-03-06 11:22:52 +11:00
Rohan Mitchell	1e18f773f5	Switch context -> describe, clarify test grammar	2015-03-06 11:15:07 +11:00
Rohan Mitchell	41792395aa	Record the tax included in per-item EnterpriseFees	2015-03-06 11:13:47 +11:00
Rohan Mitchell	98ff895f5f	Record the tax included in per-order EnterpriseFees	2015-03-06 10:38:55 +11:00
summerscope	c3c1573f54	Adding a comment	2015-03-05 23:22:31 +11:00
Rob Harrington	55b8918ea1	Updating comment	2015-03-05 18:38:01 +11:00