1040 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	eaf71e28bb	Raise an error when tests hit the network	2013-08-14 11:19:16 +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
alexs	9501d2c8a1	Core of sign up functionality.	2013-08-14 10:38:49 +10:00
alexs	6b760f3068	Added feedback info for search criteria.	2013-08-14 10:37:25 +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	f67a6fa3fb	Extract coordinator fees to partial	2013-08-14 09:48:45 +10:00
Rohan Mitchell	4120bc3dca	Output exchange fees as JSON	2013-08-14 09:48:45 +10:00
David Cook	293661377e	Remove text to the left of TOTAL	2013-08-13 17:01:19 +10:00
David Cook	015dbc5c01	Only show active or complete order cycles, ordered by cycle close date	2013-08-13 16:47:23 +10:00
David Cook	6bad6e2675	Add order cycle selection to Order Cycles Report	2013-08-13 15:48:04 +10:00
alexs	0a5f8afcb6	Added modal placeholders for new distributors and farmers sections.	2013-08-13 15:20:21 +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	1a3c09a846	Temporarily downgraded zurb foundation to make it work with gmaps4rails (will be fixed in future release of Foundation).	2013-08-13 15:18:31 +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	e90ccef337	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-13 11:40:54 +10:00
alexs	779befe3cf	Links to the enterpise pages.	2013-08-13 11:40:35 +10:00
alexs	6a17f80c93	Added logo to the landing page.	2013-08-13 11:40:14 +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	8b87c33c97	Added layout based wrapping for the main component (used in off canvas layout).	2013-08-13 11:37:36 +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
David Cook	6c4ace8d14	Ensure that all PaymentMethod-derived classes also allow distributor_id	2013-08-13 10:57:36 +10:00
David Cook	725766d82e	Feature tests for PaymentMethod in admin and checkout	2013-08-13 10:57:36 +10:00
David Cook	98d520f0e3	Filter PaymentMethods by distributor	2013-08-13 10:55:52 +10:00
David Cook	1621e4c4a4	Add distributor to PaymentMethod	2013-08-13 10:55:51 +10:00
Rohan Mitchell	f3447f2898	Remove shipping method field from product distributions	2013-08-13 10:14:51 +10:00
Rohan Mitchell	5f4313b588	Remove itemwise shipping calculator	2013-08-13 10:14:39 +10:00
Rohan Mitchell	b71f7eec3d	Fix spec for charges by adjustment not shipping method	2013-08-13 09:11:26 +10:00
Rohan Mitchell	43f482a803	Remove use of deprecated rspec syntax	2013-08-13 09:11:26 +10:00
Rohan Mitchell	7677f79f17	Remove the now-unused Product#shipping_method_for_distributor	2013-08-13 09:11:26 +10:00
Rohan Mitchell	94e49d4190	Remove line item specs for removed functionality	2013-08-13 09:11:26 +10:00
Rohan Mitchell	7e30b664f2	Add enterprise fees relation to enterprise	2013-08-13 09:11:26 +10:00
Rohan Mitchell	c011de539d	Update rake task for product distribution fees by enterprise fee	2013-08-13 09:11:25 +10:00
Rohan Mitchell	b5d324ec8c	Drop itemwise shipping method use in tests	2013-08-13 09:11:25 +10:00
Rohan Mitchell	9aad44f093	Strip shipping method mechanics out of LineItem and Order	2013-08-13 09:11:25 +10:00
Rohan Mitchell	60956e9789	Display sum of distribution fees at cart by adjustment, not shipping methods	2013-08-13 09:11:25 +10:00