197 Commits

Author	SHA1	Message	Date
Will Marshall	e98031e581	Fixing some minor report bugs	2013-12-13 10:12:41 +11:00
Will Marshall	7bc754a598	Adding filtering to the products page	2013-11-28 13:44:21 +11:00
Will Marshall	27f99d1383	Working version of Customers reports without filters	2013-11-22 16:53:57 +11:00
Will Marshall	b3bf3a8378	Adding the plumbing for Customers reports, and one tiny refactor to products	2013-11-22 14:56:57 +11:00
Will Marshall	c695bafe69	Reworking the way the Reports works so we have more granular control over what shows	2013-11-21 16:45:59 +11:00
Rohan Mitchell	dfcf567f26	Sort payment methods by name	2013-11-21 14:42:28 +11:00
Will Marshall	612a80ec15	A little refactoring, some comment removal	2013-11-21 14:28:23 +11:00
Will Marshall	d703e1836f	Working build of P&I report	2013-11-21 14:06:24 +11:00
Will Marshall	6a11b2685f	Controller plumbing for Product & Inventory report	2013-11-20 13:58:01 +11:00
Will Marshall	5772fa9589	Boilerplate for the new Product and Inventory report, sans any functionality	2013-11-20 10:34:18 +11:00
Rohan Mitchell	27b8c4508f	Split product distribution editing into its own admin page	2013-11-13 15:22:17 +11:00
Rohan Mitchell	283401d6fe	Fix checkout confirmation page blank (access denied) when checking out anonymously - BugHerd #139	2013-11-08 15:27:32 +11:00
Rohan Mitchell	48f18a93de	Order shipping methods by name, not distributor	2013-11-07 16:25:43 +11:00
Rohan Mitchell	0755b515d1	Only show shipping methods that enterprise user has access to	2013-11-07 16:25:43 +11:00
Will Marshall	b7c7730278	Patching a bug in which we'd 404 if deleting items from a cart twice in parallel	2013-11-07 15:12:28 +11:00
Will Marshall	3c37696882	Adding specs and implementation: moving current distributor to new empty order after checkout	2013-11-06 12:35:22 +11:00
Rohan Mitchell	767bda3093	Redirect /products to enterprise path, since this page did not have correct product filtering	2013-10-24 11:33:03 +11:00
Rohan Mitchell	e3307623dd	When order cycle expires, clear cart and display a message (from BaseController)	2013-10-23 17:16:07 +11:00
Rohan Mitchell	89f93cae77	Rename namespaced includes from open_food_web to open_food_network	2013-10-18 17:43:18 +11:00
Rohan Mitchell	57f7d489ff	Rename OpenFoodWeb namespace to OpenFoodNetwork	2013-10-18 17:29:55 +11:00
Rohan Mitchell	8ccad4b53a	Return an error code when bulk product edit save fails	2013-10-18 16:23:25 +11:00
Rohan Mitchell	3b5e6f5742	When viewing shipping methods, only show those for the distributor I select	2013-10-18 10:01:11 +11:00
Rohan Mitchell	e6041aaf2f	Enterprise user can view, create and edit payment methods	2013-10-18 09:09:53 +11:00
Rohan Mitchell	358ca25f31	Admin can assign multiple distributors to a shipping method	2013-10-17 11:16:26 +11:00
Rohan Mitchell	e29497c5b4	Enterprise users can bulk edit inactive products	2013-10-16 16:57:20 +11:00
Rohan Mitchell	751801653e	Bulk product update with >25 products succeeds	2013-10-16 14:36:22 +11:00
Rohan Mitchell	30bc45370b	When order cycle expires mid-order, clear the order cycle and display a message	2013-09-30 16:56:11 +10:00
Rohan Mitchell	741a81a427	Fix spec fails - do not redirect on Products#show when distributor not set	2013-09-23 14:00:33 +10:00
Rohan Mitchell	072ce67b78	Redirect if distributor not chosen	2013-09-23 13:39:13 +10:00
David Cook	2df2096d74	Sort payment and shipping methods by distributor name	2013-09-19 15:21:14 +10:00
David Cook	2e13abf933	Show only orders I am distributing	2013-09-19 15:21:14 +10:00
David Cook	402ed01207	Refactor/cleanup	2013-09-19 12:12:50 +10:00
David Cook	42a31ccd74	Show all relevant suppliers and distributors in report drop-down	2013-09-18 12:34:44 +10:00
David Cook	ad4301df90	Add supplier selection to Orders & Fulfillment Report	2013-09-18 12:34:43 +10:00
David Cook	4c2d6b38ea	Ensure 'No Order Cycle' remains selected after clicking 'Search'	2013-09-18 09:57:03 +10:00
David Cook	b34d940457	Renamed report column to 'Curr. Cost per Unit' for clarity	2013-09-18 09:27:34 +10:00
David Cook	3fbd5dc625	Fix 'No Order Cycle' dropdown in Orders & Fulfillment Reports	2013-09-18 09:27:34 +10:00
David Cook	9782dd8264	Get line item cost from order, not current product price which may have changed. Also removed unnecessary total columns.	2013-09-18 09:27:34 +10:00
David Cook	e57ad81934	Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports	2013-09-18 09:27:34 +10:00
David Cook	5ec3c1831d	Only show order cycles that the user has access to in reports drop-down	2013-09-18 09:26:50 +10:00
David Cook	fe513d42c4	Rename 'Order Cycles' report group to 'Orders & Fulfillment'	2013-09-18 09:25:51 +10:00
Rohan Mitchell	42a6ad6e7c	Inline spree_last_address into the codebase to attempt to fix errors with it appearing only in prod	2013-09-17 13:48:53 +10:00
David Cook	7e96ba909e	Show a list of Order Cycles report types in the description column	2013-09-13 09:59:35 +10:00
Rohan Mitchell	0e8443e118	Rename 'Change Pick-up Date' to 'Change Collection Date'. Fix this to clear the cart. Do not clear distributor when setting Order.order_cycle to nil.	2013-09-10 11:28:49 +10:00
Rohan Mitchell	d43df754d3	Load correct products on enterprise and product listing pages	2013-09-10 10:36:13 +10:00
alexs333	999bc2697a	Implemented simlified shop flow.	2013-09-04 20:33:18 +10:00
David Cook	25b25b7681	New scope Order.not_state to filter out cancelled orders from reports	2013-08-30 17:07:17 +10:00
David Cook	bf3c5c6dd6	Merge branch 'master' into reports-completed-only ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb	2013-08-30 16:42:00 +10:00
David Cook	6a303d7db9	Merge branch 'enterprise-reports' ... Conflicts: app/models/spree/ability_decorator.rb	2013-08-30 16:27:13 +10:00
David Cook	61e5ec24e7	Generalise ModelClassFromControllerName	2013-08-30 15:21:30 +10:00