From 5dc8f41c0fa086bfe8bec615fcb5094113537b31 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Wed, 17 May 2023 20:46:40 +0400 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D1=82=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B0=D0=B4=D0=B0=D0=BF?= =?UTF-8?q?=D1=82=D0=B8=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/HomeController.cs | 22 +++++++++++ .../Views/Home/CloseDebiting.cshtml | 39 ++++++++++++++++++- .../Controllers/AccountController.cs | 18 +++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs index 1291dcc..2c5f11b 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs @@ -340,7 +340,29 @@ namespace BankYouBankruptCashierApp.Controllers AccountId = APICashier.Card.AccountId }); + APICashier.Debiting = null; + APICashier.Card = null; + Response.Redirect("Debiting"); } + + //получение номера запрашиваемого счёта для снятия + [HttpPost] + public string GetAccountNumber(int debitingId) + { + APICashier.Debiting = APICashier.GetRequest($"/api/Account/FindDebiting?id={debitingId}"); + + APICashier.Card = APICashier.GetRequest($"/api/Card/FindCard?id={APICashier.Debiting.CardId}"); + + APICashier.Account = APICashier.GetRequest($"/api/Account/GetAccount?accountId={APICashier.Card.AccountId}"); + + string AccountNumber = APICashier.Account.AccountNumber; + + APICashier.Debiting = null; + APICashier.Card = null; + APICashier.Account = null; + + return AccountNumber; + } } } \ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml index 4549d4a..ebf3630 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml @@ -9,7 +9,23 @@
Номер запроса на снятие:
- + +
+
+
+
Запрашиваемый счёт для перевода:
+
+ +
+
+
+
Номер счёта для снятия:
+
+
@@ -18,4 +34,23 @@
- \ No newline at end of file + + + + \ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs index 7b9ea33..0b343cd 100644 --- a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs +++ b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs @@ -71,6 +71,24 @@ namespace BankYouBankruptRestApi.Controllers } } + //получаем все имеющиеся счета + [HttpGet] + public AccountViewModel? GetAccount(int accountId) + { + try + { + return _accountLogic.ReadElement(new AccountSearchModel + { + Id = accountId + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка входа в систему"); + throw; + } + } + [HttpPost] public void Register(AccountBindingModel model) { From f2eb8081d51873aa02dcf2a83d599b7b16c9ed4d Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Wed, 17 May 2023 20:56:10 +0400 Subject: [PATCH 2/5] =?UTF-8?q?=D0=90=D0=B4=D0=B0=D0=BF=D1=82=D0=B8=D0=B2?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B1=D0=B0=D0=B1=D0=B0=D1=85=D0=B0=D0=BD=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BankYouBankruptCashierApp/Controllers/HomeController.cs | 6 ++++-- .../Views/Home/CloseDebiting.cshtml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs index 2c5f11b..1413d4b 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs @@ -310,12 +310,14 @@ namespace BankYouBankruptCashierApp.Controllers { ViewBag.Debitings = APICashier.GetRequest>("/api/Account/FindOpenDebiting"); + ViewBag.Accounts = APICashier.GetRequest>("/api/Account/GetAllAccounts"); + return View(); } //одобрения заявки на снятие Post-запросом [HttpPost] - public void CloseDebiting(int debitingId) + public void CloseDebiting(int debitingId, int accountId) { if (APICashier.Cashier == null) { @@ -337,7 +339,7 @@ namespace BankYouBankruptCashierApp.Controllers CashierId = APICashier.Cashier.Id, DebitingId = debitingId, Sum = APICashier.Debiting.Sum, - AccountId = APICashier.Card.AccountId + AccountId = accountId }); APICashier.Debiting = null; diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml index ebf3630..d7bd6e6 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml @@ -23,7 +23,7 @@
Номер счёта для снятия:
-
From 93cbad30f854846bc5a7c2e9b033c3288bc10d43 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Wed, 17 May 2023 22:13:56 +0400 Subject: [PATCH 3/5] =?UTF-8?q?Cashier.=20=D0=92=D1=80=D0=BE=D0=B4=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D0=BD=D0=B5=D0=BC=D1=83=20=D0=B2=D1=81=D1=91?= =?UTF-8?q?,=20=D0=BA=D1=80=D0=BE=D0=BC=D0=B5=20=D0=BE=D1=87=D1=91=D1=82?= =?UTF-8?q?=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/MoneyTransferLogic.cs | 18 ++-- .../Controllers/HomeController.cs | 84 ++++++++++++++----- .../Views/Home/CloseCrediting.cshtml | 39 ++++++++- .../Views/Home/CloseDebiting.cshtml | 2 +- .../Views/Home/MoneyTransfers.cshtml | 37 ++++++++ .../Controllers/AccountController.cs | 2 +- 6 files changed, 150 insertions(+), 32 deletions(-) create mode 100644 BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml diff --git a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/MoneyTransferLogic.cs b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/MoneyTransferLogic.cs index e481ac1..8493244 100644 --- a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/MoneyTransferLogic.cs +++ b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/MoneyTransferLogic.cs @@ -82,17 +82,17 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics return false; } - if (!model.CreditingId.HasValue) + //проверка на то, что это зачисление на карту, а не перевод между счетами + if (model.CreditingId.HasValue) { - throw new Exception(); - } + _creditingStorage.Update(new CreditingBindingModel + { + Id = model.CreditingId.Value, + DateClose = DateTime.Now, + Status = StatusEnum.Закрыта + }); - _creditingStorage.Update(new CreditingBindingModel - { - Id = model.CreditingId.Value, - DateClose = DateTime.Now, - Status = StatusEnum.Закрыта - }); + } return true; } diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs index 1413d4b..391f795 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs @@ -249,30 +249,20 @@ namespace BankYouBankruptCashierApp.Controllers return View(APICashier.GetRequest>($"/api/Account/FindOpenCrediting")); } - //для страницы "Переводы" - [HttpGet] - public IActionResult MoneyTransfers() - { - if (APICashier.Cashier == null) - { - throw new Exception("Вы как сюда попали? Суда вход только авторизованным"); - } - - return View(APICashier.GetRequest>($"/api/Account/FindOpenDebiting")); - } - //открытие вьюхи одобрения заявки на зачисление [HttpGet] public IActionResult CloseCrediting() { ViewBag.Creditings = APICashier.GetRequest>("/api/Account/FindOpenCrediting"); + ViewBag.Accounts = APICashier.GetRequest>("/api/Account/GetAllAccounts"); + return View(); } //одобрения заявки на зачисление Post-запросом [HttpPost] - public void CloseCrediting(int creditingId) + public void CloseCrediting(int creditingId, int accountPayeeId) { if (APICashier.Cashier == null) { @@ -284,8 +274,13 @@ namespace BankYouBankruptCashierApp.Controllers throw new Exception("Некорректный номер заявки на зачисление"); } - //получаем необходимые данные для запроса - APICashier.Crediting = APICashier.GetRequest($"/api/Account/FindCrediting?id={creditingId}"); + if (accountPayeeId < 0) + { + throw new Exception("Некорректный id счёта для зацисления средств"); + } + + //получаем необходимые данные для запроса + APICashier.Crediting = APICashier.GetRequest($"/api/Account/FindCrediting?id={creditingId}"); APICashier.Card = APICashier.GetRequest($"/api/Card/FindCard?id={APICashier.Crediting.CardId}"); @@ -294,7 +289,7 @@ namespace BankYouBankruptCashierApp.Controllers CashierId = APICashier.Cashier.Id, CreditingId = creditingId, Sum = APICashier.Crediting.Sum, - AccountPayeeId = APICashier.Card.AccountId + AccountPayeeId = accountPayeeId }); //очистка данных @@ -329,6 +324,11 @@ namespace BankYouBankruptCashierApp.Controllers throw new Exception("Некорректный номер заявки на снятие"); } + if (accountId < 0) + { + throw new Exception("Некорректный номер заявки на снятие"); + } + //получаем необходимые данные для запроса APICashier.Debiting = APICashier.GetRequest($"/api/Account/FindDebiting?id={debitingId}"); @@ -350,11 +350,20 @@ namespace BankYouBankruptCashierApp.Controllers //получение номера запрашиваемого счёта для снятия [HttpPost] - public string GetAccountNumber(int debitingId) + public string GetAccountNumber(int id) { - APICashier.Debiting = APICashier.GetRequest($"/api/Account/FindDebiting?id={debitingId}"); + APICashier.Debiting = APICashier.GetRequest($"/api/Account/FindDebiting?id={id}"); - APICashier.Card = APICashier.GetRequest($"/api/Card/FindCard?id={APICashier.Debiting.CardId}"); + APICashier.Crediting = APICashier.GetRequest($"/api/Account/FindDebiting?id={id}"); + + if(APICashier.Debiting == null) + { + APICashier.Card = APICashier.GetRequest($"/api/Card/FindCard?id={APICashier.Crediting.CardId}"); + } + else + { + APICashier.Card = APICashier.GetRequest($"/api/Card/FindCard?id={APICashier.Debiting.CardId}"); + } APICashier.Account = APICashier.GetRequest($"/api/Account/GetAccount?accountId={APICashier.Card.AccountId}"); @@ -366,5 +375,42 @@ namespace BankYouBankruptCashierApp.Controllers return AccountNumber; } + + [HttpGet] + public IActionResult MoneyTransfers() + { + ViewBag.Accounts = APICashier.GetRequest>("/api/Account/GetAllAccounts"); + + return View(); + } + + [HttpPost] + public void MoneyTransfers(int accountSenderId, int accountPayeeId, int sumMoneyTransfer) + { + if (APICashier.Cashier == null) + { + throw new Exception("Вы как сюда попали? Суда вход только авторизованным"); + } + + if (accountSenderId < 0) + { + throw new Exception("Некорректный id счёта отправителя"); + } + + if (accountPayeeId < 0) + { + throw new Exception("Некорректный id счёта получателя"); + } + + APICashier.PostRequest("/api/Account/CloseCrediting", new MoneyTransferBindingModel + { + CashierId = APICashier.Cashier.Id, + Sum = sumMoneyTransfer, + AccountPayeeId = accountPayeeId, + AccountSenderId = accountSenderId + }); + + Response.Redirect("Index"); + } } } \ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseCrediting.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseCrediting.cshtml index 807f2a5..ab596ae 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseCrediting.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseCrediting.cshtml @@ -9,7 +9,23 @@
Номер запроса на зачисление:
- + +
+
+
+
Запрашиваемый счёт для зачисления:
+
+ +
+
+
+
Номер счёта для зачисления:
+
+
@@ -18,4 +34,23 @@
- \ No newline at end of file + + + + \ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml index d7bd6e6..5fbb73c 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml @@ -47,7 +47,7 @@ $.ajax({ method: "Post", url: "/Home/GetAccountNumber", - data: { debitingId: debitingId }, + data: { id: debitingId }, success: function (result) { $("#accountNumber").val(result); } diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml new file mode 100644 index 0000000..deb6db6 --- /dev/null +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml @@ -0,0 +1,37 @@ +@{ + ViewData["Title"] = "Перевод меджу счетами"; +} + +
+

Перевод меджу счетами

+
+
+
+
Номер счёта для снятия:
+
+ +
+
+
+
Номер счёта для начисления:
+
+ +
+
+
+
Сумма перевода:
+
+ +
+
+
+
+
+ +
+
+
diff --git a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs index 0b343cd..c144096 100644 --- a/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs +++ b/BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs @@ -223,7 +223,7 @@ namespace BankYouBankruptRestApi.Controllers bool flag = true; - //если нет отправителя, т. е. операция на перевод денег из нала в виртуал на карту + //если есть отправитель, т. е. операция на перевод денег со счёта на счёт if (moneyTransfer.AccountSenderId.HasValue) { flag = _accountLogic.ChangeBalance(new AccountSearchModel From caac5f3ab26bbe3a5fcaec1576415fd01f837da2 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Wed, 17 May 2023 22:16:37 +0400 Subject: [PATCH 4/5] Another fixation. --- .../BankYouBankruptCashierApp/Views/Home/Create.cshtml | 2 +- .../BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml | 2 +- .../BankYouBankruptCashierApp/Views/Home/Enter.cshtml | 2 +- .../BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Create.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Create.cshtml index 64c2f2c..2486046 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Create.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Create.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Create"; + ViewData["Title"] = "Открытие счёта"; }
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml index 30e9503..c00de4a 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "CreateReport"; + ViewData["Title"] = "Создание отчёта"; }
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml index 82f8a43..65705a9 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Вход"; + ViewData["Title"] = "Авторизация"; }
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml index deb6db6..b4ccb2b 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Перевод меджу счетами"; + ViewData["Title"] = "Переводы меджу счетами"; }
From a1742e2ec08750b58733db9e4ae1e2359f5c9911 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Wed, 17 May 2023 22:27:54 +0400 Subject: [PATCH 5/5] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=20select=20=D0=B8=20=D0=B4=D1=80=D1=83=D0=B3=D0=BE?= =?UTF-8?q?=D0=B9=20=D0=BC=D0=B5=D0=BB=D0=BE=D1=87=D1=91=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/HomeController.cs | 15 ++++++++++----- .../Home/{Create.cshtml => CreateAccount.cshtml} | 2 +- .../Views/Home/Index.cshtml | 2 +- .../Controllers/HomeController.cs | 2 +- .../Views/Home/CardsList.cshtml | 2 +- ...tCardViewModel.cs => ClientSelectViewModel.cs} | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) rename BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/{Create.cshtml => CreateAccount.cshtml} (92%) rename BankYouBankrupt/BankYouBankruptContracts/ViewModels/{ClientCardViewModel.cs => ClientSelectViewModel.cs} (90%) diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs index 391f795..206ff52 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs @@ -148,16 +148,21 @@ namespace BankYouBankruptCashierApp.Controllers //открытие счёта. Получаем и передаём список изделий во вьюху? [HttpGet] - public IActionResult Create() + public IActionResult CreateAccount() { - ViewBag.Clients = APICashier.GetRequest>("/api/Client/GetAllClients"); + //запрашиваем список в формате вспомогательной вьюшки из-за работы select в asp net + ViewBag.Clients = APICashier.GetRequest>($"/api/Client/GetAllClients").Select(x => new ClientSelectViewModel + { + Id = x.Id, + FullName = x.Surname + " " + x.Name + " " + x.Patronymic + }).ToList(); - return View(); - } + return View(); + } //создание заказа Post-запросом [HttpPost] - public void Create(int clientId, string accountNumber, string password, int balance) + public void CreateAccount(int clientId, string accountNumber, string password, int balance) { if (APICashier.Cashier == null) { diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Create.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateAccount.cshtml similarity index 92% rename from BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Create.cshtml rename to BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateAccount.cshtml index 2486046..0cec3c9 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Create.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateAccount.cshtml @@ -9,7 +9,7 @@
Клиент:
- +
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Index.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Index.cshtml index bbaf558..21beb46 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Index.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Index.cshtml @@ -18,7 +18,7 @@ return; }

- Открыть счёт + Открыть счёт

diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptClientApp/Controllers/HomeController.cs index f4fae54..0393708 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptClientApp/Controllers/HomeController.cs @@ -211,7 +211,7 @@ namespace BankYouBankruptClientApp.Controllers } - ViewBag.Cards = APIClient.GetRequest>($"api/Card/GetAllCards").Select(x => new ClientCardViewModel + ViewBag.Cards = APIClient.GetRequest>($"api/Card/GetAllCards").Select(x => new ClientSelectViewModel { Id = x.Id, FullName = x.ClientSurname + " " +x.Number.ToString() diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CardsList.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CardsList.cshtml index d377a36..95ff86a 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CardsList.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CardsList.cshtml @@ -3,7 +3,7 @@ @model List @{ - ViewData["Title"] = "Home Page"; + ViewData["Title"] = "Список карт"; }
diff --git a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ClientCardViewModel.cs b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ClientSelectViewModel.cs similarity index 90% rename from BankYouBankrupt/BankYouBankruptContracts/ViewModels/ClientCardViewModel.cs rename to BankYouBankrupt/BankYouBankruptContracts/ViewModels/ClientSelectViewModel.cs index 0ef220c..7a5af46 100644 --- a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ClientCardViewModel.cs +++ b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ClientSelectViewModel.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace BankYouBankruptContracts.ViewModels { - public class ClientCardViewModel + public class ClientSelectViewModel { public int Id { get; set; }