Commit Graph

678 Commits

Author SHA1 Message Date
Will Marshall
84346c7fbd Starting specing P&I Report 2013-11-20 13:59:02 +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
7a8bd16083 On enterprise page, do not display products outside of the outgoing exchange 2013-11-15 15:08:45 +11:00
Rohan Mitchell
59935619e3 Rename OrderCycle#distributed_variants_by to variants_distributed_by 2013-11-15 14:34:05 +11:00
Rohan Mitchell
52b6c33aaa When converting an exchange to a hash for comparison, ensure id lists are sorted - ordering issues should not indicate inequality 2013-11-15 12:09:26 +11:00
Rohan Mitchell
d73af509e0 When removing exchanges from an order cycle, compare by id only. Avoids erroneously removing exchanges where another attr has changed in an unimportant way. 2013-11-15 12:09:26 +11:00
Will Marshall
2ce687fc79 Adding variant update permissions to Enterprise users 2013-11-14 11:53:14 +11:00
Will Marshall
a4f2ea771d Fixing the bulk update spec 2013-11-13 16:24:09 +11:00
Rohan Mitchell
27b8c4508f Split product distribution editing into its own admin page 2013-11-13 15:22:17 +11:00
Will Marshall
b227be4a62 Adding an override to suppress the products display unless we actually have an order_cycle in play 2013-11-08 16:04:31 +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
Will Marshall
317b2f1ced Helperizing some of the order cycles stuff 2013-11-08 15:19:27 +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
a526439643 Moving the orders controller spec into the right place 2013-11-07 15:13:07 +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
f0d335a454 Fixing up the failing spec for distributor changes, reworking a method to SharedHelper 2013-11-07 11:47:05 +11:00
Rohan Mitchell
04387aa6b7 Scope time since last oc expired to distributor 2013-11-06 16:17:36 +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
Will Marshall
9f150c8d87 Adding a small display on the distributor page indicating when the next order cycle is, if any - BugHerd#127 2013-11-01 16:12:31 +11:00
Will Marshall
b8fcfbd72b Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125 2013-11-01 14:48:23 +11:00
Rohan Mitchell
34638c0bf9 Remove pry from spec 2013-10-31 16:27:13 +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
217f1b58ad Fix spec broken by 8595839 2013-10-31 13:49:57 +11:00
Rohan Mitchell
a3b96070d5 Use helper instead of manually creating a subject 2013-10-31 11:40:28 +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
32889715f0 Grey out hubs that have no products available for distribution and are not in an order cycle 2013-10-30 16:09:18 +11:00
Rohan Mitchell
647e1d196c Position enterprise groups 2013-10-30 14:46:49 +11:00
Rohan Mitchell
521ed565b4 Modify specs to create enterprise groups where needed 2013-10-30 13:56:10 +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
7f6f725e02 Find enterprise groups on the front page 2013-10-30 13:54:11 +11:00
Rohan Mitchell
2d80490d41 Update group membership for enterprise 2013-10-30 11:27:39 +11:00
Rohan Mitchell
49b36d0670 Delete enterprise group 2013-10-30 10:42:32 +11:00
Rohan Mitchell
b8457b2b0f Edit enterprise group 2013-10-30 10:42:32 +11:00
Rohan Mitchell
be7e76920d Create new enterprise group 2013-10-30 10:42:32 +11:00
Rohan Mitchell
a6fa73ec13 List enterprise groups 2013-10-30 10:42:32 +11:00
Rohan Mitchell
e78815c2d3 Create models for EnterpriseGroups 2013-10-30 10:42:32 +11:00
Rohan Mitchell
5c9c96e174 Do not error if order cycle loads before enterprises 2013-10-24 13:40:27 +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
0d1dd361d6 Do not display links to enterprise payment methods and shipping methods when enterprise is a supplier only 2013-10-24 10:46: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
12061fd485 Order cycle admin does not allow save until page is loaded 2013-10-23 14:59:50 +11:00
Rohan Mitchell
b8320a9bb6 Rename some directives and internal login details 2013-10-19 09:45:38 +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