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 |
|
David Cook
|
3a75f6b86a
|
Enterprise user can access all OFN reports
|
2013-08-22 11:49:18 +10:00 |
|
Rohan Mitchell
|
aab7176f2c
|
Enterprise manager can bulk edit products
|
2013-08-22 11:21:49 +10:00 |
|
alexs
|
a623e2dee6
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-21 16:05:29 +10:00 |
|
alexs
|
8b4c0682fb
|
Replaced eaterprises logo with the distributor name header.
|
2013-08-21 16:05:06 +10:00 |
|
David Cook
|
b2878ddc40
|
Payment Method must belong to a Distributor
|
2013-08-21 15:14:01 +10:00 |
|
alexs
|
f5b326ee1a
|
Fixed the bug where search gets cleared after user clicks inside the suburb input field.
|
2013-08-21 12:04:35 +10:00 |
|
alexs
|
acfb1bd600
|
Making sure that only distributor enterprises are displayed on the landing page.
|
2013-08-21 12:03:44 +10:00 |
|
alexs
|
845f7bb8d7
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-21 10:50:08 +10:00 |
|
alexs
|
f6983078a2
|
Removed search box and distributor/supplier sidebar from the hub page.
|
2013-08-21 10:49:43 +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
|
fa459c0395
|
Summarise distribution charges: order confirm page and email
|
2013-08-20 16:26:46 +10:00 |
|
alexs
|
dd9b6b344f
|
Changed links to point to the shopfront urls (that set the distributor).
|
2013-08-20 15:31:43 +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
|
7b5eca3a50
|
Fix error when generating checkout email when distributor_info is nil
|
2013-08-20 09:19:23 +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 |
|
Rohan Mitchell
|
0458f7a6bb
|
Summarise distribution fees in checkout after cart page
|
2013-08-19 17:02:02 +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 |
|
David Cook
|
4be2fe5fe9
|
Only show payment methods that user has access to
|
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
|
24cd5209d6
|
Do not error when attempting to mix product and order cycle distribution
|
2013-08-19 10:41:14 +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
|
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 |
|
alexs
|
8ee98e3d96
|
Added bugherd to admin and sree frontend and re-arranged the bugherd code.
|
2013-08-16 15:50:45 +10:00 |
|
alexs
|
d73dc1dc48
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-16 12:13:47 +10:00 |
|
alexs
|
ec9bfa3114
|
Added BugHerd script for new landing page (staging only).
|
2013-08-16 12:13:25 +10:00 |
|
Andrew Spinks
|
82726d032c
|
Add enterprise roles for order cycles.
|
2013-08-16 11:34:07 +10:00 |
|
Rohan Mitchell
|
19e7537b64
|
Style order cycle fees
|
2013-08-16 10:36:41 +10:00 |
|
Rohan Mitchell
|
290607b5bf
|
CrUD for order cycle exchange fees
|
2013-08-16 10:22:29 +10:00 |
|
Rohan Mitchell
|
552cecb2e0
|
Find incoming and outgoing exchanges
|
2013-08-16 10:22:29 +10:00 |
|
Rohan Mitchell
|
715ec9b21a
|
Send enterprise id along with exchange enterprise fees
|
2013-08-16 10:22:29 +10:00 |
|
Rohan Mitchell
|
4d04a24342
|
Translate exchange fees for processing by rails
|
2013-08-16 10:22:29 +10:00 |
|
Rohan Mitchell
|
e6fdcf581a
|
OrderCycle can fetch the direction of an exchange (incoming/outgoing)
|
2013-08-16 10:22:29 +10:00 |
|
alexs
|
a3970dde8a
|
Forcing POST for the search form.
|
2013-08-16 10:18:46 +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 |
|