370 Commits

Author	SHA1	Message	Date
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
Andrew Spinks	7172fe0c87	added extra fields to order report.	2012-07-20 00:07:41 +10:00
Andrew Spinks	7e9a84087e	cleaning up order report	2012-07-19 22:48:42 +10:00
Andrew Spinks	58e9cd3eeb	fix distributor name in report	2012-07-15 21:00:10 +10:00
Andrew Spinks	54559c4a5f	first cut at orders report.	2012-07-15 20:48:10 +10:00
Rohan Mitchell	718e54f933	Add distributor next_collection_at field, bulk edit in admin backend	2012-07-02 14:24:52 +10:00
Rohan Mitchell	4b9c0f01e2	Update admin backend for supplier/distributor address extraction	2012-06-26 14:54:35 +10:00
Rohan Mitchell	f3d52825ae	Remove redirect_back_or_default, which was causing unexpected behaviour	2012-06-26 07:54:55 +10:00
Rohan Mitchell	98bcc9ce71	When adding first product to cart, add the product and set the distributor even if the order has a different distributor set	2012-06-25 06:57:24 +10:00
Rohan Mitchell	df831a9128	Do not add the product to cart if the chosen distributor is different from the order's distributor	2012-06-24 20:14:07 +10:00
Rohan Mitchell	4481ca83f9	OrdersController does not permit adding products with invalid distributors	2012-06-24 19:58:09 +10:00
Rohan Mitchell	a41c5d4735	Move distributor permissions onto order class, do not show links to change distributor if the action is invalid	2012-06-24 15:15:53 +10:00
Rohan Mitchell	7b92fcb614	Do not allow deselecting distributor after product added to cart at controller level	2012-06-24 14:56:27 +10:00