David Cook
|
4f9c7fb601
|
Remove distributor_id from payment method and update tests
|
2013-09-13 16:58:19 +10:00 |
|
David Cook
|
ee9d9a36d5
|
Make distributor payment method multi-select
|
2013-09-13 12:03:37 +10:00 |
|
David Cook
|
107c6978c2
|
Create many-to-many relationship between payment method and distributor
|
2013-09-13 10:25:25 +10:00 |
|
David Cook
|
7e96ba909e
|
Show a list of Order Cycles report types in the description column
|
2013-09-13 09:59:35 +10:00 |
|
Rohan Mitchell
|
29e1f38207
|
Set up production distributors for current order cycle
|
2013-09-12 18:21:44 +10:00 |
|
David Cook
|
af71838610
|
Fix deface comment
|
2013-09-12 15:33:17 +10:00 |
|
David Cook
|
a99f23eb01
|
Add distributor name to admin orders table
|
2013-09-12 15:16:51 +10:00 |
|
David Cook
|
b7541dcd52
|
Rename 'Home' link to 'OFN'
|
2013-09-11 15:13:45 +10:00 |
|
Rohan Mitchell
|
8f768d3b84
|
Update staging distributors
|
2013-09-10 15:17:18 +10:00 |
|
Rohan Mitchell
|
b8376a040f
|
Remove superfluous manual change triggers
|
2013-09-10 12:57:49 +10:00 |
|
Rohan Mitchell
|
a136161dd6
|
When showing enterprise, do not show enterprise name when we're in this enterprise - fix duplicate name in header
|
2013-09-10 12:57:35 +10:00 |
|
Rohan Mitchell
|
583164efb5
|
Fix variant price calculation
|
2013-09-10 11:52:13 +10:00 |
|
Rohan Mitchell
|
315876ca9d
|
Don't display bullets next to variant options
|
2013-09-10 11:52:04 +10:00 |
|
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 |
|
Rohan Mitchell
|
91550ac82f
|
Move distributor config to its own file, re-enable pry for tests
|
2013-09-10 09:50:16 +10:00 |
|
Rohan Mitchell
|
64a3a309f5
|
Change 'pick-up date' to 'available on', provide absolute dates in options
|
2013-09-10 09:16:23 +10:00 |
|
Rohan Mitchell
|
15d3bff92d
|
Add delete_content_for helper, can be used for removing the sidebar from spree views
|
2013-09-10 08:45:59 +10:00 |
|
Rohan Mitchell
|
3ac4bd3b5f
|
Hide adjustments in cart by default, show by click
|
2013-09-09 14:37:36 +10:00 |
|
Rohan Mitchell
|
644beeb093
|
Revert "Fix test fail"
This reverts commit 1de0f85c73.
|
2013-09-09 10:55:40 +10:00 |
|
Rohan Mitchell
|
1de0f85c73
|
Fix test fail
|
2013-09-09 10:41:28 +10:00 |
|
Rohan Mitchell
|
d32a8b56d0
|
When order cycle is selected, only show variants that are in it
|
2013-09-09 10:40:15 +10:00 |
|
Rohan Mitchell
|
57906e6f8b
|
Fix seed failure due to ShippingMethod factory creating an enterprise, preventing enterprises from being seeded
|
2013-09-06 16:01:00 +10:00 |
|
Rohan Mitchell
|
33d1948bda
|
Display log in / sign up links on landing page
|
2013-09-06 13:44:35 +10:00 |
|
alexs333
|
80bb55496b
|
Temporarily disabling some tests.
|
2013-09-05 14:18:40 +10:00 |
|
alexs333
|
4f64679de7
|
Simplified shop flow.
|
2013-09-04 20:33:18 +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
|
b0abe566eb
|
Comments
|
2013-08-30 16:28:02 +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 |
|
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 |
|