205 Commits

Author	SHA1	Message	Date
Rohan Mitchell	ea17e475a6	When viewing enterprise fees, only show those for the enterprise I select	2013-10-18 14:44:01 +11:00
Rohan Mitchell	a6877c6981	Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page.	2013-10-16 10:37:09 +11:00
Rohan Mitchell	1d4198d402	Removing a supplier exchange removes variants from distribution	2013-09-30 09:46:39 +10:00
Rohan Mitchell	44aac294e0	Merge branch 'issue14'	2013-09-23 15:39:13 +10:00
Rohan Mitchell	803594b4d7	Confirm change hub when it would empty cart	2013-09-23 10:07:25 +10:00
Rohan Mitchell	767478a0ee	Add link to change hub	2013-09-23 09:17:17 +10:00
Rob H	08eb865469	Increase pagination size for products in BPE, resolves #14	2013-09-20 13:25:07 +05:45
Rohan Mitchell	9811851e29	Comment out order cycles debug styling that breaks tests	2013-09-20 13:08:54 +10:00
Rohan Mitchell	d100d12ebe	When a variant is removed from supply to an order cycle, remove it from distribution also	2013-09-20 11:11:59 +10:00
Rohan Mitchell	00fe10e847	Reposition order cycle admin debug info	2013-09-20 09:29:26 +10:00
Rohan Mitchell	c9e543b25a	Update delivery page of checkout, change shipping to delivery	2013-09-19 13:40:49 +10:00
David Cook	e4127358c3	Rearrange admin payment methods table (BH#73)	2013-09-19 12:12:50 +10:00
Rohan Mitchell	dc9206ccf6	Re-arrange top nav area	2013-09-18 16:27:18 +10:00
Rohan Mitchell	c1a28023ce	Move js file to avoid clobbering spree file	2013-09-16 14:11:00 +10:00
Rohan Mitchell	583164efb5	Fix variant price calculation	2013-09-10 11:52:13 +10:00
Rohan Mitchell	315876ca9d	Don't display bullets next to variant options	2013-09-10 11:52:04 +10:00
Rohan Mitchell	64a3a309f5	Change 'pick-up date' to 'available on', provide absolute dates in options	2013-09-10 09:16:23 +10:00
Rohan Mitchell	3ac4bd3b5f	Hide adjustments in cart by default, show by click	2013-09-09 14:37:36 +10:00
alexs333	999bc2697a	Implemented simlified shop flow.	2013-09-04 20:33:18 +10:00
Rohan Mitchell	aab7176f2c	Enterprise manager can bulk edit products	2013-08-22 11:21:49 +10:00
alexs	8b4c0682fb	Replaced eaterprises logo with the distributor name header.	2013-08-21 16:05:06 +10:00
alexs	f5b326ee1a	Fixed the bug where search gets cleared after user clicks inside the suburb input field.	2013-08-21 12:04:35 +10:00
alexs	f160e051e5	Added new temporary landing page.	2013-08-19 17:37:22 +10:00
Rohan Mitchell	19e7537b64	Style order cycle fees	2013-08-16 10:36:41 +10:00
Rohan Mitchell	4d04a24342	Translate exchange fees for processing by rails	2013-08-16 10:22:29 +10:00
Rohan Mitchell	e6fdcf581a	OrderCycle can fetch the direction of an exchange (incoming/outgoing)	2013-08-16 10:22:29 +10:00
alexs	0705c7af36	Added vertical separators for search results.	2013-08-15 11:37:50 +10:00
alexs	0c8779041f	Slightly increase the top bar height.	2013-08-15 11:35:24 +10:00
alexs	bdc8387346	Added base for shop front (enterprise).	2013-08-14 17:31:25 +10:00
Andrew Spinks	20bb5c9de7	Make sure angular injections work after magnification.	2013-08-14 10:49:55 +10:00
Andrew Spinks	59fce8a964	Show line items for each order in multi-cart.	2013-08-14 10:49:55 +10:00
Andrew Spinks	0a39fb87a5	Fix multi-cart association and add some temporary multi-cart support into the current front end.	2013-08-14 10:49:54 +10:00
alexs	77d31b3004	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-14 10:48:47 +10:00
alexs	9501d2c8a1	Core of sign up functionality.	2013-08-14 10:38:49 +10:00
alexs	51c898625e	Fixed link colors on map view.	2013-08-14 10:36:04 +10:00
Rohan Mitchell	8ff749d0eb	Find enterprises participating in an order cycle	2013-08-14 09:48:45 +10:00
Rohan Mitchell	0293942816	Add order cycle service method to add and remove exchange fees	2013-08-14 09:48:45 +10:00
Rohan Mitchell	13df3b098b	Make error messages more descriptive	2013-08-14 09:48:45 +10:00
Rohan Mitchell	47f6a5fbbf	Add controller methods to add and remove exchange fees	2013-08-14 09:48:45 +10:00
Rohan Mitchell	4120bc3dca	Output exchange fees as JSON	2013-08-14 09:48:45 +10:00
alexs	3cf58c8415	Re-enabled Foundation JavaScript.	2013-08-13 15:19:37 +10:00
alexs	e1a876a4b5	Added default minimum height for text areas.	2013-08-13 15:19:03 +10:00
alexs	886ac4a892	Added an escape patch with a small logo.	2013-08-13 12:07:32 +10:00
alexs	7206bf6393	Re-adjusted vertical positioning of the landing page.	2013-08-13 11:49:04 +10:00
alexs	72a422f7e7	Added the link that navigates to the current enterprise shopfront (for now).	2013-08-13 11:38:19 +10:00
alexs	215d6030d7	Added link to 'About OFN' page (as well as the base for that page).	2013-08-13 11:36:24 +10:00
alexs	f2f507c5c7	Suburb auto-complete functionality for the new landing page.	2013-08-12 17:34:56 +10:00
alexs	71262d3cb3	Base for enterprise search via suburb selector..	2013-08-11 16:57:00 +10:00
alexs	4ff8e825e9	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-09 13:21:24 +10:00
alexs	d3ab78e2c6	Assets for gmap4rails gem.	2013-08-09 13:20:49 +10:00