1970 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	b4a7ccf1b4	Adjustments on LineItems don't modify the order total. Make adjustments on Order instead.	2013-08-09 15:28:48 +10:00
Rohan Mitchell	513993324d	Clean up old adjustments when changing distributor	2013-08-09 15:27:52 +10:00
Rohan Mitchell	fd989e3a77	Create adjustments so computation is performed against line item. Simplify specs now that weight calculator is compatible with line items.	2013-08-09 15:27:52 +10:00
Rohan Mitchell	239dd29511	Weight calculator will calculate against a single line item as well as an order	2013-08-09 15:27:52 +10:00
Rohan Mitchell	a338c974f8	Create line item adjustments for product distributions	2013-08-09 15:27:52 +10:00
Rohan Mitchell	8c9a3c8a91	Add Product#product_distribution_for	2013-08-09 15:26:57 +10:00
alexs	295d86affb	Removed the test that is believed to be incorrect and failing build.	2013-08-09 14:44:54 +10:00
alexs	834cec48bf	Forcing site-wide SSL for production and staging environments.	2013-08-09 13:28:58 +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
alexs	39623d45d6	Tests for building full addresses.	2013-08-09 13:19:07 +10:00
alexs	3b4c02865f	Tests for logging in from the new landing page.	2013-08-09 13:16:58 +10:00
alexs	7c96c17c88	Tests for geo search.	2013-08-09 13:15:36 +10:00
alexs	1ca306e09e	Added RSpec matchers to test delegations.	2013-08-09 13:14:49 +10:00
Andrew Spinks	bc57364c7e	Add simple angular cart to the main page.	2013-08-08 18:31:56 +10:00
Andrew Spinks	ac37dff946	Add controller for cart and beginnings of an API.	2013-08-08 18:31:56 +10:00
Andrew Spinks	7fe1aab903	Simplest version of a cart that supports multiple orders.	2013-08-08 18:31:56 +10:00
alexs	7d2e6c57bc	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-08 11:43:26 +10:00
alexs	f45ed42bdb	Skeleton for the search results.	2013-08-08 11:42:45 +10:00
Andrew Spinks	7bd0582b50	remove pry call	2013-08-08 10:48:05 +10:00
alexs	44e06fe7fc	Added search stuff to the least of assets to precompile.	2013-08-08 10:43:21 +10:00
alexs	7f74b85040	Markup tweak.	2013-08-07 19:26:21 +10:00
alexs	8efc95e095	Separated Foundation powered site from the Spree powered content (for now).	2013-08-07 19:25:48 +10:00
alexs	97ff668029	Fixed the finder ('all' finder was used in seed test instead of singular one).	2013-08-07 19:24:57 +10:00
alexs	28f94ae959	Stubbed out geolocation.	2013-08-07 18:03:41 +10:00
alexs	1992675794	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-07 14:09:30 +10:00
alexs	999ba2cf56	Added more real australian addresses to seed data as well some enterprises that use those addresses.	2013-08-07 14:07:55 +10:00
alexs	00743fada8	Added foundation gem to the right group.	2013-08-07 14:06:40 +10:00
alexs	ef39d0ce31	Geocoded Spree addresses	2013-08-07 14:01:27 +10:00
Andrew Spinks	7fbb5b13fb	Fix line item cache migration to work across orders in the staging servers.	2013-08-07 12:44:05 +10:00
David Cook	c247c2d3ea	WIP: Allow distributor enterprise user to access their orders	2013-08-07 09:19:28 +10:00
David Cook	577b114662	Add distributor and supplier users to load_sample_data task	2013-08-07 09:19:28 +10:00
alexs	3f82147024	Merge branch 'master' of github.com:eaterprises/openfoodweb ... Conflicts: db/schema.rb	2013-08-06 18:32:53 +10:00
alexs	82ea8adfe3	Added list of geocoded suburbs.	2013-08-06 18:31:08 +10:00
Rohan Mitchell	f1dbc03401	Use correct amount for order total in spec	2013-08-06 13:47:17 +10:00
Rohan Mitchell	8fdf0b6ff9	Fix payment not being captured due to being to small to cover order's distribution fee	2013-08-06 13:47:17 +10:00
Rohan Mitchell	cfb8c05cb5	Remove association that's already added by Spree's calculated_adjustments	2013-08-06 13:47:17 +10:00
Rohan Mitchell	d8b7a05441	Add EnterpriseFee to ProductDistributions	2013-08-06 13:47:17 +10:00
Rohan Mitchell	ec3e00c128	Refactor LineItem and clients for new fields	2013-08-06 13:47:17 +10:00
Rohan Mitchell	be1127b414	Migrate line item shipping_method cache to distribution_fee/shipping_method_name	2013-08-06 13:47:17 +10:00
alexs	57e185af78	Merge branch 'landing_page'	2013-08-06 12:35:06 +10:00
alexs	17f9a4645a	Added login to the landing page.	2013-08-06 12:34:22 +10:00
David Cook	27c17d6b07	Test that enterprise user can't access other enterprises' products	2013-08-06 11:22:44 +10:00
David Cook	0a7c5d4992	Add cancan ability tests on enterprise user roles	2013-08-06 11:12:37 +10:00
David Cook	7a92d99817	Remove unnecessary test on editing product (now tested under cancan abilities)	2013-08-06 11:12:06 +10:00
David Cook	fd8fc480dc	Always show supplier form for enterprise user again (list is now filtered according to enterprise_roles)	2013-08-06 10:56:31 +10:00
David Cook	2347acc2c1	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-06 09:23:30 +10:00
alexs	24d559cd3a	Merge branch 'master' into landing_page ... Conflicts: db/schema.rb db/seeds.rb	2013-08-05 17:08:39 +10:00
alexs	38b0a581e0	New landing page - initial layout and functionality	2013-08-05 17:04:56 +10:00