92 Commits

Author	SHA1	Message	Date
Rohan Mitchell	02561ee252	With order cycle distribution, show error message when adding a product to cart with no distribution chosen	2013-05-28 11:54:46 +10:00
Rohan Mitchell	612e6aed2c	Include order cycle distributions in distributor choice when adding product to cart	2013-05-27 13:12:29 +10:00
Rohan Mitchell	0874f12797	Controllers provide current order cycle for product splitting	2013-04-05 14:30:11 +11:00
Rohan Mitchell	b3976bfbd0	Rename SplitProductsByDistributor to SplitProductsByDistribution	2013-04-05 11:08:19 +11:00
Rohan Mitchell	3aa44c3e9a	Setting a remote distributor clears the order cycle, and vice versa	2013-03-08 15:17:23 +11:00
Rohan Mitchell	e1b2490259	Selecting an order cycle highlights valid distributor choices	2013-03-08 15:17:23 +11:00
Rohan Mitchell	74e2b70d3a	Without JS, select distributor, highlighting local order cycle choices	2013-03-08 15:17:22 +11:00
Rob H	055c07a466	Add before_payment method to checkout controller (fixes issues with spree_paypal_express)	2013-02-20 14:04:10 +11:00
Rob H	c956706d78	Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test	2013-02-14 15:12:50 +11:00
Rob H	612017f143	WIP Upgrade to Spree 1.3	2013-02-05 15:01:45 +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	8a37b4e918	Push validation logic for changing distributor down into lib class	2012-12-14 11:02:01 +11:00
Rob H	fc34c9c804	Add controller level check of product count_on_hand for adding products to cart	2012-12-13 11:16:46 +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	0d99d9d18f	Don't display unit size in reports for products that are not group buy items	2012-11-16 17:00:57 +11:00
Rob H	32acba05a3	Fixed total row labels in bulk co-op allocation report.	2012-11-16 15:28:06 +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	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	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	a8f4178894	Update orders controller for enterprises	2012-10-31 16:33:38 +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
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	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