Rohan Mitchell
|
cace60b187
|
Shipping methods are only shown at checkout if their distributor matches the order
|
2013-08-30 12:27:13 +10:00 |
|
Rohan Mitchell
|
911d8b8bbc
|
Shipping method has a distributor, admin can create and edit
|
2013-08-30 11:43:45 +10:00 |
|
Rohan Mitchell
|
314e464c3f
|
Add failing spec for admin creatin a shipping method owned by a distributor
|
2013-08-27 10:53:59 +10:00 |
|
Rohan Mitchell
|
9824e1b9c5
|
Make spec more precise and robust - query was finding outgoing instead of incoming exchange
|
2013-08-27 10:41:02 +10:00 |
|
Rohan Mitchell
|
72136a59ae
|
Remove permission dupliation, fixes accessible_by errors when accessing admin backend
|
2013-08-27 10:19:54 +10:00 |
|
Rohan Mitchell
|
6a5d819fa6
|
Enterprise manager can create an order
|
2013-08-27 10:05:55 +10:00 |
|
alexs333
|
019d8ed2dc
|
Reverted poltergeist/capybara upgrade.
|
2013-08-23 17:02:33 +10:00 |
|
alexs333
|
ef96099f2d
|
Merge branch 'master' of https://github.com/eaterprises/openfoodweb
Conflicts:
Gemfile.lock
|
2013-08-23 16:11:02 +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 |
|
alexs333
|
9be7b5eecc
|
Updated poltergeist.
|
2013-08-23 15:40:04 +10:00 |
|
Rohan Mitchell
|
4f8014306e
|
Admin can't change distributor or order cycle once order has been finalized
|
2013-08-23 14:00:31 +10:00 |
|
Rohan Mitchell
|
158cd6994b
|
Update spree, syntax fix
|
2013-08-23 14:00:31 +10:00 |
|
Rohan Mitchell
|
2a662e6b6f
|
Switch from rvmrc to ruby-version/gemset
|
2013-08-23 14:00:31 +10:00 |
|
Rohan Mitchell
|
2cab83cb29
|
Admin create order can set distributor and order cycle
|
2013-08-23 14:00:31 +10:00 |
|
Rohan Mitchell
|
2e1de9a6d3
|
Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error
|
2013-08-23 14:00:31 +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
|
5b824c1e22
|
Prevent exception when order has no payments
|
2013-08-22 13:07:17 +10:00 |
|
David Cook
|
f1c2582e65
|
WIP: Test for enterprise user access in reports
|
2013-08-22 12:49:39 +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 |
|
David Cook
|
346113966e
|
Prevent exception when order has no payments
|
2013-08-22 11:31:31 +10:00 |
|
Rohan Mitchell
|
aab7176f2c
|
Enterprise manager can bulk edit products
|
2013-08-22 11:21:49 +10:00 |
|
Rohan Mitchell
|
d465560dba
|
Update selenium-webdriver (for test debugging with selenium)
|
2013-08-22 10:49:42 +10:00 |
|
David Cook
|
b41f6234db
|
Test to filter report by order cycle
|
2013-08-21 17:23:55 +10:00 |
|
alexs
|
01ad4a04a4
|
Bumped up the sleep time in the spec.
|
2013-08-21 16:26:08 +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
|
798565bb42
|
Overriding accidental commit.
|
2013-08-21 10:59:25 +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
|
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
|
dd9b6b344f
|
Changed links to point to the shopfront urls (that set the distributor).
|
2013-08-20 15:31:43 +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 |
|