82 Commits

Author	SHA1	Message	Date
Rohan Mitchell	6d84cf7613	Merge branch 'master' into enterprises ... Conflicts: app/controllers/enterprises_controller.rb app/views/spree/checkout/_distributor.html.haml db/schema.rb spec/lib/open_food_web/group_buy_report_spec.rb	2012-11-01 11:02:02 +11:00
Rohan Mitchell	d89945bbb2	Add smoke test for reports, fix use of old Distributor model	2012-11-01 10:20:06 +11:00
Rohan Mitchell	78bdbcbe6f	Rename DistributorsHelper to EnterprisesHelper	2012-11-01 10:07:55 +11:00
Rohan Mitchell	34588e6141	Remove old supplier and distributor routes, models, controllers, views, specs	2012-11-01 09:55:45 +11:00
Rohan Mitchell	9d5c127f0d	Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes.	2012-10-31 16:47:01 +11:00
Rohan Mitchell	a8f4178894	Update orders controller for enterprises	2012-10-31 16:33:38 +11:00
Rohan Mitchell	1d1c27701d	Add admin interface for enterprises	2012-10-31 14:25:00 +11:00
Rohan Mitchell	926440a978	Fix namespacing of Distributor in reports controller	2012-10-31 11:13:55 +11:00
Rohan Mitchell	5ac904005b	Merge branch 'order-cycle-reports' ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb config/routes.rb	2012-10-31 10:18:11 +11:00
Rohan Mitchell	c5941d6cb5	Update distributor details when distributor is changed	2012-10-27 18:50:09 +11:00
Rob H	f960cc44ba	Fixed calculations when variant weight is nil	2012-10-26 17:27:08 +11:00
Rohan Mitchell	a3042118c7	Merge branch 'group-reports' ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb config/routes.rb	2012-10-26 17:14:49 +11:00
Rob H	4dd5e12968	Fix reports controller, previous changes to fix change generate_report were incomplete	2012-10-26 13:49:39 +11:00
Rob H	d74591afe6	Fixes to reports controller and addition of order cycles reports	2012-10-26 13:44:13 +11:00
Rohan Mitchell	d1b9ce92f6	Move distributors helper out of spree namespace	2012-10-25 10:45:39 +11:00
Rohan Mitchell	784969097d	Move admin non-Spree controllers out of Spree namespace	2012-10-25 10:45:39 +11:00
Rohan Mitchell	15e91f7743	WIP Move non-admin non-Spree controllers out of Spree namespace	2012-10-25 10:45:39 +11:00
Rohan Mitchell	c46019d68c	WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace	2012-10-25 10:45:39 +11:00
Rob H	a362dd5161	Change reports controller: generate_report to render_report	2012-10-24 17:01:50 +11:00
Rob H	81b33772fe	Fixes to syntax and formatting for group-reports	2012-10-24 15:21:16 +11:00
Rob H	3b855a866a	Merge branch 'grouper-reports' into group-reports	2012-10-22 11:35:56 +11:00
Rob H	ddb01e4ccb	WIP: Create report grouper, write reports for bulk co-ops and payments	2012-10-21 13:12:48 +11:00
Rohan Mitchell	36d342f216	Add view all suppliers page	2012-10-17 07:50:58 +11:00
Rohan Mitchell	3dd3d8030f	Display CMS pages in menu	2012-10-11 17:00:34 +11:00
Rohan Mitchell	cab61ddb7c	CMS content on home page	2012-10-11 16:21:33 +11:00
Rohan Mitchell	a686a820d9	Add distributor show page, redirect here after selecting distributor	2012-10-11 10:50:36 +11:00
Rohan Mitchell	58e5724f81	Display supplier details on supplier page	2012-10-11 10:50:36 +11:00
Rob H	8c7ed6f4ef	Merge branch 'group-buy-report'	2012-10-10 15:47:02 +11:00
Rob H	5803da9c55	Syntax fixes for group buy report classes and tests	2012-10-10 15:13:15 +11:00
Rob H	9737f21bb8	WIP: Write body of group buy report	2012-10-10 13:46:51 +11:00
Rohan Mitchell	2535e3965b	When merging orders, set distributor when target order distributor is nil	2012-10-09 08:42:29 +11:00
Rohan Mitchell	568d948cbe	Destroy incomplete orders if they can't be merged, prevents that order unexpectedly appearing in cart after checkout. Also ensure all orders have a shipping method.	2012-10-05 12:09:53 +10:00
Rohan Mitchell	6d9257d941	Do not delete shipping method referenced by a line item	2012-10-02 12:15:09 +10:00
Rohan Mitchell	7430fc9bdd	Do not delete shipping method referenced by a product distribution	2012-10-02 11:58:18 +10:00
Rohan Mitchell	2aa450b072	Do not delete shipping method referenced by an order	2012-10-02 11:51:13 +10:00
Rohan Mitchell	27b7d59f46	BaseController does not attempt to merge incomplete and current orders when they have differing distributors	2012-10-02 09:44:51 +10:00
Rohan Mitchell	757456dd57	Set line item shipping method in callback so that Order#update shipping calcs run correctly	2012-09-20 10:45:50 +10:00
Rohan Mitchell	3894ce946d	Fix error on supplier page, add test to cover	2012-09-19 15:46:56 +10:00
Rohan Mitchell	eaca160367	Set line item shipping method when added to cart, update specs for changes to line item shipping method	2012-09-19 15:01:50 +10:00
Rohan Mitchell	b87c59c051	Default to blank distributor on add to cart to require user to select one	2012-09-13 15:29:04 +10:00
Rohan Mitchell	9f013f0e37	When loading distributors for sidebar, only show those that have active products on hand	2012-08-04 17:51:08 +10:00
Rohan Mitchell	f0ec3080e4	Remove instrumentation	2012-08-04 17:50:30 +10:00
Rohan Mitchell	245de4fe1a	Add instrumentation to debug products not appearing on distributor view	2012-08-04 16:52:18 +10:00
Rohan Mitchell	f3ffba378a	Add a product with variants to the cart with max quantity for a group buy	2012-08-03 18:05:45 +10:00
Rohan Mitchell	2d89640271	Instrument orders controller to debug populate_variant_attributes	2012-08-03 14:11:59 +10:00
Rohan Mitchell	768a170bb8	Fix with_products_on_hand query for server db compatibility	2012-08-03 08:21:45 +10:00
Rohan Mitchell	2db2fbcade	Change set_variant_attribute to set_variant_attributes, implement it on Order	2012-08-02 14:45:27 +10:00
Rohan Mitchell	ea05f05576	When adding a group buy product to the cart, set the max quantity on the order	2012-08-02 14:29:05 +10:00
Rohan Mitchell	63bf25293d	Only show distributors in sidebar that have products in stock	2012-08-02 11:49:10 +10:00
Rohan Mitchell	93867682bb	Only show distributors in sidebar that have products	2012-08-02 11:33:36 +10:00