Commit Graph

293 Commits

Author SHA1 Message Date
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
7a8bd16083 On enterprise page, do not display products outside of the outgoing exchange 2013-11-15 15:08:45 +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
094485bc2d Sort enterprises by name, display direct-from-the-farm links separately at top 2013-10-31 15:52:22 +11:00
Rohan Mitchell
758676c1ea When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products 2013-10-31 14:49:26 +11:00
Rohan Mitchell
2533e52189 After saving, maintain filter on enterprise fees by enterprise 2013-10-30 17:36:54 +11:00
Rohan Mitchell
5386fa72cc Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises 2013-10-30 17:00:05 +11:00
Rohan Mitchell
fc8c82d5d2 Display enterprise groups on home page by position 2013-10-30 14:48:04 +11:00
Rohan Mitchell
647e1d196c Position enterprise groups 2013-10-30 14:46:49 +11:00
Rohan Mitchell
57a450b0aa Load landing page distributors from enterprise groups instead of yaml file 2013-10-30 13:55:47 +11:00
Rohan Mitchell
a6fa73ec13 List enterprise groups 2013-10-30 10:42:32 +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
fb22b5e2b7 When there are no order cycles open, display an 'orders closed' message 2013-10-24 10:32:30 +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
761bafe375 Rename text labeling from open food web to open food network 2013-10-18 17:46:05 +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
8e269353a8 Rename all open_food_web dirs to open_food_network 2013-10-18 17:19:47 +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
ea17e475a6 When viewing enterprise fees, only show those for the enterprise I select 2013-10-18 14:44:01 +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
a6877c6981 Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page. 2013-10-16 10:37:09 +11:00
Rohan Mitchell
4b7fc8b5e4 In production, redirect to hostname with the SSL certificate 2013-10-14 10:44:14 +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
f5b56617a0 As an enterprise user, when I create an enterprise, I should have management permission for it 2013-09-30 11:10:20 +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
Rohan Mitchell
803594b4d7 Confirm change hub when it would empty cart 2013-09-23 10:07:25 +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