Commit Graph

231 Commits

Author SHA1 Message Date
Will Marshall
5772fa9589 Boilerplate for the new Product and Inventory report, sans any functionality 2013-11-20 10:34:18 +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
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
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
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
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
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
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
b8320a9bb6 Rename some directives and internal login details 2013-10-19 09:45:38 +11:00
Rohan Mitchell
57f7d489ff Rename OpenFoodWeb namespace to OpenFoodNetwork 2013-10-18 17:29:55 +11:00
Rohan Mitchell
bd112c64b0 Fix edit enterprise link to point to edit page, fix spec breakages 2013-10-18 15:39:58 +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
91f14dcd4c Enterprise manager can create/edit enterprise fees 2013-10-18 13:56:22 +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
c07c52085a Enterprise user can view and create shipping methods 2013-10-18 09:35:53 +11:00
Rohan Mitchell
e6041aaf2f Enterprise user can view, create and edit payment methods 2013-10-18 09:09:53 +11:00
Rohan Mitchell
05932a69cd Adjust checkout spec for shipping method HABTM distributors 2013-10-17 12:30:26 +11:00
Rohan Mitchell
358ca25f31 Admin can assign multiple distributors to a shipping method 2013-10-17 11:16:26 +11:00
Rohan Mitchell
d480e96d7a Do not add an extra product which confuses other tests 2013-10-16 17:38:39 +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
935229fa09 On order show / confirmation page, show correct pickup time for order cycle pickup 2013-09-30 14:53:28 +10:00
Rohan Mitchell
57aa10a6f6 Fix specs for time zone change 2013-09-30 11:40:05 +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
208ffb3317 Fix commented-out order cycle specs 2013-09-27 16:02:06 +10:00
Rohan Mitchell
dac49d1044 Order cycle-aware pickup time 2013-09-27 11:17:24 +10:00
Rohan Mitchell
c9e543b25a Update delivery page of checkout, change shipping to delivery 2013-09-19 13:40:49 +10:00
David Cook
fe513d42c4 Rename 'Order Cycles' report group to 'Orders & Fulfillment' 2013-09-18 09:25:51 +10:00
Rohan Mitchell
8a849b8e47 When selecting hub, auto-select order cycle if there is only one option available 2013-09-17 10:20:14 +10:00
Rohan Mitchell
c2f1f0986b Fix broken specs 2013-09-16 14:30:46 +10:00
Rohan Mitchell
f0381f7579 Fix problems with spree_last_address - upgrade gem to a newer version, add a spec around it 2013-09-16 14:11:00 +10:00