304 Commits

Author	SHA1	Message	Date
Rohan Mitchell	fefea54375	Do not include variant_unit_with_scale in product update check. When saving products, save variant_unit and variant_unit_scale.	2013-12-05 15:16:52 +11:00
Rohan Mitchell	2115e33189	Use == instead of is	2013-12-05 15:16:52 +11:00
Rohan Mitchell	0a07f38f15	Load and display variant_unit on BPE page	2013-12-05 15:16:52 +11:00
Rohan Mitchell	2a989652cb	Use ||=	2013-12-05 15:16:52 +11:00
Rohan Mitchell	d552e84302	Tweak formatting	2013-12-05 15:16:52 +11:00
Rohan Mitchell	a8668e24e3	Finish converting bulk product update to coffeescript	2013-12-05 15:16:51 +11:00
Rohan Mitchell	634dd52a80	WIP: Convert bulk product update to coffeescript. 3 tests failing.	2013-12-05 15:16:51 +11:00
Will Marshall	f525b7aea1	Adding the distributors controller	2013-12-04 15:58:25 +11:00
Will Marshall	0032a806b5	Further work on Darkswarm	2013-12-04 14:12:13 +11:00
Will Marshall	0ac9bfd898	Moving our fix for the broken Spree function into our own JS	2013-11-29 14:24:56 +11:00
Will Marshall	7742fdc27a	Adding a better homepage login function	2013-11-28 15:01:57 +11:00
Rohan Mitchell	5386fa72cc	Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises	2013-10-30 17:00:05 +11:00
Rohan Mitchell	5c9c96e174	Do not error if order cycle loads before enterprises	2013-10-24 13:40:27 +11:00
Rohan Mitchell	12061fd485	Order cycle admin does not allow save until page is loaded	2013-10-23 14:59:50 +11:00
Rohan Mitchell	b8320a9bb6	Rename some directives and internal login details	2013-10-19 09:45:38 +11:00
Rohan Mitchell	89f93cae77	Rename namespaced includes from open_food_web to open_food_network	2013-10-18 17:43:18 +11:00
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
Rob H	08eb865469	Increase pagination size for products in BPE, resolves #14	2013-09-20 13:25:07 +05:45
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	c9e543b25a	Update delivery page of checkout, change shipping to delivery	2013-09-19 13:40:49 +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	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	f5b326ee1a	Fixed the bug where search gets cleared after user clicks inside the suburb input field.	2013-08-21 12:04:35 +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
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
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	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
alexs	b5cc2ab4cf	Added postcode search that redirect to page with map view.	2013-08-09 13:20:22 +10:00
Andrew Spinks	bc57364c7e	Add simple angular cart to the main page.	2013-08-08 18:31:56 +10:00
alexs	8efc95e095	Separated Foundation powered site from the Spree powered content (for now).	2013-08-07 19:25:48 +10:00