230 Commits

Author	SHA1	Message	Date
Rob H	63cf128f86	Remove product descriptions from line item listings in cart and order	2012-12-14 15:08:35 +11:00
Rob H	1f8b4d185b	Rearrange 'Add To Cart' section of product page	2012-12-14 14:01:13 +11:00
Rob H	c7ac0f7d91	Allow distributor to be changed from product page	2012-12-14 11:57:34 +11:00
Rob H	8a37b4e918	Push validation logic for changing distributor down into lib class	2012-12-14 11:02:01 +11:00
Rob H	b5a95e73dc	Only show alternative distributors on 'address' page of checkout process	2012-12-07 12:29:44 +11:00
Rob H	9cf6124df3	Change checkout explanations from CMS pages to CMS snippets	2012-12-07 12:24:28 +11:00
Rob H	46abc2fc42	Add ability to change distributor based on whether products in the cart are available	2012-12-07 11:56:40 +11:00
Rob H	ef22168349	Move select_distributor and deselect_distributor actions from enterprises controller to orders controller	2012-11-28 10:54:11 +11:00
Rob H	43248aee99	Add can_change_distributor validation to the Order model	2012-11-28 09:17:05 +11:00
Rob H	ee482d520c	Replace order information display for Confirm and Complete stages of checkout	2012-11-23 10:51:14 +11:00
Rob H	3d025bb709	WIP Replace order information display for Confirm and Complete stages of checkout	2012-11-23 09:26:27 +11:00
Rob H	2786791c39	Change location of checkout delivery page cms from /delivery to /distribution	2012-11-21 16:14:56 +11:00
Rob H	b34d9da8e5	Add cms field to cart page to explain cart, located at cms path: /cart	2012-11-21 16:00:51 +11:00
Rob H	cbfb896ca4	Change 'Delivery Fees' to 'Distribution Costs' in cart	2012-11-17 11:46:43 +11:00
Rob H	59ca8f4513	Add cms field to cart page to explain delivery fees, located at cms path: /cart-delivery-fees	2012-11-16 18:32:02 +11:00
Rob H	573ba9c8d4	Merge remote-tracking branch 'origin/master' into checkout-changes	2012-11-16 16:10:51 +11:00
Rob H	9cb5ac95ff	More brackets make everything even better	2012-11-11 15:30:01 +11:00
Rohan Mitchell	076c64f7b0	Brackets make everything better	2012-11-10 12:53:03 +11:00
Rohan Mitchell	580486a347	Do not show duplicate products with in_supplier_or_distributor scope	2012-11-10 12:26:41 +11:00
Rohan Mitchell	9a9bef5304	Report filtering on completion date, not creation date	2012-11-09 20:31:08 +11:00
Rob H	a15f96aa68	Fix for case where no group_buy_size_has been set. ie. = nil	2012-11-07 18:34:54 +11:00
Rob H	5f07df9316	Add calculation fields to bulk co-op and order cycle reports	2012-11-03 11:36:17 +11:00
Rob H	9e4edd5da0	Change the basis of line_item grouping for Bulk Co-op and Order Cycle reports from User to Order	2012-11-02 16:41:32 +11:00
Rohan Mitchell	3a116dc13d	Fix product filtering on supplier and distributor pages	2012-11-01 16:37:12 +11:00
Rohan Mitchell	c2133d70ac	Rename Enterprise is_supplier scope to is_primary_producer	2012-11-01 15:02:57 +11:00
Rohan Mitchell	8748a65031	Show role on admin enterprises listing page	2012-11-01 11:22:13 +11:00
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	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	7dd42b7feb	Fix use of pickup_address and url fields with enterprises, checkout spec passes	2012-10-31 17:10:21 +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	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	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	7da595afbd	Add cms field to top of delivery page of checkout, located at cms path: /delivery	2012-10-26 19:29:55 +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	01569c2550	Change button text on Payments page to 'Process My Order'	2012-10-26 16:47:42 +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