Will Marshall
|
dd1b3311d7
|
Removing all the old order populator stuff
|
2014-01-06 15:23:21 +11:00 |
|
Will Marshall
|
751e98443f
|
Removing LOADS of code
|
2013-12-19 16:47:27 +11:00 |
|
Will Marshall
|
985cebb44a
|
Massaging the form to push orders to the cart: some refactoring still required
|
2013-12-19 15:51:51 +11:00 |
|
Will Marshall
|
6d124b3275
|
Failing tests, forcing the orders close text to change
|
2013-12-18 16:12:06 +11:00 |
|
Will Marshall
|
c4c5f3a8c7
|
Merging from master
|
2013-12-17 14:18:21 +11:00 |
|
Will Marshall
|
843a1133ef
|
Moving to use custom serializers for ze JSON API
|
2013-12-17 13:48:08 +11:00 |
|
Rohan Mitchell
|
124b6df75d
|
Show undated order cycles on index page
|
2013-12-13 14:51:43 +11:00 |
|
Will Marshall
|
e98031e581
|
Fixing some minor report bugs
|
2013-12-13 10:12:41 +11:00 |
|
Will Marshall
|
71a5d84a1d
|
Filtering the products to the current order cycle
|
2013-12-11 15:06:07 +11:00 |
|
Will Marshall
|
04d8949177
|
Tweaks to the JS, redirection on the controller
|
2013-12-11 12:53:50 +11:00 |
|
Will Marshall
|
4db8f755bf
|
Getting an order cycle update function in place like a boss
|
2013-12-11 12:42:02 +11:00 |
|
Will Marshall
|
63dfa0b696
|
Getting the test framework set up for Angular, setting up a products fetch stub
|
2013-12-06 15:24:42 +11:00 |
|
Rohan Mitchell
|
4c72170742
|
Remove unnecessary require
|
2013-12-05 15:16:51 +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
|
f525b7aea1
|
Adding the distributors controller
|
2013-12-04 15:58:25 +11:00 |
|
Will Marshall
|
9efd7c2d69
|
Getting the darkswarm build flow up and running. Like a boss
|
2013-12-04 13:09:30 +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
|
b3bf3a8378
|
Adding the plumbing for Customers reports, and one tiny refactor to products
|
2013-11-22 14:56:57 +11:00 |
|
Rohan Mitchell
|
94c33e5f45
|
Colour order cycle rows based on their status
|
2013-11-22 11:31:04 +11:00 |
|
Rohan Mitchell
|
3a2394675f
|
Rename OrderCycle#expired? to #closed?
|
2013-11-22 11:08:42 +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
|
612a80ec15
|
A little refactoring, some comment removal
|
2013-11-21 14:28:23 +11:00 |
|
Will Marshall
|
d703e1836f
|
Working build of P&I report
|
2013-11-21 14:06:24 +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
|
27b8c4508f
|
Split product distribution editing into its own admin page
|
2013-11-13 15:22:17 +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 |
|
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
|
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
|
3c37696882
|
Adding specs and implementation: moving current distributor to new empty order after checkout
|
2013-11-06 12:35:22 +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
|
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
|
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
|
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
|
57a450b0aa
|
Load landing page distributors from enterprise groups instead of yaml file
|
2013-10-30 13:55:47 +11:00 |
|
Rohan Mitchell
|
a6fa73ec13
|
List enterprise groups
|
2013-10-30 10:42:32 +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
|
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
|
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 |
|