Skip to content

EconomUPD #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZoNeSRuS merged 4 commits into from
Nov 20, 2025
Merged

EconomUPD #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10745cf
FixVendSys
ZoNeSRuS Nov 18, 2025
7e5f339
FixCons
ZoNeSRuS Nov 19, 2025
c9ed6ef
upLogic
ZoNeSRuS Nov 19, 2025
085953d
Timer
ZoNeSRuS Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions ...lient/AWS/Economy/Bank/UI/ManagementConsole/EconomyManagementConsoleBoundUserInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,42 +41,38 @@ protected override void UpdateState(BoundUserInterfaceState state)
_menu?.UpdateState(consoleState);
}

public void BlockAccountToggle(EconomyBankAccountComponent? account)
public void BlockAccountToggle(string accountId, bool blocked)
{
if (account is null)
return;

var blocked = !account.Blocked;
var msg = new EconomyManagementConsoleChangeParameterMessage(account.AccountID, EconomyBankAccountParam.Blocked, blocked);
var msg = new EconomyManagementConsoleChangeParameterMessage(accountId, EconomyBankAccountParam.Blocked, blocked);

SendMessage(msg);
}

public void ChangeName(EconomyBankAccountComponent? account, string newName)
public void ChangeName(string accountId, string newName)
{
// reeeee hardcoding
if (account is null || newName.Length > 40)
if (string.IsNullOrEmpty(accountId) || newName.Length > 40)
return;

var msg = new EconomyManagementConsoleChangeParameterMessage(account.AccountID, EconomyBankAccountParam.AccountName, newName);
var msg = new EconomyManagementConsoleChangeParameterMessage(accountId, EconomyBankAccountParam.AccountName, newName);
SendMessage(msg);
}

public void ChangeJob(EconomyBankAccountComponent? account, string jobName)
public void ChangeJob(string accountId, string jobName)
{
if (account is null)
if (string.IsNullOrEmpty(accountId))
return;

var msg = new EconomyManagementConsoleChangeParameterMessage(account.AccountID, EconomyBankAccountParam.JobName, jobName);
var msg = new EconomyManagementConsoleChangeParameterMessage(accountId, EconomyBankAccountParam.JobName, jobName);
SendMessage(msg);
}

public void ChangeSalary(EconomyBankAccountComponent? account, ulong salary)
public void ChangeSalary(string accountId, ulong salary)
{
if (account is null)
if (string.IsNullOrEmpty(accountId))
return;

var msg = new EconomyManagementConsoleChangeParameterMessage(account.AccountID, EconomyBankAccountParam.Salary, salary);
var msg = new EconomyManagementConsoleChangeParameterMessage(accountId, EconomyBankAccountParam.Salary, salary);
SendMessage(msg);
}

Expand Down
16 changes: 14 additions & 2 deletions Content.Client/AWS/Economy/Bank/UI/ManagementConsole/EconomyManagementConsoleMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,28 @@ public void UpdateState(EconomyManagementConsoleUserInterfaceState state)

private void UpdateAccountManagement(EconomyManagementConsoleUserInterfaceState state)
{
AccountManagementTab.ApplyConfiguration(state.DefaultJob,
state.SalaryButtonSteps,
state.AccountMask,
state.AccountTags,
state.AllowCentralCommandAccount,
state.AllowRestrictedAccounts);
AccountManagementTab.Priveleged = state.Priveleged;
AccountManagementTab.UpdateAccountList();
AccountManagementTab.OnUpdateState(state.AccountID, state.AccountName, state.Balance, state.Penalty, state.Blocked, state.CanReachPayDay, state.JobName, state.Salary);
AccountManagementTab.OnUpdateState(state.AccountID, state.AccountName, state.Balance, state.Penalty, state.Blocked, state.CanReachPayDay, state.JobName, state.Salary, state.PayrollSalary, state.PayrollCanReachPayDay);
}

private void UpdateHolder(EconomyManagementConsoleUserInterfaceState state, Entity<EconomyAccountHolderComponent>? holder)
{
AccountHolderTab.ApplyConfiguration(state.DefaultJob,
state.SalaryButtonSteps,
state.AccountMask,
state.AccountTags,
state.AllowCentralCommandAccount,
state.AllowRestrictedAccounts);
AccountHolderTab.CurrentCard = holder ?? null;
AccountHolderTab.Priveleged = state.Priveleged;
AccountHolderTab.OnUpdateState(state.HolderID, state.AccountID, state.AccountName, state.Balance, state.Penalty, state.Blocked, state.CanReachPayDay, state.JobName, state.Salary);
AccountHolderTab.OnUpdateState(state.HolderID, state.AccountID, state.AccountName, state.Balance, state.Penalty, state.Blocked, state.CanReachPayDay, state.JobName, state.Salary, state.PayrollSalary, state.PayrollCanReachPayDay);
}

private void UpdateBonus(bool priveleged)
Expand Down
Loading
Loading