diff --git a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs index 3bd220bfadd..9cd614de14c 100644 --- a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs @@ -70,9 +70,9 @@ namespace Content.Client.Cargo.BUI _menu.OnClose += Close; - _menu.OnItemSelected += (args) => + _menu.OnItemSelected += (row) => { - if (args.Button.Parent is not CargoProductRow row) + if (row == null) return; description.Clear(); @@ -175,23 +175,23 @@ namespace Content.Client.Cargo.BUI return true; } - private void RemoveOrder(ButtonEventArgs args) + private void RemoveOrder(CargoOrderData? order) { - if (args.Button.Parent?.Parent is not CargoOrderRow row || row.Order == null) + if (order == null) return; - SendMessage(new CargoConsoleRemoveOrderMessage(row.Order.OrderId)); + SendMessage(new CargoConsoleRemoveOrderMessage(order.OrderId)); } - private void ApproveOrder(ButtonEventArgs args) + private void ApproveOrder(CargoOrderData? order) { - if (args.Button.Parent?.Parent is not CargoOrderRow row || row.Order == null) + if (order == null) return; if (OrderCount >= OrderCapacity) return; - SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderId)); + SendMessage(new CargoConsoleApproveOrderMessage(order.OrderId)); } } } diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml index 940352dc485..3ecfad94aae 100644 --- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml +++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml @@ -1,86 +1,226 @@ - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -