Rohan Mitchell
|
0e8443e118
|
Rename 'Change Pick-up Date' to 'Change Collection Date'. Fix this to clear the cart. Do not clear distributor when setting Order.order_cycle to nil.
|
2013-09-10 11:28:49 +10:00 |
|
Rohan Mitchell
|
d43df754d3
|
Load correct products on enterprise and product listing pages
|
2013-09-10 10:36:13 +10:00 |
|
alexs333
|
999bc2697a
|
Implemented simlified shop flow.
|
2013-09-04 20:33:18 +10:00 |
|
David Cook
|
25b25b7681
|
New scope Order.not_state to filter out cancelled orders from reports
|
2013-08-30 17:07:17 +10:00 |
|
David Cook
|
bf3c5c6dd6
|
Merge branch 'master' into reports-completed-only
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
|
2013-08-30 16:42:00 +10:00 |
|
David Cook
|
6a303d7db9
|
Merge branch 'enterprise-reports'
Conflicts:
app/models/spree/ability_decorator.rb
|
2013-08-30 16:27:13 +10:00 |
|
David Cook
|
61e5ec24e7
|
Generalise ModelClassFromControllerName
|
2013-08-30 15:21:30 +10:00 |
|
David Cook
|
80bfc5ce53
|
Ensure Supplier enterprise users can only view their own products in reports
|
2013-08-30 15:17:27 +10:00 |
|
David Cook
|
9de5a0061e
|
Enterprise user can only view their own distributors in reports (and remove redundant feature test)
|
2013-08-23 16:09:37 +10:00 |
|
Rohan Mitchell
|
02089541cd
|
Syntax tweaks
|
2013-08-23 14:00:31 +10:00 |
|
David Cook
|
078bd033b6
|
Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions)
|
2013-08-23 13:25:42 +10:00 |
|
David Cook
|
1bfb54f310
|
Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions)
|
2013-08-23 13:25:10 +10:00 |
|
Rohan Mitchell
|
8a092697ee
|
Enterprise manager can clone an order cycle
|
2013-08-22 17:11:53 +10:00 |
|
Rohan Mitchell
|
f1fa90d7c3
|
Clone order cycles
|
2013-08-22 16:53:11 +10:00 |
|
David Cook
|
3d32e6480b
|
Enterprise user can access all OFN reports
|
2013-08-22 13:07:17 +10:00 |
|
David Cook
|
3a75f6b86a
|
Enterprise user can access all OFN reports
|
2013-08-22 11:49:18 +10:00 |
|
Rohan Mitchell
|
f870e70560
|
Enterprise manager can edit and bulk edit enterprises they have access to
|
2013-08-22 11:40:33 +10:00 |
|
Rohan Mitchell
|
aab7176f2c
|
Enterprise manager can bulk edit products
|
2013-08-22 11:21:49 +10:00 |
|
David Cook
|
b2878ddc40
|
Payment Method must belong to a Distributor
|
2013-08-21 15:14:01 +10:00 |
|
alexs
|
acfb1bd600
|
Making sure that only distributor enterprises are displayed on the landing page.
|
2013-08-21 12:03:44 +10:00 |
|
Rohan Mitchell
|
31a078a53c
|
Enterprise manager can access enterprise fees for enterprises they manage - fixes fees on order cycles interface
|
2013-08-20 16:26:46 +10:00 |
|
Rohan Mitchell
|
fb33b853dd
|
Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5
|
2013-08-20 10:47:56 +10:00 |
|
alexs
|
8f67f385b7
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-19 17:37:49 +10:00 |
|
alexs
|
f160e051e5
|
Added new temporary landing page.
|
2013-08-19 17:37:22 +10:00 |
|
David Cook
|
3ffe732b30
|
Ensure valid payment method is selected
|
2013-08-19 13:57:40 +10:00 |
|
David Cook
|
2d305b59d9
|
Only show payment methods for the distributor of the order
|
2013-08-19 13:57:40 +10:00 |
|
David Cook
|
4be2fe5fe9
|
Only show payment methods that user has access to
|
2013-08-19 13:57:40 +10:00 |
|
Andrew Spinks
|
38522e2b74
|
Fix order cycle permissions for enterprise user.
|
2013-08-18 19:41:04 +10:00 |
|
Andrew Spinks
|
a8d4efd067
|
Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor.
|
2013-08-16 17:08:19 +10:00 |
|
Andrew Spinks
|
82726d032c
|
Add enterprise roles for order cycles.
|
2013-08-16 11:34:07 +10:00 |
|
alexs
|
4e715f62a2
|
Moved limit into the model.
|
2013-08-16 09:53:40 +10:00 |
|
alexs
|
a7256611cf
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-15 16:54:47 +10:00 |
|
alexs
|
cfffced652
|
Fixed the bug in the enterprise geo search.
|
2013-08-15 16:33:41 +10:00 |
|
Andrew Spinks
|
fdaa5364a1
|
Add controller action for adding products to multi cart via javascript API.
|
2013-08-15 15:36:35 +10:00 |
|
Andrew Spinks
|
d160a3256a
|
Make adding to cart via spree front end kind of work again.
|
2013-08-15 15:36:35 +10:00 |
|
alexs
|
bdc8387346
|
Added base for shop front (enterprise).
|
2013-08-14 17:31:25 +10:00 |
|
Andrew Spinks
|
59fce8a964
|
Show line items for each order in multi-cart.
|
2013-08-14 10:49:55 +10:00 |
|
Andrew Spinks
|
0a39fb87a5
|
Fix multi-cart association and add some temporary multi-cart support into the current front end.
|
2013-08-14 10:49:54 +10:00 |
|
alexs
|
77d31b3004
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-14 10:48:47 +10:00 |
|
alexs
|
6b760f3068
|
Added feedback info for search criteria.
|
2013-08-14 10:37:25 +10:00 |
|
David Cook
|
293661377e
|
Remove text to the left of TOTAL
|
2013-08-13 17:01:19 +10:00 |
|
David Cook
|
015dbc5c01
|
Only show active or complete order cycles, ordered by cycle close date
|
2013-08-13 16:47:23 +10:00 |
|
David Cook
|
6bad6e2675
|
Add order cycle selection to Order Cycles Report
|
2013-08-13 15:48:04 +10:00 |
|
alexs
|
e90ccef337
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-13 11:40:54 +10:00 |
|
alexs
|
215d6030d7
|
Added link to 'About OFN' page (as well as the base for that page).
|
2013-08-13 11:36:24 +10:00 |
|
Rohan Mitchell
|
f3447f2898
|
Remove shipping method field from product distributions
|
2013-08-13 10:14:51 +10:00 |
|
Rohan Mitchell
|
2379cc0c3c
|
Do not display double error when using js
|
2013-08-13 09:11:25 +10:00 |
|
alexs
|
03b36bb14b
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-12 17:35:36 +10:00 |
|
alexs
|
f2f507c5c7
|
Suburb auto-complete functionality for the new landing page.
|
2013-08-12 17:34:56 +10:00 |
|
David Cook
|
c5f0848a56
|
More comments
|
2013-08-12 14:44:27 +10:00 |
|