From: pathetic meowmeow Date: Tue, 6 May 2025 19:04:18 +0000 (-0400) Subject: Make departmental orders consoles print slips (#36944) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=cfba56c2b43347b3c31be73c1f5c7e8ffcd7469b;p=space-station-14.git Make departmental orders consoles print slips (#36944) * Make departmental orders consoles print slips * feed back cycle --- diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml index 72d8cf7daf..940352dc48 100644 --- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml +++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml @@ -38,9 +38,10 @@ - + + SizeFlagsStretchRatio="1" + Name="Orders"> diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs index b837d59855..4c729b795b 100644 --- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs @@ -208,6 +208,7 @@ namespace Content.Client.Cargo.UI var product = _protoManager.Index(order.ProductId); var productName = product.Name; + var account = _protoManager.Index(order.Account); var row = new CargoOrderRow { @@ -219,7 +220,9 @@ namespace Content.Client.Cargo.UI "cargo-console-menu-populate-orders-cargo-order-row-product-name-text", ("productName", productName), ("orderAmount", order.OrderQuantity), - ("orderRequester", order.Requester)) + ("orderRequester", order.Requester), + ("accountColor", account.Color), + ("account", Loc.GetString(account.Code))) }, Description = { @@ -282,6 +285,9 @@ namespace Content.Client.Cargo.UI AccountActionButton.Disabled = TransferSpinBox.Value <= 0 || TransferSpinBox.Value > bankAccount.Accounts[orderConsole.Account] * orderConsole.TransferLimit || _timing.CurTime < orderConsole.NextAccountActionTime; + + OrdersSpacer.Visible = !orderConsole.SlipPrinter; + Orders.Visible = !orderConsole.SlipPrinter; } } } diff --git a/Content.Client/Cargo/UI/CargoOrderRow.xaml b/Content.Client/Cargo/UI/CargoOrderRow.xaml index 22bd2291ae..e4ec95d981 100644 --- a/Content.Client/Cargo/UI/CargoOrderRow.xaml +++ b/Content.Client/Cargo/UI/CargoOrderRow.xaml @@ -11,11 +11,10 @@ -