Will Marshall
|
74fb266748
|
Adding some requirement filters to the Orders controller
|
2014-03-21 15:18:27 +11:00 |
|
Will Marshall
|
51b6ac3e68
|
Fixing one regression bug
|
2014-03-18 17:03:09 +11:00 |
|
Will Marshall
|
49789c865e
|
No longer copying old ship address from pickup, adding phone to custom shipping address
|
2014-03-18 16:47:28 +11:00 |
|
Will Marshall
|
a954f2c21a
|
Basic Darkswarm version of the Order Confirmation page
|
2014-03-14 16:11:40 +11:00 |
|
Will Marshall
|
b5019f12b4
|
Fixing up a couple of bugs introduced to the old step workflow
|
2014-03-04 15:07:00 +11:00 |
|
Will Marshall
|
3db601f362
|
Merge branch 'master' into checkout
|
2014-02-27 16:29:21 +11:00 |
|
Rohan Mitchell
|
353d2a4d9c
|
Do not error when creating variant for product without non-unit option type
|
2014-02-27 11:28:07 +11:00 |
|
Will Marshall
|
a0abd9c95a
|
Merge branch 'master' into checkout
|
2014-02-26 15:52:37 +11:00 |
|
Rohan Mitchell
|
7b80518621
|
On admin variant edit page, do not show option values for unit-related option types
|
2014-02-19 11:29:26 +11:00 |
|
Will Marshall
|
7af1d72ef9
|
Working login and signup forms for checkout, specs, redirect back to checkout on success
|
2014-02-07 16:07:18 +11:00 |
|
Rob H
|
00dfa62f43
|
Basic listing of orders on BOM page
|
2014-01-17 14:56:26 +08:00 |
|
Rohan Mitchell
|
cbe46bffed
|
Merge branch 'bpe_paginate'
Conflicts:
config/ng-test.conf.js
|
2014-01-09 12:07:42 +11:00 |
|
Rohan Mitchell
|
ef56574d82
|
Pass quantity to OrderPopulator
|
2014-01-08 11:37:38 +11:00 |
|
Rob H
|
177782fac5
|
Status message works when updating products with filters applied
|
2014-01-06 18:20:00 +08: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
|
e98031e581
|
Fixing some minor report bugs
|
2013-12-13 10:12:41 +11:00 |
|
Rohan Mitchell
|
4c72170742
|
Remove unnecessary require
|
2013-12-05 15:16:51 +11:00 |
|
Will Marshall
|
7bc754a598
|
Adding filtering to the products page
|
2013-11-28 13:44:21 +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 |
|
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
|
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
|
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
|
e3307623dd
|
When order cycle expires, clear cart and display a message (from BaseController)
|
2013-10-23 17:16:07 +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
|
8ccad4b53a
|
Return an error code when bulk product edit save fails
|
2013-10-18 16:23:25 +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
|
e6041aaf2f
|
Enterprise user can view, create and edit payment methods
|
2013-10-18 09:09:53 +11:00 |
|
Rohan Mitchell
|
358ca25f31
|
Admin can assign multiple distributors to a shipping method
|
2013-10-17 11:16:26 +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
|
741a81a427
|
Fix spec fails - do not redirect on Products#show when distributor not set
|
2013-09-23 14:00:33 +10:00 |
|
Rohan Mitchell
|
072ce67b78
|
Redirect if distributor not chosen
|
2013-09-23 13:39:13 +10:00 |
|
David Cook
|
2df2096d74
|
Sort payment and shipping methods by distributor name
|
2013-09-19 15:21:14 +10:00 |
|
David Cook
|
2e13abf933
|
Show only orders I am distributing
|
2013-09-19 15:21:14 +10:00 |
|
David Cook
|
402ed01207
|
Refactor/cleanup
|
2013-09-19 12:12:50 +10:00 |
|
David Cook
|
42a31ccd74
|
Show all relevant suppliers and distributors in report drop-down
|
2013-09-18 12:34:44 +10:00 |
|