1079 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	9563aad9fa	Find exchanges with a particular variant	2013-08-19 10:41:14 +10:00
Rohan Mitchell	1d23446c40	ProductDistribution validates_presence_of enterprise fee, check no longer required	2013-08-19 10:41:14 +10:00
Rohan Mitchell	591f6a8a57	Move ProductDistribution#clear_all_enterprise_fee_adjustments_for to EnterpriseFee class	2013-08-19 10:41:14 +10:00
Rohan Mitchell	e318a1591d	Add FeatureToggleHelper for tests, enabling feature toggle changes for tests	2013-08-19 10:41:14 +10:00
Rohan Mitchell	5ffd56aad7	Re-write spec with new fee display at checkout	2013-08-19 10:41:14 +10:00
Andrew Spinks	38522e2b74	Fix order cycle permissions for enterprise user.	2013-08-18 19:41:04 +10:00
Andrew Spinks	a8d4efd067	Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor.	2013-08-16 17:08:19 +10:00
alexs	8ee98e3d96	Added bugherd to admin and sree frontend and re-arranged the bugherd code.	2013-08-16 15:50:45 +10:00
alexs	d73dc1dc48	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-16 12:13:47 +10:00
alexs	ec9bfa3114	Added BugHerd script for new landing page (staging only).	2013-08-16 12:13:25 +10:00
Andrew Spinks	82726d032c	Add enterprise roles for order cycles.	2013-08-16 11:34:07 +10:00
Rohan Mitchell	19e7537b64	Style order cycle fees	2013-08-16 10:36:41 +10:00
Rohan Mitchell	290607b5bf	CrUD for order cycle exchange fees	2013-08-16 10:22:29 +10:00
Rohan Mitchell	552cecb2e0	Find incoming and outgoing exchanges	2013-08-16 10:22:29 +10:00
Rohan Mitchell	715ec9b21a	Send enterprise id along with exchange enterprise fees	2013-08-16 10:22:29 +10:00
Rohan Mitchell	4d04a24342	Translate exchange fees for processing by rails	2013-08-16 10:22:29 +10:00
Rohan Mitchell	7fc0787e36	OrderCycleFormApplicator sets exchange fees	2013-08-16 10:22:29 +10:00
Rohan Mitchell	20853501e1	Delete unneeded angular scripts	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	a3970dde8a	Forcing POST for the search form.	2013-08-16 10:18:46 +10:00
alexs	4e715f62a2	Moved limit into the model.	2013-08-16 09:53:40 +10:00
alexs	82df7cddeb	Added staging environment.	2013-08-15 17:43:21 +10:00
alexs	b8bc30d4ab	Fixed the test setup and added the text for the bug found in 'Enterprise.find_near'.	2013-08-15 17:34:51 +10:00
alexs	a7256611cf	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-15 16:54:47 +10:00
alexs	da68dae586	Added unicorn-rails gem for running unicorn in dev.	2013-08-15 16:34:21 +10:00
alexs	cfffced652	Fixed the bug in the enterprise geo search.	2013-08-15 16:33:41 +10:00
Andrew Spinks	fdaa5364a1	Add controller action for adding products to multi cart via javascript API.	2013-08-15 15:36:35 +10:00
Andrew Spinks	d160a3256a	Make adding to cart via spree front end kind of work again.	2013-08-15 15:36:35 +10:00
alexs	88484f2d8b	Added tests for suburbs JSON.	2013-08-15 11:40:09 +10:00
alexs	c72a4a961f	Added the mechanism to test JSON APIs (Rabl stuff etc.)	2013-08-15 11:38:52 +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	d3842b2d8d	Further compressed the landing page image to make it really light.	2013-08-15 11:34:48 +10:00
alexs	bdc8387346	Added base for shop front (enterprise).	2013-08-14 17:31:25 +10:00
alexs	e1da63d18f	Added some more dev sample data.	2013-08-14 17:30:17 +10:00
alexs	42c912bb0d	Using webmock for test group only.	2013-08-14 17:26:42 +10:00
alexs	773c2b4217	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-14 11:31:25 +10:00
Rohan Mitchell	c39bd6b59d	Remove shipping methods with the now-absent itemwise calculator	2013-08-14 11:27:16 +10:00
Rohan Mitchell	eaf71e28bb	Raise an error when tests hit the network	2013-08-14 11:19:16 +10:00
alexs	a8a0c0513e	Fixed id duplication for login and sign up forms.	2013-08-14 11:12:36 +10:00
Andrew Spinks	9c6c4724be	Ensure line items only get created in correct orders when adding a product to a cart.	2013-08-14 10:49:55 +10:00
Andrew Spinks	0f1142fc30	Define class used in migration.	2013-08-14 10:49:55 +10:00
Andrew Spinks	d5791657f3	Support multiple orders when adding a product to a cart.	2013-08-14 10:49:55 +10:00
Andrew Spinks	dd3aaccf9f	When adding a variant to a cart, split into multiple orders depending on the distributors that it contains.	2013-08-14 10:49:55 +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
Rohan Mitchell	5fac29d2ed	Do not merge current and incomplete orders when logging in - fixes #20	2013-08-14 10:44:02 +10:00
alexs	48cb725da5	Upgraded fundation to fetch from the edge (until the next release when gmaps4rails integration is fixed).	2013-08-14 10:39:42 +10:00