317 Commits

This Branch

This Branch

All Branches

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	13d6f7213e	Fix db seeds	2012-11-01 10:21:55 +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	682c09f516	Remove use of old Distributor model, fix before all not cleaning db	2012-11-01 10:05:39 +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	d927906934	Update admin views, tests pass	2012-11-01 08:36:40 +11:00
Rohan Mitchell	58d227e76a	Home controller and product model specs pass	2012-11-01 08:28:40 +11:00
Rohan Mitchell	fb9f59213f	Distributors, product, suppliers and taxonomy specs pass	2012-11-01 08:15:50 +11:00
Rohan Mitchell	f8c2c8bbed	Convert group buy unit size field from string to float	2012-11-01 08:02:11 +11:00
Rohan Mitchell	7dd42b7feb	Fix use of pickup_address and url fields with enterprises, checkout spec passes	2012-10-31 17:10:21 +11:00
Rohan Mitchell	1b89331aa4	Update capybara and selenium-webdriver for compatibility with firefox 16	2012-10-31 17:09:26 +11:00
Rohan Mitchell	309179096b	Update supplier_id and distributor_id to point to newly created enterprises	2012-10-31 16:56:35 +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	f03d9b66f0	Update spree_paypal_express to fail gracefully when setting address 0.2.9	2012-10-31 15:17:05 +11:00
Rohan Mitchell	b9a072b61a	Make sure enterprises have a valid address after pickup address field has been removed	2012-10-31 14:32:47 +11:00
Rohan Mitchell	1d1c27701d	Add admin interface for enterprises	2012-10-31 14:25:00 +11:00
Rohan Mitchell	5dcba7403b	Avoid contaminating test data	2012-10-31 13:54:14 +11:00
Rohan Mitchell	926440a978	Fix namespacing of Distributor in reports controller 0.2.8	2012-10-31 11:13:55 +11:00
Rohan Mitchell	9b32579bd6	Group buy report handles nil variant weight gracefully	2012-10-31 10:37:40 +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	077098e6c1	Refactor libs to use enterprise instead of supplier and distributor	2012-10-29 14:57:03 +11:00
Rohan Mitchell	04d8648c6d	Remove pickup address and use single address field for supplier and distributor roles within enterprise	2012-10-28 18:03:19 +11:00
Rohan Mitchell	4c2debba7e	Model specs pass	2012-10-28 18:00:15 +11:00
Rohan Mitchell	abe3feb996	Integrate functionality from distributor into enterprise	2012-10-28 17:46:45 +11:00
Rohan Mitchell	c700d9e71b	Create enterprise model, integrate functionality from supplier	2012-10-28 13:24:26 +11:00
Rohan Mitchell	ff24149195	Combine suppliers and distributors into enterprises table	2012-10-28 12:59:50 +11:00
Rohan Mitchell	03610c93de	Upgrade capybara and selenium-webdriver for compatibility with Firefox 16	2012-10-28 12:28:55 +11:00
Rohan Mitchell	c5941d6cb5	Update distributor details when distributor is changed	2012-10-27 18:50:09 +11:00
Rohan Mitchell	773adca838	Display distributor details on product page when distributor is selected	2012-10-27 12:49:57 +11:00
Rohan Mitchell	13317347bb	Display an explanation message on product page when no distributor is selected	2012-10-27 12:19:44 +11:00
Rob H	f960cc44ba	Fixed calculations when variant weight is nil	2012-10-26 17:27:08 +11:00
Rob H	a9293709d8	Merge branch 'master', remote-tracking branch 'origin'	2012-10-26 17:24:17 +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	ede4649fbf	Merge branch 'master', remote-tracking branch 'origin'	2012-10-26 16:12:11 +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	09b60908b8	Fix links to admin distributor edit and delete	2012-10-25 12:20:20 +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
Rohan Mitchell	aa336d9b9f	Merge branch 'feedback' 0.2.7	2012-10-25 10:34:27 +11:00
Rob H	ff029b8903	Add feedback bar to all pages on the front end	2012-10-24 18:26:21 +11:00
Rob H	a362dd5161	Change reports controller: generate_report to render_report	2012-10-24 17:01:50 +11:00
Rohan Mitchell	51850be83e	Update spree_paypal_express to handle blank states from paypal 0.2.6	2012-10-24 16:19:53 +11:00
Rob H	41d547ac2d	Minor formatting changes to Order Group Spec	2012-10-24 16:13:23 +11:00
Rob H	81b33772fe	Fixes to syntax and formatting for group-reports	2012-10-24 15:21:16 +11:00
Rohan Mitchell	32db258db0	Use spree_heroku with support for staging env	2012-10-24 13:11:40 +11:00