131 Commits

Author	SHA1	Message	Date
Rohan Mitchell	b7f7766893	On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME	2013-05-18 19:54:27 +10:00
Rohan Mitchell	f17907e06f	Style local organics product details distributor heading	2013-04-26 09:56:16 +10:00
Rohan Mitchell	9f6d1a2f18	Order cycle reports are precise to time of day, not just date	2013-04-25 21:22:26 +10:00
Rohan Mitchell	f2f3bbd3ed	Merge branch 'order-cycles-exchange-products' ... Conflicts: Gemfile.lock	2013-01-22 10:40:56 +11:00
Rohan Mitchell	83e3c6815d	Merge branch 'checkout-changes' ... Conflicts: .rvmrc app/helpers/application_helper.rb	2013-01-22 10:30:51 +11:00
Rob H	f7890bd94d	Fixes following code review for checkout changes	2013-01-18 19:17:55 +11:00
Rob H	6a45e8be3b	Make tests pass after changes to checkout broke them all	2013-01-18 15:29:36 +11:00
Rohan Mitchell	1d357af708	Disable Jirafe and UserVoice outside of production -> test speedup	2013-01-09 09:14:43 +11:00
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	3a3f427a8d	Reference name of payment method rather than payment method itself	2012-12-07 14:30:05 +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	58a79e9b0c	Minor changes to order confirm email	2012-11-23 16:06:25 +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	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
Rohan Mitchell	9a9bef5304	Report filtering on completion date, not creation date	2012-11-09 20:31:08 +11:00
Rohan Mitchell	c2133d70ac	Rename Enterprise is_supplier scope to is_primary_producer	2012-11-01 15:02:57 +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	682c09f516	Remove use of old Distributor model, fix before all not cleaning db	2012-11-01 10:05:39 +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	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
Rohan Mitchell	773adca838	Display distributor details on product page when distributor is selected	2012-10-27 12:49:57 +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	d74591afe6	Fixes to reports controller and addition of order cycles reports	2012-10-26 13:44:13 +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	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	9166829930	Add group buy unit size field	2012-10-18 11:56:21 +11:00
Rohan Mitchell	ba895ed486	Display CMS content for suppliers page	2012-10-17 07:54:12 +11:00
Rohan Mitchell	36d342f216	Add view all suppliers page	2012-10-17 07:50:58 +11:00
Rohan Mitchell	d09123eb22	Do not show suppliers with no products in stock	2012-10-17 07:36:18 +11:00
Rohan Mitchell	927970d1a9	Viewing another products listing page does not display home page content	2012-10-12 09:39:49 +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	e1d4ee318c	Fix issues with elRTE - sprites and functionality now work for link and image functions	2012-10-11 12:00:30 +11:00