Rohan Mitchell
|
bf61d12bfa
|
Merge branch 'simple-order-cycles'
Conflicts:
app/views/admin/order_cycles/_row.html.haml
|
2014-10-23 12:11:34 +11:00 |
|
Rohan Mitchell
|
ab76c66b68
|
Admin can update order cycles with simple interface
|
2014-10-23 11:38:15 +11:00 |
|
Rohan Mitchell
|
f7c1340f99
|
Admin can view an order cycle in the simple edit form
|
2014-10-23 11:08:27 +11:00 |
|
Rohan Mitchell
|
3e61aa7267
|
Simple interface remove coordinator fee
|
2014-10-22 17:26:22 +11:00 |
|
Rohan Mitchell
|
8fb95769bf
|
Fix tested values in spec
|
2014-10-22 17:07:45 +11:00 |
|
Rafael Schouten
|
b71a40ae6d
|
show all permitted enterprises in order cycle summery
|
2014-10-18 03:26:57 +11:00 |
|
Rohan Mitchell
|
deedafde9a
|
WIP: Simple order cycle form loads and displays correct info
|
2014-10-17 16:55:55 +11:00 |
|
Rohan Mitchell
|
694dd0c329
|
Enterprise user selling own produce only sees simple order cycle listing
|
2014-10-17 10:52:36 +11:00 |
|
Rohan Mitchell
|
57af658e7c
|
For OC, fetch all enterprises we have access to, including those via E2E relationships
|
2014-09-05 15:10:13 +10:00 |
|
Rohan Mitchell
|
913c167fdf
|
Revert 5ede8d1, reinstating a4be0ff..7b89e6a
|
2014-09-05 15:10:12 +10:00 |
|
Rob H
|
5ede8d169f
|
Revert a4be0ff..7b89e6a for deployment
|
2014-08-28 14:32:57 +10:00 |
|
Rohan Mitchell
|
a5debc19dc
|
Permit edits to exchanges involving enterprises permitted via E2E relationships
|
2014-08-28 10:09:50 +10:00 |
|
Rohan Mitchell
|
628d87b69a
|
Add to OC permission allows adding distributors to order cycle
|
2014-08-28 10:09:50 +10:00 |
|
Rohan Mitchell
|
5ef13d3c5a
|
Change 'add products to OC' permission into the more general 'add enterprise to OC'
|
2014-08-28 10:09:50 +10:00 |
|
Rohan Mitchell
|
099a5b0b7b
|
Show E2E related enterprise exchanges in OC
|
2014-08-28 10:09:50 +10:00 |
|
Rohan Mitchell
|
34602244ca
|
Show permitted suppliers in order cycle add supplier select box
|
2014-08-28 10:09:50 +10:00 |
|
Rohan Mitchell
|
a7689973be
|
Semantically name enterprises in spec
|
2014-08-28 10:09:50 +10:00 |
|
Rohan Mitchell
|
5e8bdce67d
|
Refactor spec
|
2014-08-28 10:09:50 +10:00 |
|
Rohan Mitchell
|
9b15c213d1
|
When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges
|
2014-05-23 11:28:00 +10:00 |
|
Rohan Mitchell
|
a2205d3f93
|
Make order cycles spec consistent
|
2014-05-14 15:50:25 +10:00 |
|
Rob H
|
169d5669f1
|
Amend specs
|
2014-05-07 13:34:47 +10:00 |
|
Rohan Mitchell
|
930bc2b7ce
|
Set increased Capybara.default_wait_time globally
|
2014-05-02 14:25:32 +10:00 |
|
Rohan Mitchell
|
126ddd0a75
|
Add explicit wait before inconsistently failing lookup
|
2014-04-25 18:59:33 +10:00 |
|
Rohan Mitchell
|
c8f50216ab
|
Increase default_wait_time on order_cycles_spec in an attempt to prevent inconsistent failures in CI
|
2014-04-25 18:06:09 +10:00 |
|
Rohan Mitchell
|
85db8859bb
|
On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage
|
2014-04-24 15:51:39 +10:00 |
|
Rohan Mitchell
|
d0585b4d05
|
Admin order cycle listing does not show order cycles that enterprise users don't have access to
|
2014-04-24 14:43:33 +10:00 |
|
Rohan Mitchell
|
6452ebf67d
|
Make spec more robust
|
2014-04-11 19:08:55 +10:00 |
|
Rohan Mitchell
|
e792107d7b
|
Make order cycle specs more robust
|
2014-04-09 15:02:40 +10:00 |
|
Rohan Mitchell
|
3104d285ca
|
Order cycle admin JS uses exchanges.incoming instead of role
|
2014-03-27 09:30:53 +11:00 |
|
Rohan Mitchell
|
af88d0f91b
|
Fix regression: Invisible checkbox causing ambiguity for capybara
|
2014-03-20 11:07:13 +11:00 |
|
Rohan Mitchell
|
811b0cb36a
|
Admin can remove a master variant from an order cycle when further variants have been added
|
2014-03-20 10:27:55 +11:00 |
|
Rohan Mitchell
|
acbf1ed680
|
Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI
|
2014-02-19 13:12:52 +11:00 |
|
Rohan Mitchell
|
420ff37562
|
Provide explicit ordering for intermittently failing spec
|
2014-01-09 12:09:50 +11:00 |
|
Rohan Mitchell
|
124b6df75d
|
Show undated order cycles on index page
|
2013-12-13 14:51:43 +11:00 |
|
Rohan Mitchell
|
4898460132
|
Fix failing spec with table reorder, lambda-fy scopes that use time
|
2013-11-22 14:00:04 +11:00 |
|
Rohan Mitchell
|
94c33e5f45
|
Colour order cycle rows based on their status
|
2013-11-22 11:31:04 +11:00 |
|
Rohan Mitchell
|
f75879bec1
|
Put order cycle variants in a tooltip
|
2013-11-22 10:03:49 +11:00 |
|
Rohan Mitchell
|
57aa10a6f6
|
Fix specs for time zone change
|
2013-09-30 11:40:05 +10:00 |
|
Rohan Mitchell
|
208ffb3317
|
Fix commented-out order cycle specs
|
2013-09-27 16:02:06 +10:00 |
|
alexs333
|
80bb55496b
|
Temporarily disabling some tests.
|
2013-09-05 14:18:40 +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 |
|
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
|
6c24c0ef68
|
Make specs more resilient and less context-sensitive
|
2013-08-19 11:10:00 +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
|
c64944d11a
|
Fix test
|
2013-07-30 17:32:53 +10:00 |
|
Rohan Mitchell
|
d64bcf0e94
|
Remove coordinator fees
|
2013-07-30 11:55:21 +10:00 |
|
Rohan Mitchell
|
24b957dc57
|
Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees.
|
2013-07-30 11:34:10 +10:00 |
|
Rohan Mitchell
|
43474d6408
|
Display coordinator fees on admin edit order cycle
|
2013-07-30 11:34:10 +10:00 |
|