Commit Graph

7241 Commits

Author SHA1 Message Date
Rohan Mitchell
72efb2096b Remove comment - everything makes sense now 2013-11-06 11:26:10 +11:00
Will Marshall
bef64e5967 Making sure the final row has a bottom border 2013-11-06 11:18:34 +11:00
Will Marshall
91abf4fab1 Reworking the temp homepage to use the Foundation styles more cleverly 2013-11-06 11:16:29 +11:00
Will Marshall
263195c8b9 Merging 2013-11-06 10:59:56 +11:00
Will Marshall
71af58239e Making the 'next order cycle' text big and black 2013-11-06 10:58:09 +11:00
Rohan Mitchell
fd43227921 Explicitly precompile style needed 2013-11-06 10:42:39 +11:00
Rohan Mitchell
bacd8401b4 Compile all admin css files for manual inclusion (fixes BugHerd #126) 2013-11-06 10:18:45 +11:00
Rohan Mitchell
6e0dfbd88b Make order cycle admin open and close time columns wider 2013-11-01 16:50:48 +11:00
Will Marshall
7d21dd053a Merging 2013-11-01 16:50:28 +11:00
Will Marshall
8f27c7be80 Fixing a clearing bug on the home page 2013-11-01 16:49:28 +11:00
Rohan Mitchell
6aad840d05 Change inaccurate wording - this lists order cycles by closing date, not availability date 2013-11-01 16:37:49 +11:00
Rohan Mitchell
25b0306a93 Ensure css is precompiled, reformat configs 2013-11-01 16:22:54 +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
37b81af91c Adding myself to the Readme as a contributor 2013-11-01 14:49:58 +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
Will Marshall
26f2d27d64 Updating therubyracer to fix mac compatibility with libv8 2013-11-01 14:46:41 +11:00
Rohan Mitchell
3d07d68637 Order landing page distributors by name 2013-10-31 16:28:04 +11:00
Rohan Mitchell
34638c0bf9 Remove pry from spec 2013-10-31 16:27:13 +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
eb997c94a2 Mark inactive distributors on supplier distributors list 2013-10-31 14:59:47 +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
859583992e Hide distributors from product details page 2013-10-31 10:25: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
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
2fe23c53ed Rename region to group 2013-10-30 13:57:33 +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
8d0f192ca7 Update states to match 2013-10-30 10:42:23 +11:00
Rohan Mitchell
6161114750 Standardise on Australia having ID 12, as staging and prod servers do 2013-10-30 10:34:29 +11:00
Rohan Mitchell
cbdd8a0091 Fix enterprise admin form style, which was being clobbered by CMS styles 2013-10-30 09:56:44 +11:00
Rohan Mitchell
5c9c96e174 Do not error if order cycle loads before enterprises 2013-10-24 13:40:27 +11:00
Rohan Mitchell
e265b406d6 Generalise script to work with staging servers, too 2013-10-24 13:30:21 +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
aec21b1a54 Add script to backup prod server to localhost 2013-10-23 17:14:53 +11:00
Rohan Mitchell
12061fd485 Order cycle admin does not allow save until page is loaded 2013-10-23 14:59:50 +11:00