Commit Graph

1055 Commits

Author SHA1 Message Date
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
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
93cb845ee2 DB and model changes to make ShippingMethod distributor habtm 2013-10-17 11:15:43 +11:00
Rohan Mitchell
8654f23a19 Move spree model decorator specs into their own dir to mirror model dir layout 2013-10-17 09:53:54 +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
c5228c9ad2 Fix home controller for oc hit by global before_filter 2013-09-30 17:22:55 +10: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
8353413c4a Fix spec fail 2013-09-30 15:13:02 +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
1d4198d402 Removing a supplier exchange removes variants from distribution 2013-09-30 09:46:39 +10:00
Rohan Mitchell
32204076bd Update js specs for pagination fix 2013-09-30 09:18:49 +10:00
Rohan Mitchell
208ffb3317 Fix commented-out order cycle specs 2013-09-27 16:02:06 +10:00
Rohan Mitchell
01036ec730 Add LineItem#supplied_by scope, fixes orders and fulfillment report supplier filtering 2013-09-27 14:11:12 +10:00