@@ -377,12 +377,14 @@ export default class ParentOrderBlotter extends React.Component<ParentOrderBlott
377
377
378
378
}
379
379
380
- modifyOrder = ( order : Order ) => {
380
+ modifyOrder = ( order : Order | undefined ) => {
381
381
382
- let listing = this . listingService . GetListingImmediate ( order . getListingid ( ) )
382
+ if ( order ) {
383
+ let listing = this . listingService . GetListingImmediate ( order . getListingid ( ) )
383
384
384
- if ( listing ) {
385
- this . ticketController . openModifyOrderTicket ( order , listing )
385
+ if ( listing ) {
386
+ this . ticketController . openModifyOrderTicket ( order , listing )
387
+ }
386
388
}
387
389
}
388
390
@@ -449,22 +451,26 @@ export default class ParentOrderBlotter extends React.Component<ParentOrderBlott
449
451
450
452
getModifiableOrder ( views : Array < OrderView > ) : Order | undefined {
451
453
452
- if ( views . length === 1 ) {
453
- let view = views [ 0 ]
454
- if ( view . getOrder ( ) . getDestination ( ) === view ?. getListing ( ) ?. getMarket ( ) ?. getMic ( ) &&
455
- view . getOrder ( ) . getDestination ( ) !== Destinations . SMARTROUTER ) {
454
+ if ( views . length === 1 ) {
455
+ let view = views [ 0 ]
456
+ if ( view . getOrder ( ) . getDestination ( ) === view ?. getListing ( ) ?. getMarket ( ) ?. getMic ( ) &&
457
+ view . getOrder ( ) . getDestination ( ) !== Destinations . SMARTROUTER ) {
458
+
459
+ if ( view . getOrder ( ) . getStatus ( ) === OrderStatus . LIVE ) {
456
460
return view . getOrder ( )
457
461
}
462
+
463
+ }
458
464
}
459
465
460
- return undefined
466
+ return undefined
461
467
}
462
468
463
469
464
470
465
471
public render ( ) {
466
472
467
- let selectedOrders = this . state . selectedOrderViews . map ( v => v . getOrder ( ) )
473
+ let selectedOrders = this . state . selectedOrderViews . map ( v => v . getOrder ( ) )
468
474
let cancelleableOrders = this . getCancellableOrders ( this . state . selectedOrderViews )
469
475
let modifiableOrder = this . getModifiableOrder ( this . state . selectedOrderViews )
470
476
@@ -474,7 +480,7 @@ export default class ParentOrderBlotter extends React.Component<ParentOrderBlott
474
480
< div className = "bp3-dark" style = { { display : 'flex' , flexDirection : 'row' , paddingTop : 0 , alignItems : "left" } } >
475
481
< div style = { { flexGrow : 1 } } >
476
482
< Button minimal = { true } icon = "delete" text = "Cancel Orders" onClick = { ( ) => this . cancelOrder ( cancelleableOrders ) } disabled = { cancelleableOrders . length === 0 } />
477
- < Button minimal = { true } icon = "edit" text = "Modify Order" onClick = { ( ) => this . modifyOrder ( cancelleableOrders [ 0 ] ) } disabled = { ! modifiableOrder } />
483
+ < Button minimal = { true } icon = "edit" text = "Modify Order" onClick = { ( ) => this . modifyOrder ( modifiableOrder ) } disabled = { ! modifiableOrder } />
478
484
< Button minimal = { true } icon = "fork" text = "Child Orders" onClick = { ( ) => this . showChildOrders ( selectedOrders . values ( ) ) } disabled = { selectedOrders . length !== 1 } />
479
485
< Button minimal = { true } icon = "bring-data" text = "Order History" onClick = { ( ) => this . showOrderHistory ( selectedOrders . values ( ) ) } disabled = { selectedOrders . length !== 1 } />
480
486
< Button minimal = { true } icon = "tick" text = "Executions" onClick = { ( ) => this . showExecutions ( selectedOrders . values ( ) ) } disabled = { selectedOrders . length !== 1 } />
0 commit comments