Commit Graph

257 Commits

Author SHA1 Message Date
Will Marshall
6d124b3275 Failing tests, forcing the orders close text to change 2013-12-18 16:12:06 +11:00
Will Marshall
a3dfe1b147 Working on the HTML structure, variants etc 2013-12-18 12:26:34 +11:00
Will Marshall
7ea9cf6862 Adding price to serializer 2013-12-17 15:45:06 +11:00
Will Marshall
67fcf0f534 Fixing up the feature specs 2013-12-17 15:26:49 +11:00
Will Marshall
c4c5f3a8c7 Merging from master 2013-12-17 14:18:21 +11:00
Will Marshall
63349c7c9a Fixing some breaking bugs in the refactored mailer 2013-12-13 15:40:23 +11:00
Rohan Mitchell
124b6df75d Show undated order cycles on index page 2013-12-13 14:51:43 +11:00
Will Marshall
6e36142809 Making some changes to the data on the products inventory page 2013-12-13 11:39:45 +11:00
Will Marshall
e98031e581 Fixing some minor report bugs 2013-12-13 10:12:41 +11:00
Will Marshall
3670d68265 Correctly failing tests forcing us to build out OrderCycle switching in Angular 2013-12-05 16:48:29 +11:00
Will Marshall
165513fdea Adding some feature tests for the basic products page 2013-12-05 16:30:59 +11:00
Will Marshall
7e9f389900 Getting the order cycles dropdown rendering correctly 2013-12-05 15:15:15 +11:00
Will Marshall
ec72e9137a We can now hit the index page 2013-12-05 15:07:46 +11:00
Will Marshall
4543e08872 Renaming everything to Shop 2013-12-05 13:40:05 +11:00
Will Marshall
acdbbb153d Fixing up the landing page spec to cover the new login text 2013-11-28 15:24:38 +11:00
Will Marshall
7bc754a598 Adding filtering to the products page 2013-11-28 13:44:21 +11:00
Will Marshall
d39cb74d06 Merge branch 'customers' 2013-11-22 16:55:11 +11:00
Will Marshall
27f99d1383 Working version of Customers reports without filters 2013-11-22 16:53:57 +11:00
Will Marshall
51ea6fcd67 Starting on the Customers Report 2013-11-22 14:57:11 +11:00
Rohan Mitchell
4898460132 Fix failing spec with table reorder, lambda-fy scopes that use time 2013-11-22 14:00:04 +11:00
Rohan Mitchell
94c33e5f45 Colour order cycle rows based on their status 2013-11-22 11:31:04 +11:00
Rohan Mitchell
f75879bec1 Put order cycle variants in a tooltip 2013-11-22 10:03:49 +11:00
Will Marshall
5e170a843e Forcing a rebuild on Jenkins 2013-11-21 17:22:47 +11:00
Will Marshall
c695bafe69 Reworking the way the Reports works so we have more granular control over what shows 2013-11-21 16:45:59 +11:00
Rohan Mitchell
dfcf567f26 Sort payment methods by name 2013-11-21 14:42:28 +11:00
Will Marshall
d703e1836f Working build of P&I report 2013-11-21 14:06:24 +11:00
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