BohdanNovikov0207
diff --git a/‎Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs‎
Lines changed: 54 additions & 10 deletions b/‎Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs‎
Lines changed: 54 additions & 10 deletions
diff --git a/‎Content.Client/Cargo/UI/CargoConsoleMenu.xaml‎
Lines changed: 35 additions & 6 deletions b/‎Content.Client/Cargo/UI/CargoConsoleMenu.xaml‎
Lines changed: 35 additions & 6 deletions
@@ -24,23 +24,24 @@
 //
 // SPDX-License-Identifier: MIT
 
-using Content.Shared.Cargo;
 using Content.Client.Cargo.UI;
+using Content.Shared.Cargo;
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Components;
 using Content.Shared.Cargo.Events;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.IdentityManagement;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
-using Robust.Shared.Utility;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
 namespace Content.Client.Cargo.BUI
 {
     public sealed class CargoOrderConsoleBoundUserInterface : BoundUserInterface
     {
+        [Dependency] private readonly IPrototypeManager _protoManager = default!; // CorvaxGoob-CargoFeatures
         private readonly SharedCargoSystem _cargoSystem;
 
         [ViewVariables]
@@ -80,17 +81,19 @@ protected override void Open()
             base.Open();
 
             var spriteSystem = EntMan.System<SpriteSystem>();
+
             var dependencies = IoCManager.Instance!;
             _menu = new CargoConsoleMenu(Owner, EntMan, dependencies.Resolve<IPrototypeManager>(), spriteSystem);
             var localPlayer = dependencies.Resolve<IPlayerManager>().LocalEntity;
             var description = new FormattedMessage();
 
-            string orderRequester;
+            // CorvaxGoob-CargoFeatures : Алгоритм генерации имени перенесено вниз
+            /*string orderRequester;
 
             if (EntMan.EntityExists(localPlayer))
                 orderRequester = Identity.Name(localPlayer.Value, EntMan);
             else
-                orderRequester = string.Empty;
+                orderRequester = string.Empty;*/
 
             _orderMenu = new CargoConsoleOrderMenu();
 
@@ -101,6 +104,8 @@ protected override void Open()
                 if (args.Button.Parent?.Parent is not CargoProductRow row) // Goobstation
                     return;
 
+                _orderMenu.ToggleDepartmentSecureCrate.Pressed = false; // CorvaxGoob-CargoFeatures : дефолт знач при каждом открытии
+
                 description.Clear();
                 description.PushColor(Color.White); // Rich text default color is grey
                 if (row.MainButton.ToolTip != null)
@@ -110,14 +115,32 @@ protected override void Open()
                 _product = row.Product;
                 _orderMenu.ProductName.Text = row.ProductName.Text;
                 _orderMenu.PointCost.Text = row.PointCost.Text;
-                _orderMenu.Requester.Text = orderRequester;
-                _orderMenu.Reason.Text = "";
                 _orderMenu.Amount.Value = 1;
 
+                // CorvaxGoob-CargoFeatures-Start
+                if (EntMan.TryGetComponent<CargoOrderConsoleComponent>(Owner, out var orderConsole))
+                {
+                    _orderMenu.Requester.Editable = orderConsole.EditableRequesterName;
+
+                    if (_protoManager.TryIndex<CargoAccountPrototype>(orderConsole.Account, out var accountPrototype))
+                        _orderMenu.DeliveryDestination.PlaceHolder = Loc.GetString(accountPrototype.DepartmentDestinationName ?? "cargo-console-paper-delivery-destination-default");
+
+                    _orderMenu.Requester.Text = localPlayer.HasValue ? _cargoSystem.GenerateRequesterName((Owner, orderConsole), localPlayer.Value) : string.Empty;
+
+                    _orderMenu.ToggleDepartmentSecureCrate.Text = Loc.GetString("cargo-console-secure-order-checkbox", ("cost", orderConsole.SecureOrderCost));
+
+                    if (_product is not null && _protoManager.TryIndex<EntityPrototype>(_product.Product, out var cargoProductEntPrototype))
+                        _orderMenu.ToggleDepartmentSecureCrate.Disabled = !_cargoSystem.CanBeSecuredDelivery((Owner, orderConsole), cargoProductEntPrototype);
+                }
+                // CorvaxGoob-CargoFeatures-End
+
                 _orderMenu.OpenCentered();
             };
             _menu.OnOrderApproved += ApproveOrder;
             _menu.OnOrderCanceled += RemoveOrder;
+
+            _orderMenu.ToggleDepartmentSecureCrate.OnToggled += ToggleDepartmentSecureCrate_OnToggled; // CorvaxGoob-CargoFeatures
+
             _orderMenu.SubmitButton.OnPressed += (_) =>
             {
                 if (AddOrder())
@@ -139,6 +162,20 @@ protected override void Open()
             _menu.OpenCentered();
         }
 
+        // CorvaxGoob-CargoFeatures-Start
+        private void ToggleDepartmentSecureCrate_OnToggled(ButtonToggledEventArgs obj)
+        {
+            if (_product is null
+                || _orderMenu is null
+                || !EntMan.TryGetComponent<CargoOrderConsoleComponent>(Owner, out var orderConsole))
+                return;
+
+            int cost = obj.Pressed ? _product.Cost + orderConsole.SecureOrderCost : _product.Cost; // Цена либо с защищённым либо нет
+
+            _orderMenu.PointCost.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", cost));
+        }
+        // CorvaxGoob-CargoFeatures-End
+
         private void Populate(List<CargoOrderData> orders)
         {
             if (_menu == null)
@@ -148,6 +185,7 @@ private void Populate(List<CargoOrderData> orders)
             _menu.PopulateCategories();
             _menu.PopulateOrders(orders);
             _menu.PopulateAccountActions();
+            _menu.PopulateAccounts(); // CorvaxGoob-CargoFeatures
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -186,17 +224,23 @@ protected override void Dispose(bool disposing)
 
         private bool AddOrder()
         {
+            // CorvaxGoob-CargoFeatures
+            if (!EntMan.TryGetComponent<CargoOrderConsoleComponent>(Owner, out var orderConsole))
+                return false;
+
             var orderAmt = _orderMenu?.Amount.Value ?? 0;
             if (orderAmt < 1 || orderAmt > OrderCapacity)
             {
                 return false;
             }
 
             SendMessage(new CargoConsoleAddOrderMessage(
-                _orderMenu?.Requester.Text ?? "",
-                _orderMenu?.Reason.Text ?? "",
+                orderConsole.EditableRequesterName ? _orderMenu?.Requester.Text : null, // CorvaxGoob-CargoFeatures
+                _orderMenu?.DeliveryDestination.Text == "" ? _orderMenu?.DeliveryDestination.PlaceHolder : _orderMenu?.DeliveryDestination.Text, // CorvaxGoob-CargoFeatures
+                _orderMenu?.Note.Text == "" ? null : _orderMenu?.Note.Text, // CorvaxGoob-CargoFeatures
                 _product?.ID ?? "",
-                orderAmt));
+                orderAmt,
+                _orderMenu?.ToggleDepartmentSecureCrate.Pressed ?? false)); // CorvaxGoob-CargoFeatures
 
             return true;
         }
@@ -220,4 +264,4 @@ private void ApproveOrder(ButtonEventArgs args)
             SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderId));
         }
     }
-}
+}
@@ -14,8 +14,10 @@ SPDX-License-Identifier: MIT
     xmlns="https://spacestation14.io"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    MinSize="540 390"
-    SetSize="995 600">
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    MinSize="700 390" 
+    SetSize="1300 600">
+    <!-- CorvaxGoob Resize window -->
 
     <!-- Main Container -->
     <BoxContainer Orientation="Vertical"
@@ -198,11 +200,38 @@ SPDX-License-Identifier: MIT
                   <OptionButton Name="ActionOptions"/>
               </BoxContainer>
               <Control MinHeight="5"/>
-              <BoxContainer Orientation="Horizontal">
-                  <RichTextLabel Name="AmountText" Text="{ Loc 'cargo-console-menu-account-action-amount'}"/>
-                  <SpinBox Name="TransferSpinBox" MinWidth="100" Value="10"/>
+              <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                  <BoxContainer Orientation="Horizontal">
+                      <RichTextLabel Name="AmountText" Text="{ Loc 'cargo-console-menu-account-action-amount'}"/>
+                      <SpinBox Name="TransferSpinBox" MinWidth="100" Value="10"/>
+                  </BoxContainer>
+                </BoxContainer>
+              <!-- CorvaxGoob-CargoFeatures-Start -->
+              <BoxContainer Orientation="Vertical"
+                                HorizontalExpand="True"
+                                Margin="0 5 0 10">
+                  <controls:TableContainer Columns="2" HorizontalExpand="True" VerticalExpand="True">
+                      <RichTextLabel Name="PrimaryCutLabel" Text="{Loc 'cargo-funding-alloc-console-label-primary-cut'}"/>
+                      <LineEdit Name="PrimaryCut" Editable="False" MinWidth="30"/>
+                      <RichTextLabel Name="LockboxCutLabel" Text="{Loc 'cargo-funding-alloc-console-label-lockbox-cut'}"/>
+                      <LineEdit Name="LockboxCut" Editable="False" MinWidth="30"/>
+                  </controls:TableContainer>
+                  <Label Name="HelpLabel" HorizontalAlignment="Center" StyleClasses="LabelSubText" Margin="0 10"/>
+                  <PanelContainer VerticalExpand="True" HorizontalExpand="True" VerticalAlignment="Top" MaxHeight="250">
+                      <PanelContainer.PanelOverride>
+                          <graphics:StyleBoxFlat BackgroundColor="#1B1B1E"/>
+                      </PanelContainer.PanelOverride>
+                      <controls:TableContainer Name="EntriesContainer" Columns="4" HorizontalExpand="True" VerticalExpand="True" Margin="5 0">
+                          <RichTextLabel Text="{Loc 'cargo-funding-alloc-console-label-account'}" HorizontalAlignment="Center"/>
+                          <RichTextLabel Text="{Loc 'cargo-funding-alloc-console-label-code'}" HorizontalAlignment="Center"/>
+                          <RichTextLabel Text="{Loc 'cargo-funding-alloc-console-label-balance'}" HorizontalAlignment="Center"/>
+                          <RichTextLabel Text="{Loc 'cargo-funding-alloc-console-label-cut'}" HorizontalAlignment="Center"/>
+                      </controls:TableContainer>
+                  </PanelContainer>
               </BoxContainer>
-                <BoxContainer Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="True" VerticalAlignment="Bottom" Margin="8">
+              <!-- CorvaxGoob-CargoFeatures-End -->
+
+              <BoxContainer Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="True" VerticalAlignment="Bottom" Margin="8">
                     <!-- Left button -->
                     <Button Name="AccountLimitToggleButton"
                             Text="{Loc 'cargo-console-menu-toggle-account-lock-button'}"