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 |
|
Rohan Mitchell
|
1a328e9567
|
Simplify syntax
|
2013-08-20 16:26:46 +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 |
|
Rohan Mitchell
|
562365311e
|
Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks
|
2013-08-19 14:38:51 +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
|
08babeed65
|
Payment Method must have one Distributor
|
2013-08-19 13:57:40 +10:00 |
|
David Cook
|
77329b5532
|
Allow user to delete their enterprises' own payment methods
|
2013-08-19 13:57:40 +10:00 |
|
Rohan Mitchell
|
ba4d3d5d7d
|
Removing a product from cart removes its fees
|
2013-08-19 12:19:03 +10:00 |
|
Rohan Mitchell
|
80d6e3b87f
|
Do not charge for distributor fees for a distributor you're not checking out with
|
2013-08-19 10:41:14 +10:00 |
|
Rohan Mitchell
|
7a75898b2b
|
Find exchanges going to/from any number of enterprises
|
2013-08-19 10:41:14 +10:00 |
|
Rohan Mitchell
|
e15e9a1476
|
Charge order cycle fees
|
2013-08-19 10:41:14 +10:00 |
|
Rohan Mitchell
|
dfd1a89975
|
Test whether exchanges are incoming
|
2013-08-19 10:41:14 +10:00 |
|
Rohan Mitchell
|
9563aad9fa
|
Find exchanges with a particular variant
|
2013-08-19 10:41:14 +10:00 |
|
Rohan Mitchell
|
1d23446c40
|
ProductDistribution validates_presence_of enterprise fee, check no longer required
|
2013-08-19 10:41:14 +10:00 |
|
Rohan Mitchell
|
591f6a8a57
|
Move ProductDistribution#clear_all_enterprise_fee_adjustments_for to EnterpriseFee class
|
2013-08-19 10:41:14 +10:00 |
|
Andrew Spinks
|
38522e2b74
|
Fix order cycle permissions for enterprise user.
|
2013-08-18 19:41:04 +10:00 |
|
Andrew Spinks
|
82726d032c
|
Add enterprise roles for order cycles.
|
2013-08-16 11:34:07 +10:00 |
|
Rohan Mitchell
|
552cecb2e0
|
Find incoming and outgoing exchanges
|
2013-08-16 10:22:29 +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 |
|
alexs
|
d3842b2d8d
|
Further compressed the landing page image to make it really light.
|
2013-08-15 11:34:48 +10:00 |
|
Andrew Spinks
|
d5791657f3
|
Support multiple orders when adding a product to a cart.
|
2013-08-14 10:49:55 +10:00 |
|
Andrew Spinks
|
dd3aaccf9f
|
When adding a variant to a cart, split into multiple orders depending on the distributors that it contains.
|
2013-08-14 10:49:55 +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 |
|
David Cook
|
015dbc5c01
|
Only show active or complete order cycles, ordered by cycle close date
|
2013-08-13 16:47:23 +10:00 |
|
alexs
|
e90ccef337
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-13 11:40:54 +10:00 |
|
David Cook
|
6c4ace8d14
|
Ensure that all PaymentMethod-derived classes also allow distributor_id
|
2013-08-13 10:57:36 +10:00 |
|
David Cook
|
98d520f0e3
|
Filter PaymentMethods by distributor
|
2013-08-13 10:55:52 +10:00 |
|
David Cook
|
1621e4c4a4
|
Add distributor to PaymentMethod
|
2013-08-13 10:55:51 +10:00 |
|
Rohan Mitchell
|
f3447f2898
|
Remove shipping method field from product distributions
|
2013-08-13 10:14:51 +10:00 |
|
Rohan Mitchell
|
5f4313b588
|
Remove itemwise shipping calculator
|
2013-08-13 10:14:39 +10:00 |
|
Rohan Mitchell
|
7677f79f17
|
Remove the now-unused Product#shipping_method_for_distributor
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
7e30b664f2
|
Add enterprise fees relation to enterprise
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
9aad44f093
|
Strip shipping method mechanics out of LineItem and Order
|
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
|
c645ad25a7
|
Add more order privileges for distributor enterprise users
|
2013-08-12 14:44:26 +10:00 |
|
Rohan Mitchell
|
af6b16ecc4
|
Admin can assign enterprise fees to product distributions
|
2013-08-12 11:05:00 +10:00 |
|
Rohan Mitchell
|
14268b7be0
|
Create adjustment metadata when creating adjustment
|
2013-08-12 10:00:35 +10:00 |
|
Rohan Mitchell
|
149d48ff5a
|
Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation
|
2013-08-12 10:00:35 +10:00 |
|