diff --git a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/AccountLogic.cs b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/AccountLogic.cs index f115dc6..731d7b8 100644 --- a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/AccountLogic.cs +++ b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/AccountLogic.cs @@ -168,7 +168,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics int sum = 0; - foreach (var key in cashWithdrawals.Keys.Union(moneyTransfers.Keys).Union(moneyTransfers.Keys)) + foreach (var key in cashWithdrawals.Keys.Union(moneyTransfers.Keys).Union(moneyTransfers.Keys).OrderBy(x => x.Item1 * 12 + x.Item2)) { if (cashWithdrawals.ContainsKey(key)) sum += cashWithdrawals.GetValueOrDefault(key); if (moneyTransfers.ContainsKey(key)) sum += moneyTransfers.GetValueOrDefault(key); diff --git a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/CardLogic.cs b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/CardLogic.cs index cee5e5c..a9bd601 100644 --- a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/CardLogic.cs +++ b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/CardLogic.cs @@ -112,7 +112,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics .Select(x => new { x.Key.Month, x.Key.Year, Sum = x.Select(y => y.Sum).Sum() }).ToDictionary(x => (x.Month, x.Year), x => (x.Sum)); List result = new(); - foreach (var key in debitings.Keys.Union(creditings.Keys)) { + foreach (var key in debitings.Keys.Union(creditings.Keys).OrderBy(x => x.Item1 * 12 + x.Item2)) { int sum = 0; if (debitings.ContainsKey(key)) sum -= debitings.GetValueOrDefault(key); if (creditings.ContainsKey(key)) sum += creditings.GetValueOrDefault(key); diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs index 4024307..82be163 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs @@ -430,7 +430,7 @@ namespace BankYouBankruptCashierApp.Controllers APICashier.Debiting = APICashier.GetRequest($"/api/Account/FindDebiting?id={id}"); - APICashier.Crediting = APICashier.GetRequest($"/api/Account/FindDebiting?id={id}"); + APICashier.Crediting = APICashier.GetRequest($"/api/Account/FindCrediting?id={id}"); if(APICashier.Debiting == null) { diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Shared/_Layout.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Shared/_Layout.cshtml index 3837808..ca18af4 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Shared/_Layout.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Shared/_Layout.cshtml @@ -15,9 +15,6 @@