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
|
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
|
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
|
673c0dca36
|
Fix varying shipping amounts
|
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
|
fdf80cac5e
|
Adjusted specs to accommodate for new (temporary) landing page.
|
2013-08-20 16:14:29 +10:00 |
|
alexs
|
7061d0c53e
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-20 11:06:06 +10:00 |
|
alexs
|
18d60a1643
|
Fixed specs broken by new temp landing page (take 1).
|
2013-08-20 11:05:06 +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
|
8dd602f9de
|
Remove pry from spec
|
2013-08-20 09:19:38 +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
|
5f01bd6901
|
Generalise checkout email signoff message
|
2013-08-19 17:35:09 +10:00 |
|
Rohan Mitchell
|
64c9d4254a
|
Fix spec failures - enterprise fee calculator type change, distributor info rich text tests, summarised distribution fee at checkout
|
2013-08-19 17:28:00 +10:00 |
|
Rohan Mitchell
|
0458f7a6bb
|
Summarise distribution fees in checkout after cart page
|
2013-08-19 17:02:02 +10:00 |
|
David Cook
|
5f7cbe3882
|
Ensure distributor is set on payment method factories
|
2013-08-19 16:19:18 +10:00 |
|
David Cook
|
5a3ad8e68b
|
Remove test for payment method with no distributor
|
2013-08-19 16:19:18 +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 |
|
Rohan Mitchell
|
a9b70e67df
|
Change to using flat rate per item calculators - per-order is confusing when used against line items
|
2013-08-19 14:38:51 +10:00 |
|
Rohan Mitchell
|
c1f9d9789d
|
Extract table test to private method
|
2013-08-19 12:29:26 +10:00 |
|
Rohan Mitchell
|
ba4d3d5d7d
|
Removing a product from cart removes its fees
|
2013-08-19 12:19:03 +10:00 |
|
Rohan Mitchell
|
6c24c0ef68
|
Make specs more resilient and less context-sensitive
|
2013-08-19 11:10:00 +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 |
|
Rohan Mitchell
|
e318a1591d
|
Add FeatureToggleHelper for tests, enabling feature toggle changes for tests
|
2013-08-19 10:41:14 +10:00 |
|
Rohan Mitchell
|
5ffd56aad7
|
Re-write spec with new fee display at checkout
|
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 |
|
Andrew Spinks
|
82726d032c
|
Add enterprise roles for order cycles.
|
2013-08-16 11:34:07 +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
|
4d04a24342
|
Translate exchange fees for processing by rails
|
2013-08-16 10:22:29 +10:00 |
|
Rohan Mitchell
|
7fc0787e36
|
OrderCycleFormApplicator sets exchange fees
|
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
|
b8bc30d4ab
|
Fixed the test setup and added the text for the bug found in 'Enterprise.find_near'.
|
2013-08-15 17:34:51 +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
|
88484f2d8b
|
Added tests for suburbs JSON.
|
2013-08-15 11:40:09 +10:00 |
|
alexs
|
c72a4a961f
|
Added the mechanism to test JSON APIs (Rabl stuff etc.)
|
2013-08-15 11:38:52 +10:00 |
|
alexs
|
773c2b4217
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-14 11:31:25 +10:00 |
|
Rohan Mitchell
|
eaf71e28bb
|
Raise an error when tests hit the network
|
2013-08-14 11:19:16 +10:00 |
|