2055 Commits

Author	SHA1	Message	Date
Rob Harrington	75ed259554	Conditionally show input for coordinator ... Conflicts: app/views/admin/order_cycles/_form.html.haml	2015-03-27 15:56:07 +11:00
Rohan Mitchell	d471368412	Spacing	2015-03-27 13:09:25 +11:00
Rohan Mitchell	5da9bdc614	Merge branch 'victornava-legacy-login-fix'	2015-03-25 10:37:14 +11:00
Rohan Mitchell	ab9bc7b1dc	Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action	2015-03-18 12:50:25 +11:00
Rohan Mitchell	cf4ccc268a	Admin may set no tax category on product unless tax category is required	2015-03-18 10:12:32 +11:00
Rohan Mitchell	7af17242f9	EnterpriseFee admin interface allows selecting no fee	2015-03-16 14:05:04 +11:00
Rohan Mitchell	95c09315f5	Change class delete-product -> delete-order-cycle	2015-03-16 12:42:05 +11:00
Rohan Mitchell	e125bcf451	Add column header for extra action column	2015-03-16 12:15:43 +11:00
Rohan Mitchell	4491d3cc73	Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix ... Conflicts: app/views/admin/order_cycles/_row.html.haml spec/features/admin/order_cycles_spec.rb	2015-03-16 12:14:54 +11:00
Rob Harrington	d684a88697	Merge branch 'order-confirmation' into ready-to-merge	2015-03-13 18:11:53 +11:00
summerscope	d2fbf9f14d	Fixing logic for instance where collection instructions are not entered	2015-03-13 18:00:36 +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
Rohan Mitchell	efbf2c7ffa	Display extended variant name in quick cart	2015-03-13 12:58:53 +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	6cd6b751c8	Merge branch 'master' into order-confirmation	2015-03-12 15:34:49 +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
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
summerscope	ea96759306	Take styling out of template into SASS	2015-03-10 14:59:46 +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	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
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
summerscope	c3c1573f54	Adding a comment	2015-03-05 23:22:31 +11:00
summerscope	a0af22350d	Order conf page WIP	2015-03-05 17:21:25 +11:00
summerscope	e3b660abb9	Shopping cart page update to simplify, improve and expose fees	2015-03-05 17:21:13 +11:00
Victor Nava	a21bfc909a	Remove the suppliers column on admin order cycles index page	2015-03-05 16:12:31 +11:00
summerscope	574a215525	Order Confirmation Page WIP	2015-03-05 11:26:29 +11:00
summerscope	2cdab7af25	More label tweaks and logic tweaks to templates	2015-03-05 11:26:15 +11:00
Rohan Mitchell	53fa71d1f3	Admin can set enterprise fee's tax category	2015-03-05 10:44:25 +11:00
Rohan Mitchell	67c77cea81	Tidy up haml	2015-03-05 10:43:54 +11:00
Matt-Yorkley	d194e74eda	Rohan's suggested changes	2015-03-05 10:43:51 +11:00
Matt-Yorkley	371f966f63	sales tax view	2015-03-05 10:43:50 +11:00
summerscope	e6591be55c	More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.	2015-03-04 17:34:24 +11:00
summerscope	5b6bff1691	Removing bad nasty overrides which are confusing and bad. and nasty.	2015-03-04 17:20:05 +11:00
summerscope	47b08269d6	Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails.	2015-03-04 17:19:24 +11:00
summerscope	76f234ee4d	Order confirmation top page working on header label	2015-03-04 17:18:55 +11:00
summerscope	163035dcad	Tweaking email template to be more like order confirmation	2015-03-04 17:18:37 +11:00
Victor Nava	6e800341c3	Fixes issue #362 Change admin account link to point to account page instead of edit user.	2015-03-04 16:00:46 +11:00