From 0f70b85ca63c93d306ec5bc5d94eebe0b7d47507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9A=D1=80?=
 =?UTF-8?q?=D1=8E=D0=BA=D0=BE=D0=B2?= <alexkryukov73@yandex.ru>
Date: Wed, 29 May 2024 17:24:55 +0400
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=83?=
 =?UTF-8?q?=D0=BB=D1=8E))?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BankBusinessLogic.csproj                  |    4 -
 .../BusinessLogic/Cashier/AccountLogic.cs     |  420 +++---
 .../Cashier/CashWithdrawalLogic.cs            |  260 ++--
 .../BusinessLogic/Cashier/CashierLogic.cs     |  269 ++--
 .../Cashier/MoneyTransferLogic.cs             |  255 ++--
 .../BusinessLogic/Client/CardLogic.cs         |  170 +--
 .../BusinessLogic/Client/ClientLogic.cs       |  128 +-
 .../BusinessLogic/Client/CreditingLogic.cs    |  187 ++-
 .../BusinessLogic/Client/DebitingLogic.cs     |  186 ++-
 .../Reports/ReportCashierLogic.cs             |  160 ++-
 .../Reports/ReportClientLogic.cs              |  320 +++--
 .../MailWorker/MailKitWorker.cs               |   87 +-
 .../OfficePackage/AbstractSaveToExcel.cs      | 1222 ++++++++--------
 .../OfficePackage/AbstractSaveToPdf.cs        |  262 ++--
 .../OfficePackage/AbstractSaveToWord.cs       |  576 ++++----
 .../HelperEnums/ExcelStyleInfoType.cs         |   20 +-
 .../HelperEnums/PdfParagraphAlignmentType.cs  |   20 +-
 .../HelperEnums/WordJustificationType.cs      |   14 +-
 .../HelperModels/ExcelCellParameters.cs       |   28 +-
 .../OfficePackage/HelperModels/ExcelInfo.cs   |   23 +-
 .../HelperModels/ExcelMergeParameters.cs      |   16 +-
 .../OfficePackage/HelperModels/PdfInfo.cs     |   37 +-
 .../HelperModels/PdfParagraph.cs              |   16 +-
 .../HelperModels/PdfRowParameters.cs          |   20 +-
 .../OfficePackage/HelperModels/WordInfo.cs    |   17 +-
 .../HelperModels/WordParagraph.cs             |   14 +-
 .../HelperModels/WordTextProperties.cs        |   20 +-
 .../OfficePackage/Implements/SaveToExcel.cs   |   62 +-
 .../OfficePackage/Implements/SaveToPdf.cs     |   28 +-
 .../OfficePackage/Implements/SaveToWord.cs    |  156 +-
 Bank/BankCashierApp/APICashier.cs             |   31 +-
 .../Controllers/HomeController.cs             |   19 +-
 .../Views/Home/CloseDebiting.cshtml           |    2 +-
 .../Views/Home/CreateAccount.cshtml           |    4 +-
 .../Views/Home/CreateReport.cshtml            |   51 +-
 .../Views/Home/Crediting.cshtml               |   10 +-
 .../BankCashierApp/Views/Home/Debiting.cshtml |   10 +-
 Bank/BankCashierApp/Views/Home/Diagram.cshtml |   35 +-
 Bank/BankCashierApp/Views/Home/Index.cshtml   |    2 +-
 Bank/BankCashierApp/Views/Home/Login.cshtml   |    2 +-
 .../Views/Home/MoneyTransfers.cshtml          |    2 +-
 Bank/BankCashierApp/Views/Home/Privacy.cshtml |   11 +-
 .../BankCashierApp/Views/Home/Register.cshtml |   42 +-
 .../Views/Home/ReportWithAccounts.cshtml      |   67 +-
 .../Views/Shared/_Layout.cshtml               |  166 ++-
 .../Views/Shared/_Layout.cshtml.css           |   41 +-
 Bank/BankClientApp/APIClient.cs               |  121 +-
 Bank/BankClientApp/BankClientApp.csproj       |    1 +
 .../Controllers/HomeController.cs             | 1276 +++++++++--------
 Bank/BankClientApp/Program.cs                 |   12 +-
 .../BankClientApp/Views/Home/CardsList.cshtml |  100 +-
 .../Views/Home/CreateCard.cshtml              |   25 +-
 .../Views/Home/CreateCrediting.cshtml         |   24 +
 .../Views/Home/CreateDebiting.cshtml          |   24 +
 .../Views/Home/CreateExcelReport.cshtml       |   20 +
 .../Views/Home/CreateReport.cshtml            |  119 +-
 .../Views/Home/CreditingList.cshtml           |   67 +
 .../Views/Home/DebitingList.cshtml            |   67 +
 Bank/BankClientApp/Views/Home/Diagram.cshtml  |   92 ++
 Bank/BankClientApp/Views/Home/Enter.cshtml    |    6 +-
 .../BankClientApp/Views/Home/ErrorPage.cshtml |   10 +
 Bank/BankClientApp/Views/Home/Index.cshtml    |    3 +-
 Bank/BankClientApp/Views/Home/Login.cshtml    |   19 +-
 Bank/BankClientApp/Views/Home/Privacy.cshtml  |   21 +-
 Bank/BankClientApp/Views/Home/Register.cshtml |   19 +-
 .../Views/Home/ReportSuccess.cshtml           |   16 +
 .../Views/Home/ReportWithCards.cshtml         |  140 ++
 Bank/BankClientApp/Views/Shared/Error.cshtml  |    1 +
 .../BankClientApp/Views/Shared/_Layout.cshtml |  206 ++-
 .../Views/Shared/_Layout.cshtml.css           |   53 +-
 .../Cashier/AccountBindingModel.cs            |   27 +-
 .../Cashier/CashWithdrawalBindingModel.cs     |   24 +-
 .../Cashier/CashierBindingModel.cs            |   24 +-
 .../Cashier/MoneyTransferBindingModel.cs      |   30 +-
 .../BindingModels/Client/CardBindingModel.cs  |   16 +-
 .../Client/ClientBindingModel.cs              |   14 +-
 .../Client/CreditingBindingModel.cs           |   22 +-
 .../Client/DebitingBindingModel.cs            |   19 +-
 .../Messages/MailConfigBindingModel.cs        |   28 +-
 .../Messages/MailSendInfoBindingModel.cs      |   21 +-
 .../Messages/MessageInfoBindingModel.cs       |   29 +-
 .../Reports/ReportBindingModel.cs             |   31 +-
 .../Reports/ReportSupportBindingModel.cs      |   15 +-
 .../Cashier/IAccountLogic.cs                  |   27 +-
 .../Cashier/ICashWithdrawalLogic.cs           |   22 +-
 .../Cashier/ICashierLogic.cs                  |   22 +-
 .../Cashier/IMoneyTransferLogic.cs            |   22 +-
 .../Client/ICardLogic.cs                      |   11 +-
 .../Client/IClientLogic.cs                    |    9 +-
 .../Client/ICreditingLogic.cs                 |    8 +-
 .../Client/IDebitingLogic.cs                  |    8 +-
 .../Reports/IReportCashierLogic.cs            |   20 +-
 .../Reports/IReportClientLogic.cs             |   24 +-
 .../Cashier/AccountSearchModel.cs             |   24 +-
 .../Cashier/CashWithdrawalSearchModel.cs      |   23 +-
 .../Cashier/CashierSearchModel.cs             |   21 +-
 .../Cashier/MoneyTransferSearchModel.cs       |   28 +-
 .../SearchModels/Client/CardSearchModel.cs    |   11 +-
 .../SearchModels/Client/ClientSearchModel.cs  |   13 +-
 .../Client/CreditingSearchModel.cs            |   12 +-
 .../Client/DebitingSearchModel.cs             |   12 +-
 .../StoragesModels/Cashier/IAccountStorage.cs |   26 +-
 .../Cashier/ICashWithdrawalStorage.cs         |   24 +-
 .../StoragesModels/Cashier/ICashierStorage.cs |   24 +-
 .../Cashier/IMoneyTransferStorage.cs          |   24 +-
 .../StoragesModels/Client/ICardStorage.cs     |   10 +-
 .../StoragesModels/Client/IClientStorage.cs   |    8 +-
 .../Client/ICreditingStorage.cs               |   10 +-
 .../StoragesModels/Client/IDebitingStorage.cs |   10 +-
 .../CashierDiagramElementsViewModel.cs        |    2 +-
 .../Cashier/ViewModels/AccountViewModel.cs    |   28 +-
 .../ViewModels/CashWithdrawalViewModel.cs     |   45 +-
 .../Cashier/ViewModels/CashierViewModel.cs    |   37 +-
 .../ViewModels/ClientSelectViewModel.cs       |    4 +-
 .../ViewModels/MoneyTransferViewModel.cs      |   38 +-
 .../Diagram/ClientDiagramElementsViewModel.cs |    6 +-
 .../Client/Diagram/ClientDiagramViewModel.cs  |   14 +-
 .../Client/ViewModels/CardViewModel.cs        |   29 +-
 .../Client/ViewModels/ClientViewModel.cs      |   14 +-
 .../Client/ViewModels/CreditingViewModel.cs   |   25 +-
 .../Client/ViewModels/DebitingViewModel.cs    |   19 +-
 .../Cashier/ReportCashierAccountsViewModel.cs |    4 +-
 .../Reports/Cashier/ReportCashierViewModel.cs |    2 +-
 .../Reports/Client/CheckboxViewModel.cs       |    4 +-
 .../Client/ReportClientCardsViewModel.cs      |    2 +-
 .../Reports/Client/ReportClientViewModel.cs   |    2 +-
 .../Reports/Client/ReportViewModel.cs         |   29 +
 .../Reports/ReportCashierViewModelForHTML.cs  |   15 +-
 .../Reports/ReportClientViewModelForHTML.cs   |   11 +-
 Bank/BankDataModels/Enums/MailsEnum.cs        |   10 +-
 Bank/BankDataModels/Enums/Months.cs           |   15 +
 Bank/BankDataModels/Enums/StatusAccount.cs    |   19 -
 Bank/BankDataModels/Enums/StatusCard.cs       |   19 -
 Bank/BankDataModels/Enums/StatusEnum.cs       |   19 +
 .../BankDataModels/Enums/TypeOperationEnum.cs |    6 +-
 .../Models/Cashier/IAccountModel.cs           |   28 +-
 .../Models/Cashier/ICashWithdrawalModel.cs    |   20 +-
 .../Models/Cashier/ICashierModel.cs           |   26 +-
 .../Models/Cashier/IMoneyTransferModel.cs     |   22 +-
 .../Models/Client/ICardModel.cs               |   29 -
 .../Models/Client/IClientModel.cs             |   30 -
 .../Models/Client/ICreditingModel.cs          |   21 +-
 .../Models/Client/IDebitingModel.cs           |   20 +-
 .../Models/Client/IСardModel.cs              |   22 +
 .../Models/Client/IСlientModel.cs            |   24 +
 .../Models/IMessageInfoModel.cs               |   23 +-
 Bank/BankDatabaseImplement/BankDatabase.cs    |    3 +-
 .../CashierImplements/AccountStorage.cs       |  224 ++-
 .../CashWithdrawalStorage.cs                  |  175 ++-
 .../CashierImplements/CashierStorage.cs       |  149 +-
 .../CashierImplements/MoneyTransferStorage.cs |  208 ++-
 .../ClientImplements/CardStorage.cs           |  187 ++-
 .../ClientImplements/ClientStorage.cs         |   61 +-
 .../ClientImplements/CreditingStorage.cs      |   97 +-
 .../ClientImplements/DebitingStorage.cs       |  102 +-
 ...171124_NewTransferAndCrediting.Designer.cs |  449 ++++++
 .../20230516171124_NewTransferAndCrediting.cs |  495 ++++---
 .../20230516172054_SmallFix.Designer.cs       |  462 ++++++
 .../Migrations/20230516172054_SmallFix.cs     |   39 +
 .../Migrations/20230516172054_SmallFix.cs.cs  |   43 -
 ...=> 20230516175437_NewSmallFix.Designer.cs} |  424 +++---
 .../Migrations/20230516175437_NewSmallFix.cs  |  123 +-
 .../Migrations/20240528115815_Initial.cs      |  324 -----
 .../Migrations/BankDatabaseModelSnapshot.cs   |  420 +++---
 .../Models/CashierModels/Account.cs           |  125 +-
 .../Models/CashierModels/CashWithdrawal.cs    |  106 +-
 .../Models/CashierModels/Cashier.cs           |  127 +-
 .../Models/CashierModels/MoneyTransfer.cs     |  104 +-
 .../Models/ClientModels/Card.cs               |   50 +-
 .../Models/ClientModels/Client.cs             |   36 +-
 .../Models/ClientModels/Crediting.cs          |   50 +-
 .../Models/ClientModels/Debiting.cs           |   39 +-
 .../Controllers/AccountController.cs          |  273 ++--
 .../BankRestAPI/Controllers/CardController.cs |  183 +--
 .../Controllers/CashierController.cs          |  123 +-
 .../Controllers/ClientController.cs           |  248 ++--
 .../Controllers/ReportController.cs           |  429 +++---
 Bank/BankRestAPI/Program.cs                   |   31 +-
 Bank/BankRestAPI/appsettings.json             |    9 +-
 179 files changed, 8299 insertions(+), 6989 deletions(-)
 create mode 100644 Bank/BankClientApp/Views/Home/CreateCrediting.cshtml
 create mode 100644 Bank/BankClientApp/Views/Home/CreateDebiting.cshtml
 create mode 100644 Bank/BankClientApp/Views/Home/CreateExcelReport.cshtml
 create mode 100644 Bank/BankClientApp/Views/Home/CreditingList.cshtml
 create mode 100644 Bank/BankClientApp/Views/Home/DebitingList.cshtml
 create mode 100644 Bank/BankClientApp/Views/Home/Diagram.cshtml
 create mode 100644 Bank/BankClientApp/Views/Home/ErrorPage.cshtml
 create mode 100644 Bank/BankClientApp/Views/Home/ReportSuccess.cshtml
 create mode 100644 Bank/BankClientApp/Views/Home/ReportWithCards.cshtml
 create mode 100644 Bank/BankContracts/ViewModels/Reports/Client/ReportViewModel.cs
 create mode 100644 Bank/BankDataModels/Enums/Months.cs
 delete mode 100644 Bank/BankDataModels/Enums/StatusAccount.cs
 delete mode 100644 Bank/BankDataModels/Enums/StatusCard.cs
 create mode 100644 Bank/BankDataModels/Enums/StatusEnum.cs
 delete mode 100644 Bank/BankDataModels/Models/Client/ICardModel.cs
 delete mode 100644 Bank/BankDataModels/Models/Client/IClientModel.cs
 create mode 100644 Bank/BankDataModels/Models/Client/IСardModel.cs
 create mode 100644 Bank/BankDataModels/Models/Client/IСlientModel.cs
 create mode 100644 Bank/BankDatabaseImplement/Migrations/20230516171124_NewTransferAndCrediting.Designer.cs
 create mode 100644 Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.Designer.cs
 create mode 100644 Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.cs
 delete mode 100644 Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.cs.cs
 rename Bank/BankDatabaseImplement/Migrations/{20240528115815_Initial.Designer.cs => 20230516175437_NewSmallFix.Designer.cs} (72%)
 delete mode 100644 Bank/BankDatabaseImplement/Migrations/20240528115815_Initial.cs

diff --git a/Bank/BankBusinessLogic/BankBusinessLogic.csproj b/Bank/BankBusinessLogic/BankBusinessLogic.csproj
index b344559..d7c0e65 100644
--- a/Bank/BankBusinessLogic/BankBusinessLogic.csproj
+++ b/Bank/BankBusinessLogic/BankBusinessLogic.csproj
@@ -9,10 +9,6 @@
   <ItemGroup>
 	<PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
 	<PackageReference Include="MailKit" Version="4.5.0" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.18">
-	  <PrivateAssets>all</PrivateAssets>
-	  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	</PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
 	<PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
   </ItemGroup>
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Cashier/AccountLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Cashier/AccountLogic.cs
index c821dc7..ac23881 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Cashier/AccountLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Cashier/AccountLogic.cs
@@ -1,221 +1,241 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.BusinessLogicsContracts.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.StoragesModels.Cashier;
-using BankContracts.ViewModels;
+using BankContracts.StoragesContracts.Cashier;
+using BankContracts.ViewModels.Cashier.Diagram;
+using BankContracts.ViewModels.Cashier.ViewModels;
+using BankDataModels.Enums;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankBusinessLogic.BusinessLogic.Cashier
+namespace BankBusinessLogic.BusinessLogics.Cashier
 {
-	// Класс, реализующий бизнес-логику для счетов
-	public class AccountLogic : IAccountLogic
-    {
-        private readonly ILogger _logger;
+    public class AccountLogic : IAccountLogic
+	{
+		private readonly ILogger _logger;
 
-        private readonly IAccountStorage _accountStorage;
+		private readonly IAccountStorage _accountStorage;
+		private readonly ICashWithdrawalLogic _cashWithdrawalLogic;
+		private readonly IMoneyTransferLogic _moneyTransferLogic;
 
-        private readonly ICashWithdrawalLogic _cashWithdrawalLogic;
+		public AccountLogic(ILogger<AccountLogic> logger, IAccountStorage accountStorage,
+			ICashWithdrawalLogic cashWithdrawalLogic, IMoneyTransferLogic moneyTransferLogic)
+		{
+			_logger = logger;
+			_accountStorage = accountStorage;
+			_cashWithdrawalLogic = cashWithdrawalLogic;
+			_moneyTransferLogic = moneyTransferLogic;
+		}
 
-        private readonly IMoneyTransferLogic _moneyTransferLogic;
-
-        // Конструктор
-        public AccountLogic(ILogger<AccountLogic> logger, IAccountStorage accountStorage,
-            ICashWithdrawalLogic cashWithdrawalLogic, IMoneyTransferLogic moneyTransferLogic)
-        {
-            _logger = logger;
-            _accountStorage = accountStorage;
-            _cashWithdrawalLogic = cashWithdrawalLogic;
-            _moneyTransferLogic = moneyTransferLogic;
-        }
-
-        // Вывод конкретного счёта
-        public AccountViewModel? ReadElement(AccountSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            _logger.LogInformation("ReadElement. AccountNumber:{Name}. Id:{Id}", model.AccountNumber, model?.Id);
-
-            var element = _accountStorage.GetElement(model);
-
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-
-                return null;
-            }
-
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-
-            return element;
-        }
-
-        // Вывод всего списка счетов
-        public List<AccountViewModel>? ReadList(AccountSearchModel? model)
-        {
-            if (model != null)
-            {
-                _logger.LogInformation("ReadList. AccountNumber:{AccountNumber}. Id:{Id}", model.AccountNumber, model.Id);
-            }
-            else
-            {
-                _logger.LogInformation("ReadList without filter model");
-            }
-
-            // list хранит весь список в случае, если model пришло со значением null на вход метода
-            var list = model == null ? _accountStorage.GetFullList() : _accountStorage.GetFilteredList(model);
-
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-
-            return list;
-        }
-
-
-        // Метод, отвечающий за изменение баланса счёта
-        public bool ChangeBalance(AccountSearchModel? model, int sum)
-        {
-            // Ищем счёт
-            var account = ReadElement(model);
-
-            if (account == null)
-            {
-                throw new ArgumentNullException("Счёт не найден", nameof(account));
-            }
-
-            // Проверяем возможность операции снятия (sum может быть отрицательной)
-            if (sum + account.Balance < 0)
-            {
-                return false;
-            }
-
-            // Обновляем балланс счёта
-            _accountStorage.Update(new AccountBindingModel
-            {
-                Id = account.Id,
-                Balance = account.Balance + sum
-            });
-
-            return true;
-        }
-
-        // Создание счёта
-        public bool Create(AccountBindingModel model)
-        {
-            CheckModel(model);
-
-            if (_accountStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        // Обновление счёта
-        public bool Update(AccountBindingModel model)
-        {
-            CheckModel(model);
-
-            if (_accountStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        // Удаление счёта
-        public bool Delete(AccountBindingModel model)
-        {
-            CheckModel(model, false);
-
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-
-            if (_accountStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        // Проверка входного аргумента для методов Insert, Update и Delete
-        private void CheckModel(AccountBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            // Так как при удалении передаём как параметр false
-            if (!withParams)
-            {
-                return;
-            }
-
-            // Проверка на наличие номера счёта
-            if (string.IsNullOrEmpty(model.AccountNumber))
-            {
-                throw new ArgumentNullException("Отсутствие номера у счёта", nameof(model.AccountNumber));
-            }
-
-			// Проверка на наличие id клиента (И всё-таки не будет лишним добавить Id клиента)
-			if (model.ClientId < 0)
+		public AccountViewModel? ReadElement(AccountSearchModel model)
+		{
+			if (model == null)
 			{
-				throw new ArgumentNullException("Некорректный Id клиента", nameof(model.ClientId));
+				throw new ArgumentNullException(nameof(model));
 			}
 
-			// Проверка на наличие id кассира, создавшего счёт
-			if (model.CashierId < 0)
-            {
-                throw new ArgumentNullException("Некорректный Id кассира, открывшего счёт", nameof(model.CashierId));
-            }
+			_logger.LogInformation("ReadElement. AccountNumber:{Name}. Id:{Id}", model.AccountNumber, model?.Id);
 
-            if (model.Balance < 0)
+			var element = _accountStorage.GetElement(model);
+
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
+
+				return null;
+			}
+
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+
+			return element;
+		}
+
+		public List<AccountViewModel>? ReadList(AccountSearchModel? model)
+		{
+			//_logger.LogInformation("ReadList. AccountNumber:{AccountNumber}. Id:{Id}", model.AccountNumber, model?.Id);
+
+			//list хранит весь список в случае, если model пришло со значением null на вход метода
+			var list = model == null ? _accountStorage.GetFullList() : _accountStorage.GetFilteredList(model);
+
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+
+			return list;
+		}
+
+		//метод, отвечающий за изменение баланса счёта
+		public bool ChangeBalance(AccountSearchModel? model, int sum)
+		{
+			//ищем счёт
+			var account = ReadElement(model);
+
+			if (account == null)
+			{
+				throw new ArgumentNullException("Счёт не найден", nameof(account));
+			}
+
+			//проверяем возможность операции снятия (sum может быть отрицательной)
+			if (sum + account.Balance < 0)
+			{
+				return false;
+			}
+
+			//обновляем балланс счёта
+			_accountStorage.Update(new AccountBindingModel
+			{
+				Id = account.Id,
+				Balance = account.Balance + sum
+			});
+
+			return true;
+		}
+
+		public bool Create(AccountBindingModel model)
+		{
+			CheckModel(model);
+
+			if (_accountStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+
+				return false;
+			}
+
+			return true;
+		}
+
+		public bool Update(AccountBindingModel model)
+		{
+			CheckModel(model);
+
+			if (_accountStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
+
+				return false;
+			}
+
+			return true;
+		}
+
+		public bool Delete(AccountBindingModel model)
+		{
+			CheckModel(model, false);
+
+			_logger.LogInformation("Delete. Id:{Id}", model.Id);
+
+			if (_accountStorage.Delete(model) == null)
+			{
+				_logger.LogWarning("Delete operation failed");
+
+				return false;
+			}
+
+			return true;
+		}
+
+        public List<CashierDiagramElementsViewModel> GetMonthInfo(int AccountId)
+        {
+
+            Dictionary<(int, int), int> cashWithdrawals = _cashWithdrawalLogic.ReadList(new CashWithdrawalSearchModel()
             {
+                AccountId = AccountId,
+            }).Where(x => x.DebitingStatus == StatusEnum.Закрыта ).GroupBy(x => new { x.DateOperation.Month, x.DateOperation.Year })
+            .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));
+
+            Dictionary<(int, int), int> moneyTransfers = _moneyTransferLogic.ReadList(new MoneyTransferSearchModel()
+            {
+                AccountPayeeId = AccountId,
+            }).GroupBy(x => new { x.DateOperation.Month, x.DateOperation.Year })
+            .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));
+
+            Dictionary<(int, int), int> moneyTransfersDebiting = _moneyTransferLogic.ReadList(new MoneyTransferSearchModel()
+            {
+                AccountSenderId = AccountId,
+            }).GroupBy(x => new { x.DateOperation.Month, x.DateOperation.Year })
+            .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<CashierDiagramElementsViewModel> result = new();
+
+			int sum = 0;
+
+			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);
+                if (moneyTransfers.ContainsKey(key)) sum -= moneyTransfersDebiting.GetValueOrDefault(key);
+                result.Add(new CashierDiagramElementsViewModel() { Name = Enum.GetName(typeof(Months), key.Item1) + " " + key.Item2.ToString(), Value = sum });
+            }
+            return result;
+        }
+
+        //проверка входного аргумента для методов Insert, Update и Delete
+        private void CheckModel(AccountBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+
+			//так как при удалении передаём как параметр false
+			if (!withParams)
+			{
+				return;
+			}
+
+			//проверка на наличие номера счёта
+			if (string.IsNullOrEmpty(model.AccountNumber))
+			{
+				throw new ArgumentNullException("Отсутствие номера у счёта", nameof(model.AccountNumber));
+			}
+
+            //проверка на наличие id владельца
+            if (model.CashierId < 0)
+			{
+				throw new ArgumentNullException("Некорректный Id владельца счёта", nameof(model.CashierId));
+			}
+
+			//проверка на наличие id кассира, создавшего счёт
+			if (model.CashierId < 0)
+			{
+				throw new ArgumentNullException("Некорректный Id кассира, открывшего счёт", nameof(model.CashierId));
+			}
+
+			//проверка на наличие пароля счёта
+			if (string.IsNullOrEmpty(model.PasswordAccount) )
+			{
+				throw new ArgumentNullException("Некорректный пароль счёта", nameof(model.PasswordAccount));
+			}
+
+			if (model.Balance < 0) {
                 throw new ArgumentNullException("Изначальный баланс аккаунта не может быть < 0", nameof(model.Balance));
             }
 
-            // Проверка на корректную дату открытия счёта
-            if (model.DateOpen > DateTime.Now)
-            {
-                throw new ArgumentNullException("Дата открытия счёта не может быть ранее текущей", nameof(model.DateOpen));
-            }
+			//проверка на корректную дату открытия счёта
+			if (model.DateOpen > DateTime.Now)
+			{
+				throw new ArgumentNullException("Дата открытия счёта не может быть ранее текущей", nameof(model.DateOpen));
+			}
 
-            _logger.LogInformation("Account. AccountNumber:{AccountNumber}. ClientId:{ClientId}. " +
-                "CashierId:{CashierId}. DateOpen:{DateOpen}. Id:{Id}",
-                model.AccountNumber, model.ClientId, model.CashierId, model.DateOpen, model.Id);
+			_logger.LogInformation("Account. AccountNumber:{AccountNumber}. PasswordAccount:{PasswordAccount}. ClientId:{ClientId}. " +
+				"CashierId:{CashierId}. DateOpen:{DateOpen}. Id:{Id}",
+				model.AccountNumber, model.PasswordAccount, model.ClientId, model.CashierId, model.DateOpen, model.Id);
 
-            // Для проверка на наличие такого же счёта
-            var element = _accountStorage.GetElement(new AccountSearchModel
-            {
-                AccountNumber = model.AccountNumber,
-            });
+			//для проверка на наличие такого же счёта
+			var element = _accountStorage.GetElement(new AccountSearchModel
+			{
+				AccountNumber = model.AccountNumber,
+			});
 
-            // Если элемент найден и его Id не совпадает с Id переданного объекта
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Счёт с таким номером уже существует");
-            }
-        }
-    }
+			//если элемент найден и его Id не совпадает с Id переданного объекта
+			if (element != null && element.Id != model.Id)
+			{
+				throw new InvalidOperationException("Счёт с таким номером уже существует");
+			}
+		}
+	}
 }
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Cashier/CashWithdrawalLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Cashier/CashWithdrawalLogic.cs
index 91474f8..f4828fe 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Cashier/CashWithdrawalLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Cashier/CashWithdrawalLogic.cs
@@ -2,176 +2,170 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.BusinessLogicsContracts.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.StoragesModels.Cashier;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Cashier;
+using BankContracts.StoragesContracts.Client;
 using BankContracts.ViewModels.Cashier.ViewModels;
+using BankDataModels.Enums;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankBusinessLogic.BusinessLogic.Cashier
+namespace BankBusinessLogic.BusinessLogics.Cashier
 {
-	// Класс, реализующий бизнес-логику для снятия наличных
-	public class CashWithdrawalLogic : ICashWithdrawalLogic
-    {
-        private readonly ILogger _logger;
+    public class CashWithdrawalLogic : ICashWithdrawalLogic
+	{
+		private readonly ILogger _logger;
 
-        private readonly ICashWithdrawalStorage _cashWithdrawalStorage;
+		private readonly ICashWithdrawalStorage _cashWithdrawalStorage;
 
-        private readonly IDebitingStorage _debitingStorage;
+		private readonly IDebitingStorage _debitingStorage;
 
-        // Конструктор 
-        public CashWithdrawalLogic(ILogger<CashWithdrawalLogic> logger, ICashWithdrawalStorage cashWithdrawalStorage, IDebitingStorage debitingStorage)
-        {
-            _logger = logger;
-            _cashWithdrawalStorage = cashWithdrawalStorage;
-            _debitingStorage = debitingStorage;
-        }
+		public CashWithdrawalLogic(ILogger<CashWithdrawalLogic> logger, ICashWithdrawalStorage cashWithdrawalStorage, 
+			IDebitingStorage debitingStorage)
+		{
+			_logger = logger;
+			_cashWithdrawalStorage = cashWithdrawalStorage;
+			_debitingStorage = debitingStorage;
+		}
 
-        // Вывод конкретной операции
-        public CashWithdrawalViewModel? ReadElement(CashWithdrawalSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
+		public CashWithdrawalViewModel? ReadElement(CashWithdrawalSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
 
-            _logger.LogInformation("ReadElement. AccountId:{AccountId}. Sum:{Sum}. DateWithdrawal:{DateWithdrawal}. Id:{Id}",
-                model.AccountId, model.Sum, model.DateWithdrawal, model?.Id);
+			_logger.LogInformation("ReadElement. AccountId:{AccountId}. Sum:{Sum}. DateOperation:{DateOperation}. Id:{Id}", 
+				model.AccountId, model.Sum, model.DateTo, model?.Id);
 
-            var element = _cashWithdrawalStorage.GetElement(model);
+			var element = _cashWithdrawalStorage.GetElement(model);
 
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
 
-                return null;
-            }
+				return null;
+			}
 
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
 
-            return element;
-        }
+			return element;
+		}
 
-        // Вывод всего списка операций
-        public List<CashWithdrawalViewModel>? ReadList(CashWithdrawalSearchModel? model)
-        {
-            _logger.LogInformation("ReadElement. AccountId:{AccountId}. Sum:{Sum}. DateWithdrawal:{DateWithdrawal}. Id:{Id}",
-                model?.AccountId, model?.Sum, model?.DateWithdrawal, model?.Id);
+		public List<CashWithdrawalViewModel>? ReadList(CashWithdrawalSearchModel? model)
+		{
+            _logger.LogInformation("ReadElement. AccountId:{AccountId}. Sum:{Sum}. DateOperation:{DateOperation}. Id:{Id}",
+				model?.AccountId, model?.Sum, model?.DateTo, model?.Id);
 
-            // list хранит весь список в случае, если model пришло со значением null на вход метода
-            var list = model == null ? _cashWithdrawalStorage.GetFullList() : _cashWithdrawalStorage.GetFilteredList(model);
+			//list хранит весь список в случае, если model пришло со значением null на вход метода
+			var list = model == null ? _cashWithdrawalStorage.GetFullList() : _cashWithdrawalStorage.GetFilteredList(model);
 
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
 
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
 
-            return list;
-        }
+			return list;
+		}
 
-        // Создание операции
-        public bool Create(CashWithdrawalBindingModel model, bool flag)
-        {
-            CheckModel(model);
+		public bool Create(CashWithdrawalBindingModel model, bool flag)
+		{
+			CheckModel(model);
 
-            if (flag)
-            {
-                if (_cashWithdrawalStorage.Insert(model) == null)
-                {
-                    _logger.LogWarning("Insert operation failed");
+			if (flag)
+			{
+				if (_cashWithdrawalStorage.Insert(model) == null)
+				{
+					_logger.LogWarning("Insert operation failed");
 
-                    return false;
-                }
+					return false;
+				}
 
-                _debitingStorage.Update(new DebitingBindingModel
-                {
-                    Id = model.DebitingId,
-                });
-            }
-            else
-            {
-                _debitingStorage.Update(new DebitingBindingModel
-                {
-                    Id = model.DebitingId,
-                });
-            }
+				_debitingStorage.Update(new DebitingBindingModel
+				{
+					Id = model.DebitingId,
+					DateClose = DateTime.Now,
+					Status = StatusEnum.Закрыта
+				});
+			}
+			else
+			{
+				_debitingStorage.Update(new DebitingBindingModel
+				{
+					Id = model.DebitingId,
+					DateClose = DateTime.Now,
+					Status = StatusEnum.Отклонено
+				});
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        // Обновление операции
-        public bool Update(CashWithdrawalBindingModel model)
-        {
-            CheckModel(model);
+		public bool Update(CashWithdrawalBindingModel model)
+		{
+			CheckModel(model);
 
-            if (_cashWithdrawalStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
+			if (_cashWithdrawalStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
 
-                return false;
-            }
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        // Удаление операции
-        public bool Delete(CashWithdrawalBindingModel model)
-        {
-            CheckModel(model, false);
+		public bool Delete(CashWithdrawalBindingModel model)
+		{
+			CheckModel(model, false);
 
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+			_logger.LogInformation("Delete. Id:{Id}", model.Id);
 
-            if (_cashWithdrawalStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
+			if (_cashWithdrawalStorage.Delete(model) == null)
+			{
+				_logger.LogWarning("Delete operation failed");
 
-                return false;
-            }
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        // Проверка входного аргумента для методов Insert, Update и Delete
-        private void CheckModel(CashWithdrawalBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
+		//проверка входного аргумента для методов Insert, Update и Delete
+		private void CheckModel(CashWithdrawalBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
 
-            // Так как при удалении передаём как параметр false
-            if (!withParams)
-            {
-                return;
-            }
+			//так как при удалении передаём как параметр false
+			if (!withParams)
+			{
+				return;
+			}
 
-            // Проверка на корректность Id счёта
-            if (model.AccountId < 0)
-            {
-                throw new ArgumentNullException("Некорректный Id счёта", nameof(model.AccountId));
-            }
+			//проверка на корректность Id счёта
+			if (model.AccountId < 0)
+			{
+				throw new ArgumentNullException("Некорректный Id счёта", nameof(model.AccountId));
+			}
 
-            // Проверка на корректность снимаемой суммы
-            if (model.Sum <= 0)
-            {
-                throw new ArgumentNullException("Снимаемая сумма не может раняться нулю или быть меньше его", nameof(model.Sum));
-            }
+			//проверка на корректность снимаемой суммы
+			if (model.Sum <= 0)
+			{
+				throw new ArgumentNullException("Снимаемая сумма не может раняться нулю или быть меньше его", nameof(model.Sum));
+			}
 
-            // Проверка на корректную дату операции
-            if (model.DateWithdrawal > DateTime.Now)
-            {
-                throw new ArgumentNullException("Дата операции не может быть позднее текущей", nameof(model.DateWithdrawal));
-            }
+			//проверка на корректную дату операции
+			if (model.DateOperation > DateTime.Now)
+			{
+				throw new ArgumentNullException("Дата операции не может быть позднее текущей", nameof(model.DateOperation));
+			}
 
-            _logger.LogInformation("CashWithdrawal: AccountId:{AccountId}. Sum:{Sum}. DateWithdrawal:{DateWithdrawal}. Id:{Id}",
-                model.AccountId, model.Sum, model.DateWithdrawal, model?.Id);
-        }
-    }
+			_logger.LogInformation("CashWithdrawal: AccountId:{AccountId}. Sum:{Sum}. DateOperation:{DateOperation}. Id:{Id}", 
+				model.AccountId, model.Sum, model.DateOperation, model?.Id);
+		}
+	}
 }
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Cashier/CashierLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Cashier/CashierLogic.cs
index 1d3f9e7..fabd8e3 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Cashier/CashierLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Cashier/CashierLogic.cs
@@ -1,185 +1,170 @@
 using BankContracts.BindingModels.Cashier;
-using BankContracts.BindingModels.Client;
 using BankContracts.BusinessLogicsContracts.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.StoragesModels.Cashier;
+using BankContracts.StoragesContracts.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankBusinessLogic.BusinessLogic.Cashier
+namespace BankBusinessLogic.BusinessLogics.Cashier
 {
-    // Класс, реализующий бизнес-логику для кассиров
     public class CashierLogic : ICashierLogic
-    {
-        private readonly ILogger _logger;
+	{
+		private readonly ILogger _logger;
 
-        private readonly ICashierStorage _cashierStorage;
+		private readonly ICashierStorage _cashierStorage;
 
-        // Конструктор
-        public CashierLogic(ILogger<CashierLogic> logger, ICashierStorage cashierStorage)
-        {
-            _logger = logger;
-            _cashierStorage = cashierStorage;
-        }
+		public CashierLogic(ILogger<CashierLogic> logger, ICashierStorage cashierStorage)
+		{
+			_logger = logger;
+			_cashierStorage = cashierStorage;
+		}
 
-        // Вывод конкретного клиента
-        public CashierViewModel? ReadElement(CashierSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
+		public CashierViewModel? ReadElement(CashierSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
 
-            _logger.LogInformation("ReadElement. CashierName:{Name}. CashierSurname:{Surname}. CashierPatronymic:{Patronymic}. Id:{Id}",
-                model.Name, model.Surname, model.Patronymic, model?.Id);
+			_logger.LogInformation("ReadElement. CashierName:{Name}. CashierSurname:{Surname}. CashierPatronymic:{Patronymic}. Id:{Id}", 
+				model.Name, model.Surname, model.Patronymic, model?.Id);
 
-            var element = _cashierStorage.GetElement(model);
+			var element = _cashierStorage.GetElement(model);
 
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
 
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
+				return null;
+			}
 
-        // Вывод отфильтрованного списка
-        public List<CashierViewModel>? ReadList(CashierSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. CashierName:{Name}. CashierSurname:{Surname}. CashierPatronymic:{Patronymic}. Id:{Id}",
-                model.Name, model.Surname, model.Patronymic, model?.Id);
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
 
-            // list хранит весь список в случае, если model пришло со значением null на вход метода
-            var list = model == null ? _cashierStorage.GetFullList() : _cashierStorage.GetFilteredList(model);
+			return element;
+		}
 
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
+		public List<CashierViewModel>? ReadList(CashierSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. CashierName:{Name}. CashierSurname:{Surname}. CashierPatronymic:{Patronymic}. Id:{Id}", 
+				model.Name, model.Surname, model.Patronymic, model?.Id);
 
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			//list хранит весь список в случае, если model пришло со значением null на вход метода
+			var list = model == null ? _cashierStorage.GetFullList() : _cashierStorage.GetFilteredList(model);
 
-            return list;
-        }
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
 
-        // Создание кассира
-        public bool Create(CashierBindingModel model)
-        {
-            CheckModel(model);
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
 
-            if (_cashierStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
+			return list;
+		}
 
-            return true;
-        }
+		public bool Create(CashierBindingModel model)
+		{
+			CheckModel(model);
 
-        // Обновление кассира
-        public bool Update(CashierBindingModel model)
-        {
-            CheckModel(model);
+			if (_cashierStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
 
-            if (_cashierStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        // Удаление кассира
-        public bool Delete(CashierBindingModel model)
-        {
-            CheckModel(model, false);
+		public bool Update(CashierBindingModel model)
+		{
+			CheckModel(model);
 
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+			if (_cashierStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
 
-            if (_cashierStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
+				return false;
+			}
 
-                return false;
-            }
+			return true;
+		}
 
-            return true;
-        }
+		public bool Delete(CashierBindingModel model)
+		{
+			CheckModel(model, false);
 
-        // Проверка входного аргумента для методов Insert, Update и Delete
-        private void CheckModel(CashierBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
+			_logger.LogInformation("Delete. Id:{Id}", model.Id);
 
-            // Так как при удалении передаём как параметр false
-            if (!withParams)
-            {
-                return;
-            }
+			if (_cashierStorage.Delete(model) == null)
+			{
+				_logger.LogWarning("Delete operation failed");
 
-            // Проверка на наличие имени
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                throw new ArgumentNullException("Отсутствие имени в учётной записи", nameof(model.Name));
-            }
+				return false;
+			}
 
-            // Проверка на наличие фамилия
-            if (string.IsNullOrEmpty(model.Surname))
-            {
-                throw new ArgumentNullException("Отсутствие фамилии в учётной записи", nameof(model.Surname));
-            }
+			return true;
+		}
 
-            // Проверка на наличие отчество
-            if (string.IsNullOrEmpty(model.Patronymic))
-            {
-                throw new ArgumentNullException("Отсутствие отчества в учётной записи", nameof(model.Patronymic));
-            }
+		//проверка входного аргумента для методов Insert, Update и Delete
+		private void CheckModel(CashierBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
 
-            // Проверка на наличие почты
-            if (string.IsNullOrEmpty(model.Email))
-            {
-                throw new ArgumentNullException("Отсутствие почты в учётной записи (логина)", nameof(model.Email));
-            }
+			//так как при удалении передаём как параметр false
+			if (!withParams)
+			{
+				return;
+			}
 
-            // Проверка на наличие пароля
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Отсутствие пароля в учётной записи", nameof(model.Password));
-            }
+			//проверка на наличие имени
+			if (string.IsNullOrEmpty(model.Name))
+			{
+				throw new ArgumentNullException("Отсутствие имени в учётной записи", nameof(model.Name));
+			}
 
-            // Проверка на мобильный телефон
-            if (string.IsNullOrEmpty(model.MobilePhone))
-            {
-                throw new ArgumentNullException("Отсутствие почты в учётной записи (логина)", nameof(model.MobilePhone));
-            }
+			//проверка на наличие фамилия
+			if (string.IsNullOrEmpty(model.Surname))
+			{
+				throw new ArgumentNullException("Отсутствие фамилии в учётной записи", nameof(model.Name));
+			}
 
-            _logger.LogInformation("Cashier. CashierName:{Name}. CashierSurname:{Surname}. CashierPatronymic:{Patronymic}. " +
-                "Email:{Email}. Password:{Password}. MobilePhone:{MobilePhone} Id:{Id}",
-                model.Name, model.Surname, model.Patronymic, model.Email, model.Password, model.MobilePhone, model.Id);
+			//проверка на наличие отчество
+			if (string.IsNullOrEmpty(model.Patronymic))
+			{
+				throw new ArgumentNullException("Отсутствие отчества в учётной записи", nameof(model.Name));
+			}
 
-            // Для проверка на наличие такого же аккаунта
-            var element = _cashierStorage.GetElement(new CashierSearchModel
-            {
-                Email = model.Email,
-            });
+			//проверка на наличие почты
+			if (string.IsNullOrEmpty(model.Email))
+			{
+				throw new ArgumentNullException("Отсутствие почты в учётной записи (логина)", nameof(model.Email));
+			}
 
-            // Если элемент найден и его Id не совпадает с Id переданного объекта
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Аккаунт с таким логином уже есть");
-            }
-        }
-    }
+			//проверка на наличие пароля
+			if (string.IsNullOrEmpty(model.Password))
+			{
+				throw new ArgumentNullException("Отсутствие пароля в учётной записи", nameof(model.Password));
+			}
+
+			_logger.LogInformation("Cashier. CashierName:{Name}. CashierSurname:{Surname}. CashierPatronymic:{Patronymic}. " +
+				"Email:{Email}. Password:{Password}. Id:{Id}",
+				model.Name, model.Surname, model.Patronymic, model.Email, model.Password, model.Id);
+
+			//для проверка на наличие такого же аккаунта
+			var element = _cashierStorage.GetElement(new CashierSearchModel
+			{
+				Email = model.Email,
+			});
+
+			//если элемент найден и его Id не совпадает с Id переданного объекта
+			if (element != null && element.Id != model.Id)
+			{
+				throw new InvalidOperationException("Аккаунт с таким логином уже есть");
+			}
+		}
+	}
 }
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Cashier/MoneyTransferLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Cashier/MoneyTransferLogic.cs
index 2ea9a60..e3714db 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Cashier/MoneyTransferLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Cashier/MoneyTransferLogic.cs
@@ -2,177 +2,168 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.BusinessLogicsContracts.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.StoragesModels.Cashier;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Cashier;
+using BankContracts.StoragesContracts.Client;
 using BankContracts.ViewModels.Cashier.ViewModels;
+using BankDataModels.Enums;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankBusinessLogic.BusinessLogic.Cashier
+namespace BankBusinessLogic.BusinessLogics.Cashier
 {
-	// Класс, реализующий бизнес-логику для перевода наличных
-	public class MoneyTransferLogic : IMoneyTransferLogic
-    {
-        private readonly ILogger _logger;
+    public class MoneyTransferLogic : IMoneyTransferLogic
+	{
+		private readonly ILogger _logger;
 
-        private readonly IMoneyTransferStorage _moneyTransferStorage;
+		private readonly IMoneyTransferStorage _moneyTransferStorage;
 
-        public readonly ICreditingStorage _creditingStorage;
+		public readonly ICreditingStorage _creditingStorage;
 
-        // Конструктор
-        public MoneyTransferLogic(ILogger<MoneyTransferLogic> logger, IMoneyTransferStorage moneyTransferStorage, ICreditingStorage creditingStorage)
-        {
-            _logger = logger;
-            _moneyTransferStorage = moneyTransferStorage;
-            _creditingStorage = creditingStorage;
-        }
+		public MoneyTransferLogic(ILogger<MoneyTransferLogic> logger, IMoneyTransferStorage moneyTransferStorage, ICreditingStorage creditingStorage)
+		{
+			_logger = logger;
+			_moneyTransferStorage = moneyTransferStorage;
+			_creditingStorage = creditingStorage;
+		}
 
-        // Вывод конкретной операции
-        public MoneyTransferViewModel? ReadElement(MoneyTransferSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
+		public MoneyTransferViewModel? ReadElement(MoneyTransferSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
 
-            _logger.LogInformation("ReadElement. AccountSenderId:{AccountSenderId}. AccountPayeeId:{AccountPayeeId}. Sum:{Sum}. Id:{Id}",
-                model.AccountSenderId, model.AccountPayeeId, model.Sum, model?.Id);
+			_logger.LogInformation("ReadElement. AccountSenderId:{AccountSenderId}. AccountPayeeId:{AccountPayeeId}. Sum:{Sum}. Id:{Id}", 
+				model.AccountSenderId, model.AccountPayeeId, model.Sum, model?.Id);
 
-            var element = _moneyTransferStorage.GetElement(model);
+			var element = _moneyTransferStorage.GetElement(model);
 
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
 
-                return null;
-            }
+				return null;
+			}
 
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
 
-            return element;
-        }
+			return element;
+		}
 
-        // Вывод всего списка операций на перевод наличных
-        public List<MoneyTransferViewModel>? ReadList(MoneyTransferSearchModel? model)
-        {
-            _logger.LogInformation("ReadElement. AccountSenderId:{AccountSenderId}. AccountPayeeId:{AccountPayeeId}. Sum:{Sum}. Id:{Id}",
-                model?.AccountSenderId, model?.AccountPayeeId, model?.Sum, model?.Id);
+		public List<MoneyTransferViewModel>? ReadList(MoneyTransferSearchModel? model)
+		{
+			_logger.LogInformation("ReadElement. AccountSenderId:{AccountSenderId}. AccountPayeeId:{AccountPayeeId}. Sum:{Sum}. Id:{Id}",
+				model?.AccountSenderId, model?.AccountPayeeId, model?.Sum, model?.Id);
 
-            // list хранит весь список в случае, если model пришло со значением null на вход метода
-            var list = model == null ? _moneyTransferStorage.GetFullList() : _moneyTransferStorage.GetFilteredList(model);
+			//list хранит весь список в случае, если model пришло со значением null на вход метода
+			var list = model == null ? _moneyTransferStorage.GetFullList() : _moneyTransferStorage.GetFilteredList(model);
 
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
 
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
 
-            return list;
-        }
+			return list;
+		}
 
-        // Создание операции на перевод
-        public bool Create(MoneyTransferBindingModel model)
-        {
-            CheckModel(model);
+		public bool Create(MoneyTransferBindingModel model)
+		{
+			CheckModel(model);
 
-            if (_moneyTransferStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
+			if (_moneyTransferStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
 
-                return false;
-            }
+				return false;
+			}
 
-            // Проверка на то, что это зачисление на карту, а не перевод между счетами
-            if (model.CreditingId.HasValue)
-            {
-                _creditingStorage.Update(new CreditingBindingModel
-                {
-                    Id = model.CreditingId.Value,
-                });
+			//проверка на то, что это зачисление на карту, а не перевод между счетами
+			if (model.CreditingId.HasValue)
+			{
+				_creditingStorage.Update(new CreditingBindingModel
+				{
+					Id = model.CreditingId.Value,
+					DateClose = DateTime.Now,
+					Status = StatusEnum.Закрыта
+				});
 
-            }
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        // Обновление операции на перевод
-        public bool Update(MoneyTransferBindingModel model)
-        {
-            CheckModel(model);
+		public bool Update(MoneyTransferBindingModel model)
+		{
+			CheckModel(model);
 
-            if (_moneyTransferStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
+			if (_moneyTransferStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
 
-                return false;
-            }
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        // Удаление операции на перевод
-        public bool Delete(MoneyTransferBindingModel model)
-        {
-            CheckModel(model, false);
+		public bool Delete(MoneyTransferBindingModel model)
+		{
+			CheckModel(model, false);
 
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+			_logger.LogInformation("Delete. Id:{Id}", model.Id);
 
-            if (_moneyTransferStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
+			if (_moneyTransferStorage.Delete(model) == null)
+			{
+				_logger.LogWarning("Delete operation failed");
 
-                return false;
-            }
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        // Проверка входного аргумента для методов Insert, Update и Delete
-        private void CheckModel(MoneyTransferBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
+		//проверка входного аргумента для методов Insert, Update и Delete
+		private void CheckModel(MoneyTransferBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
 
-            // Так как при удалении передаём как параметр false
-            if (!withParams)
-            {
-                return;
-            }
+			//так как при удалении передаём как параметр false
+			if (!withParams)
+			{
+				return;
+			}
 
-            // Проверка корректности Id счёта отправителя
-            if (model.AccountSenderId < 0)
-            {
-                throw new ArgumentNullException("Отсутствие Id у счёта отправителя", nameof(model.AccountSenderId));
-            }
+			//проверка корректности Id счёта отправителя
+			if (model.AccountSenderId < 0)
+			{
+				throw new ArgumentNullException("Отсутствие Id у счёта отправителя", nameof(model.AccountSenderId));
+			}
 
-            // Проверка корректности Id счёта получателя
-            if (model.AccountPayeeId < 0)
-            {
-                throw new ArgumentNullException("Отсутствие Id у счёта получателя", nameof(model.AccountPayeeId));
-            }
+			//проверка корректности Id счёта получателя
+			if (model.AccountPayeeId < 0)
+			{
+				throw new ArgumentNullException("Отсутствие Id у счёта получателя", nameof(model.AccountPayeeId));
+			}
 
-            // Проверка на корректную сумму перевода
-            if (model.Sum <= 0)
-            {
-                throw new ArgumentNullException("Сумма перевода не может раняться нулю или быть меньше его", nameof(model.Sum));
-            }
+			//проверка на корректную сумму перевода
+			if (model.Sum <= 0)
+			{
+				throw new ArgumentNullException("Сумма перевода не может раняться нулю или быть меньше его", nameof(model.Sum));
+			}
 
-            // Проверка на корректную дату открытия счёта
-            if (model.DateTransfer > DateTime.Now)
-            {
-                throw new ArgumentNullException("Дата операции не может быть ранее текущей", nameof(model.DateTransfer));
-            }
+			//проверка на корректную дату открытия счёта
+			if (model.DateOperation > DateTime.Now)
+			{
+				throw new ArgumentNullException("Дата операции не может быть ранее текущей", nameof(model.DateOperation));
+			}
 
-            _logger.LogInformation("ReadElement. AccountSenderId:{AccountSenderId}. AccountPayeeId:{AccountPayeeId}. Sum:{Sum}. DateTransfer:{DateTransfer}. Id:{Id}",
-                model.AccountSenderId, model.AccountPayeeId, model.Sum, model.DateTransfer, model?.Id);
-        }
-    }
+			_logger.LogInformation("ReadElement. AccountSenderId:{AccountSenderId}. AccountPayeeId:{AccountPayeeId}. Sum:{Sum}. DateOperation:{DateOperation}. Id:{Id}",
+				model.AccountSenderId, model.AccountPayeeId, model.Sum, model.DateOperation, model?.Id);
+		}
+	}
 }
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Client/CardLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Client/CardLogic.cs
index fca6451..4ad7c21 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Client/CardLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Client/CardLogic.cs
@@ -1,36 +1,26 @@
-using BankContracts.BindingModels.Client;
-using BankContracts.BusinessLogicsContracts.Cashier;
+using Microsoft.Extensions.Logging;
+using BankContracts.ViewModels.Client.Diagram;
+using BankDataModels.Enums;
 using BankContracts.BusinessLogicsContracts.Client;
-using BankContracts.SearchModels.Cashier;
+using BankContracts.StoragesContracts.Client;
+using BankContracts.BusinessLogicsContracts.Cashier;
+using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankContracts.SearchModels.Cashier;
 
-namespace BankBusinessLogic.BusinessLogic.Client
+namespace BankBusinessLogic.BusinessLogics.Client
 {
-	// Класс, реализующий бизнес-логику для банковских карт
-	public class CardLogic : ICardLogic
+    public class CardLogic : ICardLogic
     {
         private readonly ILogger _logger;
-
         private readonly ICardStorage _cardStorage;
-
         private readonly IAccountLogic _accountLogic;
-
         private readonly IDebitingLogic _debitingLogic;
-
         private readonly ICreditingLogic _creditingLogic;
 
-        // Конструктор
         public CardLogic(ILogger<CardLogic> logger, ICardStorage cardStorage, IAccountLogic accountLogic,
-            IDebitingLogic debitingLogic, ICreditingLogic creditingLogic)
-        {
+            IDebitingLogic debitingLogic, ICreditingLogic creditingLogic) {
             _logger = logger;
             _cardStorage = cardStorage;
             _accountLogic = accountLogic;
@@ -38,138 +28,123 @@ namespace BankBusinessLogic.BusinessLogic.Client
             _creditingLogic = creditingLogic;
         }
 
-        // Вывод конкретной банковской карты
+		public bool Create(CardBindingModel model)
+        {
+            CheckModel(model);
+            if (_cardStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Delete(CardBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_cardStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+
         public CardViewModel? ReadElement(CardSearchModel model)
         {
             if (model == null)
             {
                 throw new ArgumentNullException(nameof(model));
             }
-
             _logger.LogInformation("ReadElement. CardNumber:{Number}.Id:{ Id}", model.Number, model.Id);
-            
             var element = _cardStorage.GetElement(model);
-            
             if (element == null)
             {
                 _logger.LogWarning("ReadElement element not found");
                 return null;
             }
-
             _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            
             return element;
         }
 
-        // Вывод всего списка банковских карт
         public List<CardViewModel>? ReadList(CardSearchModel? model)
         {
             _logger.LogInformation("ReadList. CardId:{Id}", model?.Id);
-
-			// list хранит весь список в случае, если model пришло со значением null на вход метода
-			var list = model == null ? _cardStorage.GetFullList() : _cardStorage.GetFilteredList(model);
-            
+            var list = model == null ? _cardStorage.GetFullList() : _cardStorage.GetFilteredList(model);
             if (list == null)
             {
                 _logger.LogWarning("ReadList return null list");
                 return null;
             }
-
             _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            
             return list;
         }
 
-        // Создание банковской карты
-        public bool Create(CardBindingModel model)
+        public bool Update(CardBindingModel model)
         {
             CheckModel(model);
-
-            if (_cardStorage.Insert(model) == null)
+            if (_cardStorage.Update(model) == null)
             {
-                _logger.LogWarning("Insert operation failed");
+                _logger.LogWarning("Update operation failed");
                 return false;
             }
-
             return true;
         }
 
-		// Обновление банковской карты
-		public bool Update(CardBindingModel model)
-		{
-            CheckModel(model);
+        public List<ClientDiagramElementsViewModel> GetMonthInfo(int CardId) {
 
-			if (_cardStorage.Update(model) == null)
-			{
-				_logger.LogWarning("Update operation failed");
-				return false;
-			}
-
-			return true;
-		}
-
-		// Удаление банковской карты
-		public bool Delete(CardBindingModel model)
-        {
-            CheckModel(model, false);
-
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-
-            if (_cardStorage.Delete(model) == null)
+            Dictionary<(int?, int?), int> debitings = _debitingLogic.ReadList(new DebitingSearchModel()
             {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
+                CardId = CardId,
+                Status = StatusEnum.Закрыта
+            }).GroupBy(x => new { x.DateClose?.Month, x.DateClose?.Year })
+            .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));
+            Dictionary<(int?, int?), int> creditings = _creditingLogic.ReadList(new CreditingSearchModel()
+            {
+                CardId = CardId,
+                Status = StatusEnum.Закрыта
+            }).GroupBy(x => new { x.DateClose?.Month, x.DateClose?.Year })
+            .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));
 
-            return true;
+            List<ClientDiagramElementsViewModel> result = new();
+            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);
+                result.Add(new ClientDiagramElementsViewModel() { Name = Enum.GetName(typeof(Months), key.Item1) + " " + key.Item2.ToString(), Value = sum});
+            }
+            return result;
         }
 
-		// Проверка входного аргумента для методов Insert, Update и Delete
-		private void CheckModel(CardBindingModel model, bool withParams = true)
+        private void CheckModel(CardBindingModel model, bool withParams = true)
         {
             if (model == null)
             {
                 throw new ArgumentNullException(nameof(model));
             }
-
-			// Так как при удалении передаём как параметр false
-			if (!withParams)
+            if (!withParams)
             {
                 return;
             }
-
-            // Проверка на наличие номера у банковской карты
             if (string.IsNullOrEmpty(model.Number) || model.Number.Length != 16)
             {
                 throw new ArgumentNullException("Неправильный номер карты", nameof(model.Number));
             }
-
-			// Проверка баланса банковской карты (чтобы не было отрицательным)
-			if (model.Balance < 0)
-			{
-				throw new ArgumentNullException("Изначальный баланс карты не может быть < 0", nameof(model.Balance));
-			}
-
-			// Проверка на конкретный период действия карты
-			if (model.Period < DateTime.Now)
+            if (string.IsNullOrEmpty(model.CVC) || model.CVC.Length != 3)
+            {
+                throw new ArgumentNullException("Неправильный СVC карты", nameof(model.CVC));
+            }
+            if (model.Period < DateTime.Now)
             {
                 throw new ArgumentNullException("Нет периода действия", nameof(model.Period));
             }
-
-			// Проверка на наличие id клиента, получившего карту (лишним не будет)
-			if (model.ClientId < 0)
-			{
-				throw new ArgumentNullException("Некорректный Id кассира, открывшего счёт", nameof(model.ClientId));
-			}
-
-			// Для проверка на наличие такой же банковской карты
-			var cardElement = _cardStorage.GetElement(new CardSearchModel
+            var cardElement = _cardStorage.GetElement(new CardSearchModel
             {
                 Number = model.Number,
             });
 
-			// Если элемент найден и его Id не совпадает с Id переданного объекта
-			if (cardElement != null && cardElement.Id != model.Id)
+            if (cardElement != null && cardElement.Id != model.Id)
             {
                 throw new InvalidOperationException("Карта с таким ноиером уже есть");
             }
@@ -177,17 +152,16 @@ namespace BankBusinessLogic.BusinessLogic.Client
             var accountElement = _accountLogic.ReadElement(new AccountSearchModel
             {
                 Id = model.AccountId,
-                ClientId = model.ClientId
+                ClientId = model.ClientID
             });
 
-			// Проверка привязан ли счёт к данному клиенту
-			if (accountElement != null && accountElement.ClientId != model.ClientId)
+            if (accountElement != null && accountElement.ClientId != model.ClientID)
             {
-                throw new InvalidOperationException("Это не счёт данного клиента");
-            }
+				throw new InvalidOperationException("Это не счёт данного клиента");
+			}
 
-            _logger.LogInformation("Card. Number:{Number}.ClientId:{ClientID}.Patronymic:{Period}.Id:{Id}",
-                model.Number, model.Period.ToString(), model.ClientId, model.Id);
+            _logger.LogInformation("Card. Number:{Number}.CVC:{CVC}.ClientId:{ClientID}.Patronymic:{Period}.Id:{Id}",
+                model.Number, model.CVC, model.Period.ToString(), model.ClientID, model.Id);
         }
     }
 }
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Client/ClientLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Client/ClientLogic.cs
index 5628782..ceac6d0 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Client/ClientLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Client/ClientLogic.cs
@@ -1,186 +1,126 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.BusinessLogicsContracts.Client;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Client;
 using BankContracts.ViewModels.Client.ViewModels;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
-namespace BankBusinessLogic.BusinessLogic.Client
+namespace BankBusinessLogic.BusinessLogics.Client
 {
-    // Класс, реализующий бизнес-логику для клиентов
     public class ClientLogic : IClientLogic
     {
         private readonly ILogger _logger;
-
         private readonly IClientStorage _clientStorage;
 
-        // Конструктор
-        public ClientLogic(ILogger<ClientLogic> logger, IClientStorage clientStorage)
-        {
+        public ClientLogic(ILogger<ClientLogic> logger, IClientStorage clientStorage) {
             _logger = logger;
             _clientStorage = clientStorage;
         }
 
-        // Вывод конкретного клиента
+        public bool Create(ClientBindingModel model)
+        {
+            CheckModel(model);
+            if (_clientStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Delete(ClientBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_clientStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+
         public ClientViewModel? ReadElement(ClientSearchModel model)
         {
             if (model == null)
             {
                 throw new ArgumentNullException(nameof(model));
             }
-
-            _logger.LogInformation("ReadElement. Name:{Name}.Surname:{Surname}.Patronymic:{Patronymic}.Id:{Id}", model.Name, model.Surname, model.Patronymic, model.Id);
+            _logger.LogInformation("ReadElement. Name:{Name}.Surname:{Surname}.Patronymic:{Patronymic}.Id:{ Id}", model.Name, model.Surname, model.Patronymic, model.Id);
             var element = _clientStorage.GetElement(model);
-
             if (element == null)
             {
-                _logger.LogWarning("Read element not found");
+                _logger.LogWarning("ReadElement element not found");
                 return null;
             }
-
             _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
             return element;
         }
 
-        // Вывод отфильтрованного списка
-        public List<ClientViewModel>? ReadList(ClientSearchModel model)
+        public List<ClientViewModel>? ReadList(ClientSearchModel? model)
         {
             _logger.LogInformation("ReadList. ClientId:{Id}", model?.Id);
-
-            // list хранит весь список в случае, если model пришло со значением null на вход метода
             var list = model == null ? _clientStorage.GetFullList() : _clientStorage.GetFilteredList(model);
-
             if (list == null)
             {
                 _logger.LogWarning("ReadList return null list");
                 return null;
             }
-
             _logger.LogInformation("ReadList. Count:{Count}", list.Count);
             return list;
         }
 
-        // Создание клиента
-        public bool Create(ClientBindingModel model)
-        {
-            CheckModel(model);
-
-            if (_clientStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-
-            return true;
-        }
-
-        // Обновление клиента
         public bool Update(ClientBindingModel model)
         {
             CheckModel(model);
-
             if (_clientStorage.Update(model) == null)
             {
                 _logger.LogWarning("Update operation failed");
                 return false;
             }
-
             return true;
         }
 
-        // Удаление клиента
-        public bool Delete(ClientBindingModel model)
-        {
-            CheckModel(model, false);
-
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-
-            if (_clientStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-
-            return true;
-        }
-
-        // Проверка входного аргумента для методов Insert, Update и Delete
-        public void CheckModel(ClientBindingModel model, bool withParams = true)
+        private void CheckModel(ClientBindingModel model, bool withParams = true)
         {
             if (model == null)
             {
                 throw new ArgumentNullException(nameof(model));
             }
-
-            // При удалении параметру withParams передаём false
             if (!withParams)
             {
                 return;
             }
-
-            // Проверка на наличие имени клиента
             if (string.IsNullOrEmpty(model.Name))
             {
                 throw new ArgumentNullException("Нет имени пользователя", nameof(model.Name));
             }
-
-            // Проверка на наличие фамилии клиента
             if (string.IsNullOrEmpty(model.Surname))
             {
                 throw new ArgumentNullException("Нет фамилии пользователя", nameof(model.Surname));
             }
-
-            // Проверка на наличие отчества клиента
             if (string.IsNullOrEmpty(model.Patronymic))
             {
                 throw new ArgumentNullException("Нет отчества пользователя", nameof(model.Patronymic));
             }
-
-            // Проверка на наличие электронной почты
             if (string.IsNullOrEmpty(model.Email))
             {
                 throw new ArgumentNullException("Нет почты пользователя", nameof(model.Email));
             }
-
-            // Проверка на наличие пароля
             if (string.IsNullOrEmpty(model.Password))
             {
                 throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
             }
-
-            // Проверка на наличие мобильного телефона
-            if (string.IsNullOrEmpty(model.MobilePhone))
+            if (string.IsNullOrEmpty(model.Telephone))
             {
-                throw new ArgumentNullException("Нет моб.телефона пользователя", nameof(model.MobilePhone));
+                throw new ArgumentNullException("Нет телефона пользователя", nameof(model.Telephone));
             }
-
-            if (!Regex.IsMatch(model.Email, @"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$", RegexOptions.IgnoreCase))
-            {
-                throw new ArgumentException("Некорректная почта", nameof(model.Email));
-            }
-
-            if (!Regex.IsMatch(model.Password, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase)
-                && model.Password.Length < 10 && model.Password.Length > 50)
-            {
-                throw new ArgumentException("Необходимо придумать другой пароль", nameof(model.Password));
-            }
-
-            _logger.LogInformation("Client. Name:{Name}.Surname:{Surname}.Patronymic:{Patronymic}.Email:{Email}.Password:{Password}.Mobeliphone:{MobilePhone}.Id:{Id}",
-                model.Name, model.Surname, model.Patronymic, model.Email, model.Password, model.MobilePhone, model.Id);
-
-            // Для проверка на наличие такого же аккаунта
+            _logger.LogInformation("Client. Name:{Name}.Surname:{Surname}.Patronymic:{Patronymic}.Email:{Email}.Password:{Password}.Telephone:{Telephone}.Id:{Id}",
+                model.Name, model.Surname, model.Patronymic, model.Email, model.Password, model.Telephone, model.Id);
             var element = _clientStorage.GetElement(new ClientSearchModel
             {
                 Email = model.Email,
             });
-
-            // Если элемент найден и его Id не совпадает с Id переданного объекта
             if (element != null && element.Id != model.Id)
             {
                 throw new InvalidOperationException("Клиент с такой почтой уже есть");
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Client/CreditingLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Client/CreditingLogic.cs
index e7e2c7e..ba30bdc 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Client/CreditingLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Client/CreditingLogic.cs
@@ -1,81 +1,38 @@
-using BankContracts.BindingModels.Client;
+using Microsoft.Extensions.Logging;
+using BankDataModels.Enums;
 using BankContracts.BusinessLogicsContracts.Client;
-using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Client;
+using BankContracts.BindingModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankContracts.SearchModels.Client;
 
-namespace BankBusinessLogic.BusinessLogic.Client
+namespace BankBusinessLogic.BusinessLogics.Client
 {
-	// Класс, реализующий бизнес-логику для пополнения карты
-	public class CreditingLogic : ICreditingLogic
+    public class CreditingLogic : ICreditingLogic
     {
         private readonly ILogger _logger;
-
         private readonly ICreditingStorage _creditingStorage;
-
         private readonly ICardStorage _cardStorage;
 
-        // Конструктор
-        public CreditingLogic(ILogger<CreditingLogic> logger, ICreditingStorage creditingStorage, ICardStorage cardStorage)
-        {
+        public CreditingLogic(ILogger<CreditingLogic> logger, ICreditingStorage creditingStorage, ICardStorage cardStorage) {
             _logger = logger;
             _creditingStorage = creditingStorage;
             _cardStorage = cardStorage;
         }
 
-		// Вывод конкретной операции на пополнение
-		public CreditingViewModel? ReadElement(CreditingSearchModel model)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-
-			_logger.LogInformation("ReadElement. CreditingId:{ Id }", model.Id);
-
-			var element = _creditingStorage.GetElement(model);
-
-			if (element == null)
-			{
-				_logger.LogWarning("ReadElement element not found");
-				return null;
-			}
-
-			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-
-			return element;
-		}
-
-		// Вывод всего списка операций на пополнение
-		public List<CreditingViewModel>? ReadList(CreditingSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. CreditingId:{Id}", model?.Id);
-
-			// list хранит весь список в случае, если model пришло со значением null на вход метода
-			var list = model == null ? _creditingStorage.GetFullList() : _creditingStorage.GetFilteredList(model);
-
-			if (list == null)
-			{
-				_logger.LogWarning("ReadList return null list");
-				return null;
-			}
-
-			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
-
-			return list;
-		}
-
-		// Создание операции на пополнение
-		public bool Create(CreditingBindingModel model)
+        public bool Create(CreditingBindingModel model)
         {
             CheckModel(model);
 
+            if (!CheckCardPeriod(model))
+            {
+                model.Status = StatusEnum.Карта_просрочена;
+            }
+            else
+            {
+				model.Status = StatusEnum.Открыта;
+			}
+
             if (_creditingStorage.Insert(model) == null)
             {
                 _logger.LogWarning("Insert operation failed");
@@ -83,73 +40,101 @@ namespace BankBusinessLogic.BusinessLogic.Client
                 return false;
             }
 
-            return true;
+			return true;
         }
 
-		// Обновление операции на пополнение
-		public bool Update(CreditingBindingModel model)
-		{
-			CheckModel(model);
-
-			if (_creditingStorage.Update(model) == null)
-			{
-				_logger.LogWarning("Update operation failed");
-				return false;
-			}
-
-			return true;
-		}
-
-		// Удаление операции на пополнение
-		public bool Delete(CreditingBindingModel model)
+        public bool Delete(CreditingBindingModel model)
         {
             CheckModel(model, false);
-
             _logger.LogInformation("Delete. Id:{Id}", model.Id);
-
             if (_creditingStorage.Delete(model) == null)
             {
                 _logger.LogWarning("Delete operation failed");
                 return false;
             }
-
             return true;
         }
 
-		// Проверка входного аргумента для методов Insert, Update и Delete
-		private void CheckModel(CreditingBindingModel model, bool withParams = true)
+        public CreditingViewModel? ReadElement(CreditingSearchModel model)
         {
             if (model == null)
             {
                 throw new ArgumentNullException(nameof(model));
             }
+            _logger.LogInformation("ReadElement. CreditingId:{ Id }", model.Id);
+            var element = _creditingStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
 
-			// Так как при удалении передаём как параметр false
-			if (!withParams)
+        public List<CreditingViewModel>? ReadList(CreditingSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. CreditingId:{Id}", model?.Id);
+            var list = model == null ? _creditingStorage.GetFullList() : _creditingStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+
+        public bool Update(CreditingBindingModel model)
+        {
+            CheckModel(model);
+            if (_creditingStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        private void CheckModel(CreditingBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
             {
                 return;
             }
-
-			// Проверка на корректность Id клиента банковской карты
-			if (model.ClientId < 0)
-			{
-				throw new ArgumentNullException("Некорректный Id клиента", nameof(model.ClientId));
-			}
-
-			// Проверка на корректность суммы пополнения
-			if (model.Sum <= 0)
+            if (model.Sum <= 0)
             {
                 throw new ArgumentNullException("Сумма операции должна быть больше 0", nameof(model.Sum));
             }
-
-			// Проверка на корректную дату операции
-			if (model.DateCredit > DateTime.Now)
+            if (model.DateOpen > DateTime.Now)
             {
-                throw new ArgumentNullException("Дата не может быть меньше текущего времени", nameof(model.DateCredit));
+                throw new ArgumentNullException("Дата не может быть меньше текущего времени", nameof(model.DateOpen));
             }
-
+            
             _logger.LogInformation("Crediting. Sum:{Sum}.CardId:{CardId}.Date:{date}.Id:{Id}",
-                model.Sum, model.CardId, model.DateCredit.ToString(), model.Id);
+                model.Sum, model.CardId, model.DateOpen.ToString(), model.Id);
         }
-    }
+
+		//проверка карты на просроченность
+		bool CheckCardPeriod(CreditingBindingModel model)
+		{
+			var card = _cardStorage.GetElement(new CardSearchModel
+			{
+				Id = model.CardId
+			});
+
+			//если карта просрочена
+			if (card.Period < DateTime.Now)
+			{
+				return false;
+			}
+
+
+			return true;
+		}
+	}
 }
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Client/DebitingLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Client/DebitingLogic.cs
index 7bd07b2..436eb8d 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Client/DebitingLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Client/DebitingLogic.cs
@@ -1,19 +1,14 @@
-using BankContracts.BindingModels.Client;
+using Microsoft.Extensions.Logging;
+using BankDataModels.Enums;
 using BankContracts.BusinessLogicsContracts.Client;
+using BankContracts.StoragesContracts.Client;
+using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankBusinessLogic.BusinessLogic.Client
+namespace BankBusinessLogic.BusinessLogics.Client
 {
-	// Класс, реализующий бизнес-логику для снятия наличных с карты
-	public class DebitingLogic : IDebitingLogic
+    public class DebitingLogic : IDebitingLogic
     {
         private readonly ILogger _logger;
 
@@ -21,62 +16,26 @@ namespace BankBusinessLogic.BusinessLogic.Client
 
         private readonly ICardStorage _cardStorage;
 
-        // Конструктор
-        public DebitingLogic(ILogger<DebitingLogic> logger, IDebitingStorage debitingStorage, ICardStorage cardStorage)
-        {
+        public DebitingLogic(ILogger<DebitingLogic> logger, IDebitingStorage debitingStorage, ICardStorage cardStorage) {
             _logger = logger;
             _debitingStorage = debitingStorage;
             _cardStorage = cardStorage;
         }
 
-		// Вывод конкретной операции на снятие наличных
-		public DebitingViewModel? ReadElement(DebitingSearchModel model)
-		{
-			if (model == null)
-			{
-				throw new ArgumentNullException(nameof(model));
-			}
-
-			_logger.LogInformation("ReadElement. DebitingId:{ Id }", model.Id);
-
-			var element = _debitingStorage.GetElement(model);
-
-			if (element == null)
-			{
-				_logger.LogWarning("ReadElement element not found");
-				return null;
-			}
-
-			_logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-
-			return element;
-		}
-
-		// Вывод всего списка операций на снятие наличных
-		public List<DebitingViewModel>? ReadList(DebitingSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. DebitingId:{Id}", model?.Id);
-
-			// list хранит весь список в случае, если model пришло со значением null на вход метода
-			var list = model == null ? _debitingStorage.GetFullList() : _debitingStorage.GetFilteredList(model);
-
-			if (list == null)
-			{
-				_logger.LogWarning("ReadList return null list");
-				return null;
-			}
-
-			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
-
-			return list;
-		}
-
-		// Создание операции на снятие наличных
-		public bool Create(DebitingBindingModel model)
+        public bool Create(DebitingBindingModel model)
         {
             CheckModel(model);
 
-            if (_debitingStorage.Insert(model) == null)
+            if (!CheckCardPeriod(model))
+            {
+                model.Status = StatusEnum.Карта_просрочена;
+            }
+            else
+            {
+				model.Status = StatusEnum.Открыта;
+			}
+
+			if (_debitingStorage.Insert(model) == null)
             {
                 _logger.LogWarning("Insert operation failed");
                 return false;
@@ -85,71 +44,100 @@ namespace BankBusinessLogic.BusinessLogic.Client
             return true;
         }
 
-		// Обновление операции на снятие наличных
-		public bool Update(DebitingBindingModel model)
-		{
-			CheckModel(model);
-
-			if (_debitingStorage.Update(model) == null)
-			{
-				_logger.LogWarning("Update operation failed");
-
-				return false;
-			}
-
-			return true;
-		}
-
-		// Удаление операции на снятие наличных
-		public bool Delete(DebitingBindingModel model)
+        public bool Delete(DebitingBindingModel model)
         {
             CheckModel(model, false);
-
             _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            
             if (_debitingStorage.Delete(model) == null)
             {
                 _logger.LogWarning("Delete operation failed");
                 return false;
             }
+            return true;
+        }
+
+        public DebitingViewModel? ReadElement(DebitingSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement. DebitingId:{ Id }", model.Id);
+            var element = _debitingStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+
+        public List<DebitingViewModel>? ReadList(DebitingSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. DebitingId:{Id}", model?.Id);
+            var list = model == null ? _debitingStorage.GetFullList() : _debitingStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+
+        public bool Update(DebitingBindingModel model)
+        {
+            CheckModel(model);
+
+            if (_debitingStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+
+                return false;
+            }
 
             return true;
         }
 
-		// Проверка входного аргумента для методов Insert, Update и Delete
-		private void CheckModel(DebitingBindingModel model, bool withParams = true)
+        private void CheckModel(DebitingBindingModel model, bool withParams = true)
         {
             if (model == null)
             {
                 throw new ArgumentNullException(nameof(model));
             }
-
-			// Так как при удалении передаём как параметр false
-			if (!withParams)
+            if (!withParams)
             {
                 return;
             }
-
-			// Проверка на корректность Id клиента банковской карты
-			if (model.ClientId < 0)
-			{
-				throw new ArgumentNullException("Некорректный Id клиента", nameof(model.ClientId));
-			}
-
-			// Проверка на корректность снятия суммы
-			if (model.Sum <= 0)
+            if (model.Sum <= 0)
             {
                 throw new ArgumentNullException("Сумма операции должна быть больше 0", nameof(model.Sum));
             }
+            if (model.DateClose < model.DateOpen)
+            {
+                throw new ArgumentNullException("Дата закрытия не может быть меньше даты открытия", nameof(model.DateClose));
+            }
+            
+            _logger.LogInformation("Debiting. Sum:{Sum}.CardId:{CardId}.DateOpen:{DateOpen}.DateOpen:{DateOpen}.Id:{Id}",
+                model.Sum, model.CardId, model.DateOpen.ToString(), model.DateClose.ToString(), model.Id);
+        }
 
-			// Проверка на корректную дату операции
-			if (model.DateDebit > DateTime.Now)
+        //проверка карты на просроченность
+		bool CheckCardPeriod(DebitingBindingModel model)
+		{
+			var card = _cardStorage.GetElement(new CardSearchModel
 			{
-				throw new ArgumentNullException("Дата не может быть меньше текущего времени", nameof(model.DateDebit));
+				Id = model.CardId
+			});
+
+			//если карта просрочена
+			if (card.Period < DateTime.Now)
+			{
+				return false;
 			}
 
-			_logger.LogInformation("Debiting. Sum:{Sum}.CardId:{CardId}.DateDebit:{DateDebit}.Id:{Id}",
-                model.Sum, model.CardId, model.DateDebit.ToString(),  model.Id);
-        }
-    }
+			return true;
+		}
+	}
 }
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Reports/ReportCashierLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Reports/ReportCashierLogic.cs
index 64b77b0..17ebf9a 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Reports/ReportCashierLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Reports/ReportCashierLogic.cs
@@ -1,85 +1,83 @@
-using BankBusinessLogic.OfficePackage;
+using BankBusinessLogic.MailWorker;
+using BankBusinessLogic.OfficePackage;
 using BankBusinessLogic.OfficePackage.HelperModels;
 using BankContracts.BindingModels.Reports;
 using BankContracts.BusinessLogicsContracts.Reports;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Cashier;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Cashier;
+using BankContracts.StoragesContracts.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using BankContracts.ViewModels.Reports.Cashier;
 using BankContracts.ViewModels.Reports;
-using BankDatabaseImplement.Implements.ClientImplements;
+using BankContracts.ViewModels.Reports.Cashier;
 using BankDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankBusinessLogic.BusinessLogic.Reports
+namespace BankBusinessLogic.BusinessLogics.Reports
 {
-	public class ReportCashierLogic : IReportCashierLogic
+    public class ReportCashierLogic : IReportCashierLogic
 	{
 		private readonly IMoneyTransferStorage _moneyTransferStorage;
 		private readonly ICashWithdrawalStorage _cashWithdrawalStorage;
-		private readonly IDebitingStorage _debitingStorage;
-
 		private readonly IClientStorage _clientStorage;
+		private readonly IDebitingStorage _debitingStorage;
 		private readonly ICardStorage _cardStorage;
 
 		private readonly AbstractSaveToExcel _saveToExcel;
 		private readonly AbstractSaveToWord _saveToWord;
 		private readonly AbstractSaveToPdf _saveToPdf;
 
-		// Конструктор
-		public ReportCashierLogic(IMoneyTransferStorage moneyTransferStorage, ICashWithdrawalStorage cashWithdrawalStorage, 
-			IDebitingStorage debitingStorage, IClientStorage clientStorage, ICardStorage cardStorage,
-			AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+        private readonly MailKitWorker _mailKitWorker;
+
+        //инициализируем поля класса через контейнер
+        public ReportCashierLogic(IMoneyTransferStorage moneyTransferStorage, ICashWithdrawalStorage cashWithdrawalStorage,
+			IClientStorage clientStorage, AbstractSaveToExcel saveToExcel, 
+			AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf, 
+			IDebitingStorage debitingStorage, ICardStorage cardStorage, MailKitWorker mailKitWorker)
 		{
 			_moneyTransferStorage = moneyTransferStorage;
 			_cashWithdrawalStorage = cashWithdrawalStorage;
-			_debitingStorage = debitingStorage;
-
-			_clientStorage = clientStorage;
-			_cardStorage = cardStorage;
 
 			_saveToExcel = saveToExcel;
 			_saveToWord = saveToWord;
 			_saveToPdf = saveToPdf;
+			_clientStorage = clientStorage;
+			_debitingStorage = debitingStorage;
+			_cardStorage = cardStorage;
+
+			_mailKitWorker = mailKitWorker;
 		}
 
-		// Формирование списка переводов между счетами
+		//формирование списка переводов между счетами за период
 		public List<ReportCashierViewModel>? GetMoneyTransfers(ReportBindingModel model)
 		{
-			return _moneyTransferStorage.GetFilteredList(new MoneyTransferSearchModel { ClientId = model.ClientId, DateTransfer = model.DateTo })
+			return _moneyTransferStorage.GetFilteredList(new MoneyTransferSearchModel { ClientId = model.ClientId, DateFrom = model.DateFrom, DateTo = model.DateTo})
 				.Select(x => new ReportCashierViewModel
 				{
 					OperationId = x.Id,
-					DateComplite = x.DateTransfer,
-					AccountSenderNumber = x.AccountPayeeNumber,
-					AccountPayeeNumber = x.AccountSenderNumber,
+					DateComplite = x.DateOperation,
+					AccountPayeeNumber = x.AccountPayeeNumber,
+					AccountSenderNumber = x.AccountSenderNumber,
 					SumOperation = x.Sum
 				})
 				.ToList();
 		}
 
-		// Формирование списка выдачи наличных со счёта
+		//формирование списка выдаци наличных со счёта за период
 		public List<ReportCashierViewModel>? GetCashWithrawals(ReportBindingModel model)
 		{
-			return _cashWithdrawalStorage.GetFilteredList(new CashWithdrawalSearchModel { ClientId = model.ClientId, DateWithdrawal = model.DateTo })
+			return _cashWithdrawalStorage.GetFilteredList(new CashWithdrawalSearchModel { ClientId = model.ClientId, DateFrom = model.DateFrom, DateTo = model.DateTo })
 				.Select(x => new ReportCashierViewModel
 				{
 					OperationId = x.Id,
 					DebitingId = x.DebitingId,
 					AccountPayeeNumber = x.AccountNumber,
-					DateComplite = x.DateWithdrawal,
+					DateComplite = x.DateOperation,
 					SumOperation = x.Sum
 				})
 				.ToList();
 		}
 
-		// Формирование списка выдачи наличных со счёта за период
+		//формирование списка выдаци наличных со счёта за период
 		public List<DebitingViewModel>? GetDebitings(ReportBindingModel model)
 		{
 			List<int> CardIdList = new();
@@ -89,14 +87,14 @@ namespace BankBusinessLogic.BusinessLogic.Reports
 				AccountId = model.AccountId
 			});
 
-			foreach (var index in list)
+			foreach(var index in list)
 			{
 				CardIdList.Add(index.Id);
 			}
 
 			List<DebitingViewModel> totalList = new();
 
-			foreach (var index in CardIdList)
+			foreach(var index in CardIdList)
 			{
 				var result = _debitingStorage.GetFilteredList(new DebitingSearchModel
 				{
@@ -104,12 +102,12 @@ namespace BankBusinessLogic.BusinessLogic.Reports
 				});
 
 				totalList.AddRange(result);
-			}
+			}	
 
 			return totalList;
 		}
 
-		// Формирование полного имени клиента для отчёта
+		//формирование полного имени клиента для отчёта
 		public string GetFullName(ReportBindingModel model)
 		{
 			var client = _clientStorage.GetElement(new ClientSearchModel
@@ -120,22 +118,100 @@ namespace BankBusinessLogic.BusinessLogic.Reports
 			return client.Surname + " " + client.Name + " " + client.Patronymic;
 		}
 
-		// Сохранение счетов в файл-Word
-		public void SaveAccountsToWordFile(ReportBindingModel model)
+        //Сохранение мороженных в файл-Word
+        public void SaveAccountsToWordFile(ReportBindingModel model)
 		{
-			throw new NotImplementedException();
+			_saveToWord.CreateDoc(new WordInfo
+			{
+				FileName = model.FileName,
+
+				Title = "Заявки на снятия со счёта",
+
+				Debiting = GetDebitings(model)
+			}, OfficeOperationEnum.Для_кассира);
+
+			byte[] word = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт по зявкам на снятие.docx");
+
+			File.Delete("../BankRestAPI/Отчёт по зявкам на снятие.docx");
+
+			_mailKitWorker.SendMailAsync(new()
+			{
+				MailAddress = model.Email,
+				Subject = "Отчёт по счетам",
+				Text = $"Отчёт по состоянию на {DateTime.Now.ToString()}",
+				File = word,
+				Role = model.Role,
+				TypeDoc = TypeDocEnum.WORD
+			});
 		}
 
-		// Сохранение счетов в файл-Excel
+		//Сохранение заготовок с указаеним изделий в файл-Excel
 		public void SaveAccountsToExcelFile(ReportBindingModel model)
 		{
-			throw new NotImplementedException();
+			_saveToExcel.CreateReport(new ExcelInfo
+			{
+				FileName = model.FileName,
+
+				Title = "Заявки на счёт",
+
+				Debiting = GetDebitings(model)
+			}, OfficeOperationEnum.Для_кассира);
+
+			byte[] excel = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт по зявкам на снятие.xlsx");
+
+			File.Delete("../BankRestAPI/Отчёт по зявкам на снятие.xlsx");
+
+			_mailKitWorker.SendMailAsync(new()
+			{
+				MailAddress = model.Email,
+				Subject = "Отчёт по счетам",
+				Text = $"Отчёт по состоянию на {DateTime.Now.ToString()}",
+				File = excel,
+				Role = model.Role,
+				TypeDoc = TypeDocEnum.EXCEL
+			});
 		}
 
-		// Сохранение счетов в файл-Pdf
+		//Сохранение заказов в файл-Pdf
 		public ReportCashierViewModelForHTML SaveAccountsToPdfFile(ReportBindingModel model)
 		{
-			throw new NotImplementedException();
+			var listMoneyTransfers = GetMoneyTransfers(model);
+			var listCashWithdrawals = GetCashWithrawals(model);
+
+			_saveToPdf.CreateDoc(new PdfInfo
+			{
+				ForClient = false,
+				FileName = model.FileName,
+				FullClientName = GetFullName(model),
+				Title = "Отчёт по операциям списаний со счёта и переводов между счетами",
+				DateFrom = model.DateFrom!.Value,
+				DateTo = model.DateTo!.Value,
+				ReportMoneyTransfer = listMoneyTransfers,
+				ReportCashWithdrawal = listCashWithdrawals
+			});
+
+            byte[] pdf = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт_по_счетам.pdf");
+
+			File.Delete("../BankRestAPI/Отчёт_по_счетам.pdf");
+
+			_mailKitWorker.SendMailAsync(new()
+            {
+                MailAddress = model.Email,
+                Subject = "Отчёт по счетам",
+                Text = $"За период с {model.DateFrom} " +
+                    $"по {model.DateTo}.",
+                File = pdf,
+                Role = model.Role,
+				TypeDoc = TypeDocEnum.PDF
+            });
+
+            //возврат полученных списков для отображения на вебе
+            return new ReportCashierViewModelForHTML
+			{
+				ReportCashWithdrawal = listCashWithdrawals,
+
+				ReportMoneyTransfer = listMoneyTransfers
+			};
 		}
 	}
 }
diff --git a/Bank/BankBusinessLogic/BusinessLogic/Reports/ReportClientLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/Reports/ReportClientLogic.cs
index 7c182b7..05d96c1 100644
--- a/Bank/BankBusinessLogic/BusinessLogic/Reports/ReportClientLogic.cs
+++ b/Bank/BankBusinessLogic/BusinessLogic/Reports/ReportClientLogic.cs
@@ -1,114 +1,114 @@
-using BankBusinessLogic.OfficePackage;
-using BankBusinessLogic.OfficePackage.HelperModels;
-using BankContracts.BindingModels.Reports;
+using BankBusinessLogic.OfficePackage.HelperModels;
+using BankBusinessLogic.OfficePackage;
+using BankDataModels.Enums;
+using BankBusinessLogic.MailWorker;
 using BankContracts.BusinessLogicsContracts.Reports;
-using BankContracts.SearchModels.Cashier;
+using BankContracts.StoragesContracts.Client;
+using BankContracts.StoragesContracts.Cashier;
+using BankContracts.ViewModels.Reports.Client;
+using BankContracts.BindingModels.Reports;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Cashier;
-using BankContracts.StoragesModels.Client;
 using BankContracts.ViewModels.Cashier.ViewModels;
+using BankContracts.SearchModels.Cashier;
 using BankContracts.ViewModels.Client.ViewModels;
 using BankContracts.ViewModels.Reports;
-using BankContracts.ViewModels.Reports.Client;
-using BankDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankBusinessLogic.BusinessLogic.Reports
+namespace BankBusinessLogic.BusinessLogics.Reports
 {
-	public class ReportClientLogic : IReportClientLogic
-	{
-		private readonly IMoneyTransferStorage _moneyTransferStorage;
-		private readonly ICreditingStorage _creditingStorage;
-		private readonly IDebitingStorage _debitingStorage;
+    public class ReportClientLogic : IReportClientLogic
+    {
+        private readonly ICreditingStorage _creditingStorage;
+        private readonly IDebitingStorage _debitingStorage;
+        private readonly ICardStorage _cardStorage;
+        private readonly IMoneyTransferStorage _moneyTransferStorage;
+        private readonly IClientStorage _clientStorage;
 
-		private readonly IClientStorage _clientStorage;
-		private readonly ICardStorage _cardStorage;
+        private readonly AbstractSaveToExcel _saveToExcel;
+        private readonly AbstractSaveToWord _saveToWord;
+        private readonly AbstractSaveToPdf _saveToPdf;
 
-		private readonly AbstractSaveToExcel _saveToExcel;
-		private readonly AbstractSaveToWord _saveToWord;
-		private readonly AbstractSaveToPdf _saveToPdf;
+        private readonly MailKitWorker _mailKitWorker;
 
-		// Конструктор
-		public ReportClientLogic(IMoneyTransferStorage moneyTransferStorage,ICreditingStorage creditingStorage, 
-			IDebitingStorage debitingStorage, IClientStorage clientStorage, ICardStorage cardStorage, 
-			AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
-		{
-			_moneyTransferStorage = moneyTransferStorage;
-			_creditingStorage = creditingStorage;
-			_debitingStorage = debitingStorage;
+        public ReportClientLogic(ICreditingStorage creditingStorage, IDebitingStorage debitingStorage,
+            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf,
+            ICardStorage cardStorage, IMoneyTransferStorage moneyTransferStorage, 
+            MailKitWorker mailKitWorker, IClientStorage clientStorage)
+        {
+            _creditingStorage = creditingStorage;
+            _debitingStorage = debitingStorage;
+            _cardStorage = cardStorage;
+            _moneyTransferStorage = moneyTransferStorage;
+            _clientStorage = clientStorage;
 
-			_clientStorage = clientStorage;
-			_cardStorage = cardStorage;
+            _saveToExcel = saveToExcel;
+            _saveToWord = saveToWord;
+            _saveToPdf = saveToPdf;
 
-			_saveToExcel = saveToExcel;
-			_saveToWord = saveToWord;
-			_saveToPdf = saveToPdf;
-		}
+			_mailKitWorker = mailKitWorker;
+        }
 
-		public List<ReportClientViewModel>? GetCrediting(ReportBindingModel model)
-		{
-			return _creditingStorage.GetFilteredList(new CreditingSearchModel
-			{
-				DateCrediting = model.DateFrom,
-			}).Select(x => new ReportClientViewModel
-			{
-				OperationId = x.Id,
+        public List<ReportClientViewModel>? GetCrediting(ReportBindingModel model)
+        {
+            return _creditingStorage.GetFilteredList(new CreditingSearchModel
+            {
+                DateFrom = model.DateFrom,
+                DateTo = model.DateTo,
+            }).Select(x => new ReportClientViewModel
+            {
+                OperationId = x.Id,
 				CardNumber = x.CardNumber,
 				SumOperation = x.Sum,
-				DateComplite = x.DateCredit
-			}).ToList();
-		}
+                DateComplite = x.DateOpen
+            }).ToList();
+        }
 
-		public List<ReportClientViewModel>? GetDebiting(ReportBindingModel model)
-		{
-			return _debitingStorage.GetFilteredList(new DebitingSearchModel
-			{
-				DateDebit = model.DateFrom,
-			}).Select(x => new ReportClientViewModel
-			{
-				OperationId = x.Id,
-				CardNumber = x.CardNumber,
-				SumOperation = x.Sum,
-				DateComplite = x.DateDebit
-			}).ToList();
-		}
+        public List<ReportClientViewModel>? GetDebiting(ReportBindingModel model)
+        {
+            return _debitingStorage.GetFilteredList(new DebitingSearchModel
+            {
+                DateTo = model.DateFrom,
+                DateFrom = model.DateTo,
+            }).Select(x => new ReportClientViewModel
+            {
+                OperationId = x.Id,
+                CardNumber = x.CardNumber,
+                SumOperation = x.Sum,
+                DateComplite = x.DateClose
+            }).ToList();
+        }
 
-		// Для Excel отчёта по переводам между счетов
-		public List<MoneyTransferViewModel>? GetMoneyTransfer(ReportBindingModel model)
-		{
-			// Список счетов по выбранным картам
-			List<int> accountId = new();
+        //для excel отчёта по переводам между счетов
+        public List<MoneyTransferViewModel>? GetMoneyTransfer(ReportBindingModel model)
+        {
+            //список счетов по выбранным картам
+            List<int> accountId = new();
 
-			foreach (var index in model.CardList)
-			{
-				accountId.Add(_cardStorage.GetElement(new CardSearchModel { Id = index }).AccountId);
-			}
+            foreach(var index in model.CardList)
+            {
+                accountId.Add(_cardStorage.GetElement(new CardSearchModel { Id = index}).AccountId);
+            }
 
-			var list = accountId.ToHashSet().ToList();
+            var list = accountId.ToHashSet().ToList();
 
-			List<MoneyTransferViewModel> totalList = new();
+            List<MoneyTransferViewModel> totalList = new();
 
-			foreach (var index in list)
-			{
+            foreach (var index in list)
+            {
 				var result = _moneyTransferStorage.GetFilteredList(new MoneyTransferSearchModel
 				{
 					AccountSenderId = index,
-					AccountPayeeId = index
+                    AccountPayeeId = index
 				}).OrderBy(x => x.AccountSenderId).ToList();
 
-				totalList.AddRange(result);
+                totalList.AddRange(result);
 			}
 
-			return totalList;
-		}
+            return totalList;
+        }
 
-		// Для Excel отчёта по пополнениям карты
+		//для excel отчёта по пополнениям карты
 		public List<CreditingViewModel> GetExcelCrediting(ReportBindingModel model)
-		{
+        {
 			List<CreditingViewModel> totalList = new();
 
 			foreach (var index in model.CardList)
@@ -124,7 +124,7 @@ namespace BankBusinessLogic.BusinessLogic.Reports
 			return totalList;
 		}
 
-		// Для Excel отчёта по снятиям с карты
+		//для excel отчёта по снятиям с карты
 		public List<DebitingViewModel> GetExcelDebiting(ReportBindingModel model)
 		{
 			List<DebitingViewModel> totalList = new();
@@ -142,22 +142,158 @@ namespace BankBusinessLogic.BusinessLogic.Reports
 			return totalList;
 		}
 
-		// Сохранение в файл-Excel для клиентов
-		public void SaveToExcelFile(ReportBindingModel model, OfficeOperationEnum operationEnum)
-		{
-			throw new NotImplementedException();
+        public void SaveToExcelFile(ReportBindingModel model, OfficeOperationEnum operationEnum)
+        {
+			byte[] excel = Array.Empty<byte>();
+
+			if (operationEnum == OfficeOperationEnum.Между_cчетами)
+            {
+				_saveToExcel.CreateReport(new ExcelInfo
+				{
+					FileName = model.FileName,
+                    Title = "Отчёт по переводам",
+					MoneyTransfer = GetMoneyTransfer(model)
+				}, operationEnum);
+
+				excel = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт по переводам.xlsx");
+
+				File.Delete("../BankRestAPI/Отчёт по переводам.xlsx");
+			}
+
+			if (operationEnum == OfficeOperationEnum.Пополнение_карт)
+			{
+                _saveToExcel.CreateReport(new ExcelInfo
+                {
+                    FileName = model.FileName,
+                    Title = "Отчёт по пополнениям (переводам из налички на карту)",
+                    Crediting = GetExcelCrediting(model)
+                }, operationEnum);
+
+				excel = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт по пополнениям.xlsx");
+
+				File.Delete("../BankRestAPI/Отчёт по пополнениям.xlsx");
+			}
+
+			if (operationEnum == OfficeOperationEnum.Cнятие_с_карты)
+			{
+				_saveToExcel.CreateReport(new ExcelInfo
+				{
+					FileName = model.FileName,
+					Title = "Отчёт по снятиям денежных средств",
+					Debiting = GetExcelDebiting(model)
+				}, operationEnum);
+
+				excel = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт по снятиям.xlsx");
+
+				File.Delete("../BankRestAPI/Отчёт по снятиям.xlsx");
+			}
+
+			_mailKitWorker.SendMailAsync(new()
+			{
+				MailAddress = model.Email,
+				Subject = "Отчёт по картам",
+				Text = $"Отчёт по состоянию на {DateTime.Now.ToString()}",
+				File = excel,
+				Role = model.Role,
+				TypeDoc = TypeDocEnum.EXCEL
+			});
 		}
 
-		// Сохранение в файл-Word для клиентов
-		public void SaveToWordFile(ReportBindingModel model, OfficeOperationEnum operationEnum)
-		{
-			throw new NotImplementedException();
+        public void SaveToWordFile(ReportBindingModel model, OfficeOperationEnum operationEnum)
+        {
+			byte[] word = Array.Empty<byte>();
+
+			if (operationEnum == OfficeOperationEnum.Между_cчетами)
+			{
+				_saveToWord.CreateDoc(new WordInfo
+				{
+					FileName = model.FileName,
+					Title = "Отчёт по переводам",
+					MoneyTransfer = GetMoneyTransfer(model)
+				}, operationEnum);
+
+				word = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт по переводам.docx");
+
+				File.Delete("../BankRestAPI/Отчёт по переводам.docx");
+			}
+
+			if (operationEnum == OfficeOperationEnum.Пополнение_карт)
+			{
+				_saveToWord.CreateDoc(new WordInfo
+				{
+					FileName = model.FileName,
+					Title = "Отчёт по пополнениям (переводам из налички на карту)",
+					Crediting = GetExcelCrediting(model)
+				}, operationEnum);
+
+				word = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт по пополнениям.docx");
+
+				File.Delete("../BankRestAPI/Отчёт по пополнениям.docx");
+			}
+
+			if (operationEnum == OfficeOperationEnum.Cнятие_с_карты)
+			{
+				_saveToWord.CreateDoc(new WordInfo
+				{
+					FileName = model.FileName,
+					Title = "Отчёт по снятиям денежных средств",
+					Debiting = GetExcelDebiting(model)
+				}, operationEnum);
+
+				word = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт по снятиям.docx");
+
+				File.Delete("../BankRestAPI/Отчёт по снятиям.docx");
+			}
+
+			_mailKitWorker.SendMailAsync(new()
+			{
+				MailAddress = model.Email,
+				Subject = "Отчёт по картам",
+				Text = $"Отчёт по состоянию на {DateTime.Now.ToString()}",
+				File = word,
+				Role = model.Role,
+				TypeDoc = TypeDocEnum.WORD
+			});
 		}
 
-		// Сохранение в файл-Pdf для клиента
+        //отчёт в формате PDF для клиента
 		public ReportClientViewModelForHTML SaveClientReportToPdfFile(ReportBindingModel model)
 		{
-			throw new NotImplementedException();
+            var listCreditings = GetCrediting(model);
+            var listDebitings = GetDebiting(model);
+
+			_saveToPdf.CreateDoc(new PdfInfo
+			{
+				FileName = model.FileName,
+				Title = "Отчёт по операциям с картами",
+				DateFrom = model.DateFrom!.Value,
+				DateTo = model.DateTo!.Value,
+				ReportCrediting = listCreditings,
+                ReportDebiting = listDebitings
+            });
+
+            byte[] pdf = System.IO.File.ReadAllBytes("../BankRestAPI/Отчёт_по_картам.pdf");
+
+			_mailKitWorker.SendMailAsync(new()
+            {
+                MailAddress = model.Email,
+                Subject = "Отчёт по картам",
+                Text = $"За период с {model.DateFrom} " +
+                    $"по {model.DateTo}.",
+                File = pdf,
+                Role = model.Role,
+				TypeDoc = TypeDocEnum.PDF
+			});
+
+			File.Delete("../BankRestAPI/Отчёт_по_картам.pdf");
+
+			//возврат полученных списков для отображения на вебе
+			return new ReportClientViewModelForHTML
+            {
+                ReportCrediting = listCreditings,
+
+                ReportDebiting = listDebitings
+            };
 		}
 	}
 }
diff --git a/Bank/BankBusinessLogic/MailWorker/MailKitWorker.cs b/Bank/BankBusinessLogic/MailWorker/MailKitWorker.cs
index e4aada9..5f31083 100644
--- a/Bank/BankBusinessLogic/MailWorker/MailKitWorker.cs
+++ b/Bank/BankBusinessLogic/MailWorker/MailKitWorker.cs
@@ -1,19 +1,24 @@
-using BankContracts.BindingModels.Messages;
-using BankDataModels.Enums;
+using BankContracts.BusinessLogicsContracts;
+using BankContracts.BindingModels;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Net.Mail;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
+using MailKit.Net.Pop3;
+using MailKit.Security;
+using BankDataModels.Enums;
+using DocumentFormat.OpenXml.EMMA;
+using BankContracts.BindingModels.Messages;
 
 namespace BankBusinessLogic.MailWorker
 {
-    // Класс, отвечающий за отправку письма на почту
-    public class MailKitWorker
-    {
+    //класс, отвечающий за отправку письма
+	public class MailKitWorker
+	{
         private string _mailLogin = string.Empty;
 
         private string _mailPassword = string.Empty;
@@ -24,22 +29,21 @@ namespace BankBusinessLogic.MailWorker
 
         private readonly ILogger logger;
 
-        // Конструктор
         public MailKitWorker(ILogger<MailKitWorker> logger)
         {
             this.logger = logger;
         }
 
-        public void MailConfig(MailConfigBindingModel model)
+        public void MailConfig(MailConfigBindingModel config)
         {
-            _mailLogin = model.MailLogin;
-            _mailPassword = model.MailPassword;
-            _smtpClientHost= model.SmtpClientHost;
-            _smtpClientPort = model.SmtpClientPort;
+            _mailLogin = config.MailLogin;
+            _mailPassword = config.MailPassword;
+            _smtpClientHost = config.SmtpClientHost;
+            _smtpClientPort = config.SmtpClientPort;
         }
 
         public async void SendMailAsync(MailSendInfoBindingModel info)
-        {
+		{
             using var objMailMessage = new MailMessage();
             using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
 
@@ -52,42 +56,42 @@ namespace BankBusinessLogic.MailWorker
                 objMailMessage.SubjectEncoding = Encoding.UTF8;
                 objMailMessage.BodyEncoding = Encoding.UTF8;
 
-                MemoryStream memory = new(info.File);
+                MemoryStream ms = new(info.File);
 
-                if (info.Role == MailsEnum.Клиент)
+                if(info.Role == MailsEnum.Клиент)
                 {
-                    if (info.TypeDoc == TypeDocEnum.PDF)
+                    if(info.TypeDoc == TypeDocEnum.PDF)
                     {
-                        objMailMessage.Attachments.Add(new Attachment(memory, "Отчёт_для_клиента.pdf", "application/pdf"));
-                    }
+						objMailMessage.Attachments.Add(new Attachment(ms, "Отчёт_для_клиента.pdf", "application/pdf"));
+					}
 
-                    if (info.TypeDoc == TypeDocEnum.EXCEL)
-                    {
-                        objMailMessage.Attachments.Add(new Attachment(memory, "Отчёт_для_клиента.xlsx", "application/xlsx"));
-                    }
+					if (info.TypeDoc == TypeDocEnum.EXCEL)
+					{
+						objMailMessage.Attachments.Add(new Attachment(ms, "Отчёт_для_клиента.xlsx", "application/xlsx"));
+					}
 
-                    if (info.TypeDoc == TypeDocEnum.WORD)
-                    {
-                        objMailMessage.Attachments.Add(new Attachment(memory, "Отчёт_для_клиента.docx", "application/docx"));
-                    }
-                }
+					if (info.TypeDoc == TypeDocEnum.WORD)
+					{
+						objMailMessage.Attachments.Add(new Attachment(ms, "Отчёт_для_клиента.docx", "application/docx"));
+					}
+				}
                 else
                 {
-                    if (info.TypeDoc == TypeDocEnum.PDF)
-                    {
-                        objMailMessage.Attachments.Add(new Attachment(memory, "Отчёт_для_кассира.pdf", "application/pdf"));
-                    }
+					if (info.TypeDoc == TypeDocEnum.PDF)
+					{
+						objMailMessage.Attachments.Add(new Attachment(ms, "Отчёт_для_кассира.pdf", "application/pdf"));
+					}
 
-                    if (info.TypeDoc == TypeDocEnum.EXCEL)
-                    {
-                        objMailMessage.Attachments.Add(new Attachment(memory, "Отчёт_для_кассира.xlsx", "application/xlsx"));
-                    }
+					if (info.TypeDoc == TypeDocEnum.EXCEL)
+					{
+						objMailMessage.Attachments.Add(new Attachment(ms, "Отчёт_для_кассира.xlsx", "application/xlsx"));
+					}
 
-                    if (info.TypeDoc == TypeDocEnum.WORD)
-                    {
-                        objMailMessage.Attachments.Add(new Attachment(memory, "Отчёт_для_кассира.docx", "application/docx"));
-                    }
-                }
+					if (info.TypeDoc == TypeDocEnum.WORD)
+					{
+						objMailMessage.Attachments.Add(new Attachment(ms, "Отчёт_для_кассира.docx", "application/docx"));
+					}
+				}
 
                 objSmtpClient.UseDefaultCredentials = false;
                 objSmtpClient.EnableSsl = true;
@@ -101,6 +105,5 @@ namespace BankBusinessLogic.MailWorker
                 throw;
             }
         }
-
-    }
+	}
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
index 2faec2e..8df28cd 100644
--- a/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -9,622 +9,624 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage
 {
-	public abstract class AbstractSaveToExcel
-	{
-        // Создание отчета. Описание методов ниже
+    public abstract class AbstractSaveToExcel
+    {
+        //Создание отчета. Описание методов ниже
         public void CreateReport(ExcelInfo info, OfficeOperationEnum operationEnum)
         {
-            if (operationEnum == OfficeOperationEnum.Между_cчетами)
-            {
-                CreateMoneyTransferExcel(info);
-            }
-
-            if (operationEnum == OfficeOperationEnum.Пополнение_карт)
-            {
-                CreateCreditingExcel(info);
-            }
-
-            if (operationEnum == OfficeOperationEnum.Cнятие_с_карты)
-            {
-                CreateDebitingExcel(info);
-            }
-
-            if (operationEnum == OfficeOperationEnum.Для_кассира)
-            {
-                CreateCashierExcel(info);
-            }
-        }
-
-        private void CreateMoneyTransferExcel(ExcelInfo info)
-        {
-            CreateExcel(info);
-
-            // Вставляет заголовок
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            // Соединяет 3 ячейки для заголовка
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-
-            // Номер строчки в докуметне
-            uint rowIndex = 2;
-
-            foreach (var mt in info.MoneyTransfer)
-            {
-                // Вставляет номер перевода
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Перевод №" + mt.Id,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                rowIndex++;
-
-                // Строчка с номером счёта отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Номер счёта отправителя: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = mt.AccountSenderNumber,
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-
-                // Строчка с номером счёта получателя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Номер счёта получателя: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = mt.AccountPayeeNumber,
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-
-                // Вставляет слово "Сумма перевода"
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Сумма перевода: ",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                // Подсчитывает общее кол-во сумму
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = mt.Sum.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                rowIndex++;
-
-                // Вставляет слово "Сумма перевода"
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Дата операции: ",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                // Подсчитывает общее кол-во переводов
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = mt.DateTransfer.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                rowIndex++;
-            }
-
-            rowIndex++;
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = rowIndex,
-                Text = "Суммарный объём переводов: ",
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A" + rowIndex.ToString(),
-                CellToName = "B" + rowIndex.ToString()
-            });
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "C",
-                RowIndex = rowIndex,
-                Text = info.MoneyTransfer.Sum(x => x.Sum).ToString(),
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            SaveExcel(info);
-        }
-
-        private void CreateCreditingExcel(ExcelInfo info)
-        {
-            CreateExcel(info);
-
-            // Вставляет заголовок операции
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            // Соединяет 3 ячейки для заголовка
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "E2"
-            });
-
-            // Номер строчки в докуметне
-            uint rowIndex = 3;
-
-            foreach (var cr in info.Crediting)
-            {
-                // Вставляет номер перевода
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Пополнение №" + cr.Id,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                rowIndex++;
-
-                // Строчка с номером счёта отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Номер карты: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = cr.CardNumber,
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-
-                // Строчка с номером счёта получателя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Сумма пополнения: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = cr.Sum.ToString(),
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-            }
-
-            rowIndex++;
-
-            // Формирование списка поступления по каждой карте
-            var dict = new Dictionary<string, double>();
-
-            foreach (var elem in info.Crediting)
-            {
-                if (dict.ContainsKey(elem.CardNumber))
-                {
-                    dict[elem.CardNumber] += elem.Sum;
-                }
-                else
-                {
-                    dict[elem.CardNumber] = elem.Sum;
-                }
-            }
-
-            foreach (var elem in dict)
-            {
-                // Cтрочка с номером счёта получателя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Сумма пополнения на карту №" + elem.Key + ":",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = elem.Value.ToString(),
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-            }
-
-            rowIndex++;
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = rowIndex,
-                Text = "Суммарный объём пополнений: ",
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A" + rowIndex.ToString(),
-                CellToName = "B" + rowIndex.ToString()
-            });
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "C",
-                RowIndex = rowIndex,
-                Text = info.Crediting.Sum(x => x.Sum).ToString(),
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            SaveExcel(info);
-        }
-
-        private void CreateDebitingExcel(ExcelInfo info)
-        {
-            CreateExcel(info);
-
-            // Вставляет заголовок
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            // Соединяет 3 ячейки для заголовка
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "E2"
-            });
-
-            // Номер строчки в докуметне
-            uint rowIndex = 3;
-
-            foreach (var cr in info.Debiting)
-            {
-                // Вставляет номер перевода
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Снятие №" + cr.Id,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                rowIndex++;
-
-                // Строчка с номером счёта отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Номер карты: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = cr.CardNumber,
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-
-                // Строчка с номером счёта получателя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Сумма снятия: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = cr.Sum.ToString(),
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-            }
-
-            rowIndex++;
-
-            // Формирование списка поступления по каждой карте
-            var dict = new Dictionary<string, double>();
-
-            foreach (var elem in info.Debiting)
-            {
-                if (dict.ContainsKey(elem.CardNumber))
-                {
-                    dict[elem.CardNumber] += elem.Sum;
-                }
-                else
-                {
-                    dict[elem.CardNumber] = elem.Sum;
-                }
-            }
-
-            foreach (var elem in dict)
-            {
-                // Строчка с номером счёта получателя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Сумма снятия с карты №" + elem.Key + ":",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = elem.Value.ToString(),
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-            }
-
-            rowIndex++;
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = rowIndex,
-                Text = "Суммарный объём снятий: ",
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A" + rowIndex.ToString(),
-                CellToName = "B" + rowIndex.ToString()
-            });
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "C",
-                RowIndex = rowIndex,
-                Text = info.Debiting.Sum(x => x.Sum).ToString(),
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            SaveExcel(info);
-        }
-
-        private void CreateCashierExcel(ExcelInfo info)
-        {
-            CreateExcel(info);
-
-            // Вставляет заголовок
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            // Соединяет 3 ячейки для заголовка
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "E2"
-            });
-
-            // Номер строчки в докуметне
-            uint rowIndex = 3;
-
-            foreach (var cr in info.Debiting)
-            {
-                // Вставляет номер перевода
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Заявка №" + cr.Id,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                rowIndex++;
-
-                // Строчка с номером счёта получателя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Сумма заявки: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка суммы заявки
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = cr.Sum.ToString(),
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-
-                // Строчка с номером счёта получателя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Статус: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                // Вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = cr.Status.ToString(),
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-
-                //строчка с номером счёта получателя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "B",
-                    RowIndex = rowIndex,
-                    Text = "Дата: ",
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                //вставка номера отправителя
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = cr.DateDebit == null ? "В обработке" : cr.DateDebit.ToString(),
-                    StyleInfo = ExcelStyleInfoType.TextWithBorder
-                });
-
-                rowIndex++;
-            }
-
-            rowIndex++;
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = rowIndex,
-                Text = "Суммарный объём открытых заявок на снятие: ",
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A" + rowIndex.ToString(),
-                CellToName = "C" + rowIndex.ToString()
-            });
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "D",
-                RowIndex = rowIndex,
-                Text = info.Debiting.Where(x => x.Status == StatusCard.Открыта).Sum(x => x.Sum).ToString(),
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            rowIndex += 2;
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = rowIndex,
-                Text = "Суммарный объём закртытых заявок на снятие: ",
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A" + rowIndex.ToString(),
-                CellToName = "C" + rowIndex.ToString()
-            });
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "D",
-                RowIndex = rowIndex,
-                Text = info.Debiting.Where(x => x.Status == StatusCard.Закрыта).Sum(x => x.Sum).ToString(),
-                StyleInfo = ExcelStyleInfoType.Text
-            });
-
-            SaveExcel(info);
-        }
-
-        // Создание excel-файла
-        protected abstract void CreateExcel(ExcelInfo info);
-
-        // Добавляем новую ячейку в лист
+			if(operationEnum == OfficeOperationEnum.Между_cчетами)
+			{
+				CreateMoneyTransferExcel(info);
+			}
+
+			if (operationEnum == OfficeOperationEnum.Пополнение_карт)
+			{
+				CreateCreditingExcel(info);
+			}
+
+			if (operationEnum == OfficeOperationEnum.Cнятие_с_карты)
+			{
+				CreateDebitingExcel(info);
+			}
+
+			if (operationEnum == OfficeOperationEnum.Для_кассира)
+			{
+				CreateCashierExcel(info);
+			}
+		}
+
+		private void CreateMoneyTransferExcel(ExcelInfo info)
+		{
+			CreateExcel(info);
+
+			//вставляет заголовок
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = 1,
+				Text = info.Title,
+				StyleInfo = ExcelStyleInfoType.Title
+			});
+
+			//соединяет 3 ячейки для заголовка
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A1",
+				CellToName = "C1"
+			});
+
+			//номер строчки в докуметне
+			uint rowIndex = 2;
+
+			foreach (var mt in info.MoneyTransfer)
+			{
+				//вставляет номер перевода
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "A",
+					RowIndex = rowIndex,
+					Text = "Перевод №" + mt.Id,
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Номер счёта отправителя: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = mt.AccountSenderNumber,
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта получателя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Номер счёта получателя: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = mt.AccountPayeeNumber,
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+
+				//Вставляет слово "Сумма перевода"
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "A",
+					RowIndex = rowIndex,
+					Text = "Сумма перевода: ",
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				//подсчитывает общее кол-во заготовок в изделии
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = mt.Sum.ToString(),
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				rowIndex++;
+
+				//Вставляет слово "Сумма перевода"
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "A",
+					RowIndex = rowIndex,
+					Text = "Дата операции: ",
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				//подсчитывает общее кол-во заготовок в изделии
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = mt.DateOperation.ToString(),
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				rowIndex++;
+			}
+
+			rowIndex++;
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = rowIndex,
+				Text = "Суммарный объём переводов: ",
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A" + rowIndex.ToString(),
+				CellToName = "B" + rowIndex.ToString()
+			});
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "C",
+				RowIndex = rowIndex,
+				Text = info.MoneyTransfer.Sum(x => x.Sum).ToString(),
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			SaveExcel(info);
+		}
+
+		private void CreateCreditingExcel(ExcelInfo info)
+		{
+			CreateExcel(info);
+
+			//вставляет заголовок
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = 1,
+				Text = info.Title,
+				StyleInfo = ExcelStyleInfoType.Title
+			});
+
+			//соединяет 3 ячейки для заголовка
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A1",
+				CellToName = "E2"
+			});
+
+			//номер строчки в докуметне
+			uint rowIndex = 3;
+
+			//string supportNumber = string.Empty;
+
+			foreach (var cr in info.Crediting)
+			{
+				//вставляет номер перевода
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "A",
+					RowIndex = rowIndex,
+					Text = "Пополнение №" + cr.Id,
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Номер карты: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = cr.CardNumber,
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта получателя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Сумма пополнения: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = cr.Sum.ToString(),
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+			}
+
+			rowIndex++;
+
+			//формирование списка поступления по каждой карте
+			var dict = new Dictionary<string, int>();
+
+			foreach(var elem in info.Crediting)
+			{
+				if (dict.ContainsKey(elem.CardNumber))
+				{
+					dict[elem.CardNumber] += elem.Sum;
+				}
+				else
+				{
+					dict[elem.CardNumber] = elem.Sum;
+				}
+			}
+			
+			foreach(var elem in  dict)
+			{
+				//строчка с номером счёта получателя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Сумма пополнения на карту №" + elem.Key + ":",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = elem.Value.ToString(),
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+			}
+
+			rowIndex++;
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = rowIndex,
+				Text = "Суммарный объём пополнений: ",
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A" + rowIndex.ToString(),
+				CellToName = "B" + rowIndex.ToString()
+			});
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "C",
+				RowIndex = rowIndex,
+				Text = info.Crediting.Sum(x => x.Sum).ToString(),
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			SaveExcel(info);
+		}
+
+		private void CreateDebitingExcel(ExcelInfo info)
+		{
+			CreateExcel(info);
+
+			//вставляет заголовок
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = 1,
+				Text = info.Title,
+				StyleInfo = ExcelStyleInfoType.Title
+			});
+
+			//соединяет 3 ячейки для заголовка
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A1",
+				CellToName = "E2"
+			});
+
+			//номер строчки в докуметне
+			uint rowIndex = 3;
+
+			foreach (var cr in info.Debiting)
+			{
+				//вставляет номер перевода
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "A",
+					RowIndex = rowIndex,
+					Text = "Снятие №" + cr.Id,
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Номер карты: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = cr.CardNumber,
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта получателя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Сумма снятия: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = cr.Sum.ToString(),
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+			}
+
+			rowIndex++;
+
+			//формирование списка поступления по каждой карте
+			var dict = new Dictionary<string, int>();
+
+			foreach (var elem in info.Debiting)
+			{
+				if (dict.ContainsKey(elem.CardNumber))
+				{
+					dict[elem.CardNumber] += elem.Sum;
+				}
+				else
+				{
+					dict[elem.CardNumber] = elem.Sum;
+				}
+			}
+
+			foreach (var elem in dict)
+			{
+				//строчка с номером счёта получателя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Сумма снятия с карты №" + elem.Key + ":",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = elem.Value.ToString(),
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+			}
+
+			rowIndex++;
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = rowIndex,
+				Text = "Суммарный объём снятий: ",
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A" + rowIndex.ToString(),
+				CellToName = "B" + rowIndex.ToString()
+			});
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "C",
+				RowIndex = rowIndex,
+				Text = info.Debiting.Sum(x => x.Sum).ToString(),
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			SaveExcel(info);
+		}
+
+		private void CreateCashierExcel(ExcelInfo info)
+		{
+			CreateExcel(info);
+
+			//вставляет заголовок
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = 1,
+				Text = info.Title,
+				StyleInfo = ExcelStyleInfoType.Title
+			});
+
+			//соединяет 3 ячейки для заголовка
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A1",
+				CellToName = "E2"
+			});
+
+			//номер строчки в докуметне
+			uint rowIndex = 3;
+
+			foreach (var cr in info.Debiting)
+			{
+				//вставляет номер перевода
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "A",
+					RowIndex = rowIndex,
+					Text = "Заявка №" + cr.Id,
+					StyleInfo = ExcelStyleInfoType.Text
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта получателя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Сумма заявки: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка суммы заявки
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = cr.Sum.ToString(),
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта получателя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Статус: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = cr.Status.ToString(),
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+
+				//строчка с номером счёта получателя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "B",
+					RowIndex = rowIndex,
+					Text = "Дата: ",
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				//вставка номера отправителя
+				InsertCellInWorksheet(new ExcelCellParameters
+				{
+					ColumnName = "C",
+					RowIndex = rowIndex,
+					Text = cr.DateClose == null ? "В обработке" : cr.DateClose.ToString(),
+					StyleInfo = ExcelStyleInfoType.TextWithBorder
+				});
+
+				rowIndex++;
+			}
+
+			rowIndex++;
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = rowIndex,
+				Text = "Суммарный объём открытых заявок на снятие: ",
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A" + rowIndex.ToString(),
+				CellToName = "C" + rowIndex.ToString()
+			});
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "D",
+				RowIndex = rowIndex,
+				Text = info.Debiting.Where(x => x.Status == StatusEnum.Открыта).Sum(x => x.Sum).ToString(),
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			rowIndex += 2;
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "A",
+				RowIndex = rowIndex,
+				Text = "Суммарный объём закртытых заявок на снятие: ",
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			MergeCells(new ExcelMergeParameters
+			{
+				CellFromName = "A" + rowIndex.ToString(),
+				CellToName = "C" + rowIndex.ToString()
+			});
+
+			InsertCellInWorksheet(new ExcelCellParameters
+			{
+				ColumnName = "D",
+				RowIndex = rowIndex,
+				Text = info.Debiting.Where(x => x.Status == StatusEnum.Закрыта).Sum(x => x.Sum).ToString(),
+				StyleInfo = ExcelStyleInfoType.Text
+			});
+
+			SaveExcel(info);
+		}
+
+		//Создание excel-файла
+		protected abstract void CreateExcel(ExcelInfo info);
+
+        //Добавляем новую ячейку в лист
         protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
 
-        // Объединение ячеек
+        //Объединение ячеек
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
 
-        // Сохранение файла
+        //Сохранение файла
         protected abstract void SaveExcel(ExcelInfo info);
     }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
index 05f9c8d..c4ab81a 100644
--- a/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -8,169 +8,173 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage
 {
-	public abstract class AbstractSaveToPdf
-	{
-        // Публичный метод создания документа. Описание методов ниже
+    public abstract class AbstractSaveToPdf
+    {
+        //публичный метод создания документа. Описание методов ниже
         public void CreateDoc(PdfInfo info)
         {
-            if (info.ForClient)
-            {
-                CreateDocClient(info);
-            }
-            else
-            {
-                CreateDocCashier(info);
-            }
-        }
+            if(info.ForClient)
+			{
+				CreateDocClient(info);
+			}
+			else
+			{
+				CreateDocCashier(info);
+			}
+		}
 
-        // Отчёт для клиента
+		#region Отчёт для клиента
 
-        public void CreateDocClient(PdfInfo info)
-        {
-            CreatePdf(info);
+		public void CreateDocClient(PdfInfo info)
+		{
+			CreatePdf(info);
 
-            CreateParagraph(new PdfParagraph
-            {
-                Text = info.Title + $"\nот {DateTime.Now.ToShortDateString()}",
+			CreateParagraph(new PdfParagraph
+			{
+				Text = info.Title + $"\nот {DateTime.Now.ToShortDateString()}",
 
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+				Style = "NormalTitle",
+				ParagraphAlignment = PdfParagraphAlignmentType.Center
+			});
 
-            CreateParagraph(new PdfParagraph
-            {
-                Text = $"Расчётный период: с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}",
-                Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+			CreateParagraph(new PdfParagraph
+			{
+				Text = $"Расчётный период: с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}",
+				Style = "Normal",
+				ParagraphAlignment = PdfParagraphAlignmentType.Center
+			});
 
-            // Параграф с отчётом на пополнения
-            CreateParagraph(new PdfParagraph { Text = "Отчёт по пополнениям", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+			//параграф с отчётом на пополнения
+			CreateParagraph(new PdfParagraph { Text = "Отчёт по пополнениям", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
 
-            CreateTable(new List<string> { "3cm", "3cm", "5cm", "5cm" });
+			CreateTable(new List<string> { "3cm", "3cm", "5cm", "5cm" });
 
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Номер операции", "Номер карты", "Сумма", "Дата операции" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+			CreateRow(new PdfRowParameters
+			{
+				Texts = new List<string> { "Номер операции", "Номер карты", "Сумма", "Дата операции" },
+				Style = "NormalTitle",
+				ParagraphAlignment = PdfParagraphAlignmentType.Center
+			});
 
-            foreach (var report in info.ReportCrediting)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { report.OperationId.ToString(), report.CardNumber, report.SumOperation.ToString(), report.DateComplite.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
+			foreach (var report in info.ReportCrediting)
+			{
+				CreateRow(new PdfRowParameters
+				{
+					Texts = new List<string> { report.OperationId.ToString(), report.CardNumber, report.SumOperation.ToString(), report.DateComplite.ToString() },
+					Style = "Normal",
+					ParagraphAlignment = PdfParagraphAlignmentType.Left
+				});
+			}
 
-            // Подсчёт суммы операций на пополнение
-            CreateParagraph(new PdfParagraph { Text = $"Итоговая сумма поступлений за период: {info.ReportCrediting.Sum(x => x.SumOperation)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
+			//подсчёт суммы операций на пополнение
+			CreateParagraph(new PdfParagraph { Text = $"Итоговая сумма поступлений за период: {info.ReportCrediting.Sum(x => x.SumOperation)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
 
-            // Отчёт с отчётом на снятие
-            CreateParagraph(new PdfParagraph { Text = "Отчёт по снятиям", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+			//отчёт с отчётом на снятие
+			CreateParagraph(new PdfParagraph { Text = "Отчёт по снятиям", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
 
-            CreateTable(new List<string> { "3cm", "3cm", "5cm", "5cm" });
+			CreateTable(new List<string> { "3cm", "3cm", "5cm", "5cm" });
 
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Номер операции", "Номер карты", "Сумма", "Дата операции" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+			CreateRow(new PdfRowParameters
+			{
+				Texts = new List<string> { "Номер операции", "Номер карты", "Сумма", "Дата операции" },
+				Style = "NormalTitle",
+				ParagraphAlignment = PdfParagraphAlignmentType.Center
+			});
 
-            foreach (var report in info.ReportDebiting)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { report.OperationId.ToString(), report.CardNumber, report.SumOperation.ToString(), report.DateComplite.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
+			foreach (var report in info.ReportDebiting)
+			{
+				CreateRow(new PdfRowParameters
+				{
+					Texts = new List<string> { report.OperationId.ToString(), report.CardNumber, report.SumOperation.ToString(), report.DateComplite.ToString() },
+					Style = "Normal",
+					ParagraphAlignment = PdfParagraphAlignmentType.Left
+				});
+			}
 
-            // Подсчёт суммы операций на пополнение
-            CreateParagraph(new PdfParagraph { Text = $"Итоговая сумма снятий за период: {info.ReportDebiting.Sum(x => x.SumOperation)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
+			//подсчёт суммы операций на пополнение
+			CreateParagraph(new PdfParagraph { Text = $"Итоговая сумма снятий за период: {info.ReportDebiting.Sum(x => x.SumOperation)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
 
-            SavePdf(info);
-        }
+			SavePdf(info);
+		}
 
-        //===   Отчёты для кассира    ===//
+		#endregion
 
-        // Создание отчёта для кассира
-        public void CreateDocCashier(PdfInfo info)
-        {
-            CreatePdf(info);
+		#region Отчёт для кассира
 
-            CreateParagraph(new PdfParagraph
-            {
-                Text = info.Title + $"\nот {DateTime.Now.ToShortDateString()}\nФИО клиента: {info.FullClientName}",
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+		//создание отчёта для кассира
+		public void CreateDocCashier(PdfInfo info)
+		{
+			CreatePdf(info);
 
-            CreateParagraph(new PdfParagraph
-            {
-                Text = $"Расчётный период: с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}",
-                Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+			CreateParagraph(new PdfParagraph
+			{
+				Text = info.Title + $"\nот {DateTime.Now.ToShortDateString()}\nФИО клиента: {info.FullClientName}",
+				Style = "NormalTitle",
+				ParagraphAlignment = PdfParagraphAlignmentType.Center
+			});
 
-            // Параграф с отчётом по выдаче наличных с карт
-            CreateParagraph(new PdfParagraph { Text = "Отчёт по выдаче наличных со счёта", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+			CreateParagraph(new PdfParagraph
+			{
+				Text = $"Расчётный период: с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}",
+				Style = "Normal",
+				ParagraphAlignment = PdfParagraphAlignmentType.Center
+			});
 
-            CreateTable(new List<string> { "3.5cm", "3.5cm", "5cm", "5cm" });
+			//параграф с отчётом по выдаче наличных с карт
+			CreateParagraph(new PdfParagraph { Text = "Отчёт по выдаче наличных со счёта", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
 
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Номер операции", "Номер счёта", "Сумма операции", "Дата операции" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+			CreateTable(new List<string> { "3.5cm", "3.5cm", "5cm", "5cm" });
 
-            foreach (var report in info.ReportCashWithdrawal)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { report.OperationId.ToString(), report.AccountPayeeNumber, report.SumOperation.ToString(), report.DateComplite.ToShortDateString(), },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
+			CreateRow(new PdfRowParameters
+			{
+				Texts = new List<string> { "Номер операции", "Номер счёта", "Сумма операции", "Дата операции" },
+				Style = "NormalTitle",
+				ParagraphAlignment = PdfParagraphAlignmentType.Center
+			});
 
-            CreateParagraph(new PdfParagraph { Text = $"Итоговая сумма снятий за период: {info.ReportCashWithdrawal.Sum(x => x.SumOperation)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
+			foreach (var report in info.ReportCashWithdrawal)
+			{
+				CreateRow(new PdfRowParameters
+				{
+					Texts = new List<string> { report.OperationId.ToString(), report.AccountPayeeNumber, report.SumOperation.ToString(), report.DateComplite.ToShortDateString(), },
+					Style = "Normal",
+					ParagraphAlignment = PdfParagraphAlignmentType.Left
+				});
+			}
 
-            // Параграф с отчётом по переводу денег со счёта на счёт
-            CreateParagraph(new PdfParagraph { Text = "Отчёт по денежным переводам между счетами", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+			CreateParagraph(new PdfParagraph { Text = $"Итоговая сумма снятий за период: {info.ReportCashWithdrawal.Sum(x => x.SumOperation)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
 
-            CreateTable(new List<string> { "3cm", "3cm", "3cm", "4cm", "4cm" });
+			//параграф с отчётом по переводу денег со счёта на счёт
+			CreateParagraph(new PdfParagraph { Text = "Отчёт по денежным переводам между счетами", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
 
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Номер операции", "Номер счёта отправителя", "Номер счёта получателя", "Сумма операции", "Дата операции" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
+			CreateTable(new List<string> { "3cm", "3cm", "3cm", "4cm", "4cm" });
 
-            foreach (var report in info.ReportMoneyTransfer)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { report.OperationId.ToString(), report.AccountSenderNumber, report.AccountPayeeNumber, report.SumOperation.ToString(), report.DateComplite.ToShortDateString(), },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
+			CreateRow(new PdfRowParameters
+			{
+				Texts = new List<string> { "Номер операции", "Номер счёта отправителя", "Номер счёта получателя", "Сумма операции", "Дата операции" },
+				Style = "NormalTitle",
+				ParagraphAlignment = PdfParagraphAlignmentType.Center
+			});
 
-            CreateParagraph(new PdfParagraph { Text = $"Итоговая сумма переводов за период: {info.ReportMoneyTransfer.Sum(x => x.SumOperation)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
+			foreach (var report in info.ReportMoneyTransfer)
+			{
+				CreateRow(new PdfRowParameters
+				{
+					Texts = new List<string> { report.OperationId.ToString(), report.AccountSenderNumber, report.AccountPayeeNumber, report.SumOperation.ToString(), report.DateComplite.ToShortDateString(), },
+					Style = "Normal",
+					ParagraphAlignment = PdfParagraphAlignmentType.Left
+				});
+			}
 
-            SavePdf(info);
-        }
+			CreateParagraph(new PdfParagraph { Text = $"Итоговая сумма переводов за период: {info.ReportMoneyTransfer.Sum(x => x.SumOperation)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
 
-        /// Создание pdf-файла
-        protected abstract void CreatePdf(PdfInfo info);
+			SavePdf(info);
+		}
+
+		#endregion
+
+		/// Создание pdf-файла
+		protected abstract void CreatePdf(PdfInfo info);
 
         /// Создание параграфа с текстом
         protected abstract void CreateParagraph(PdfParagraph paragraph);
diff --git a/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToWord.cs
index 7deb086..d091ff9 100644
--- a/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToWord.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -14,340 +14,340 @@ namespace BankBusinessLogic.OfficePackage
         //метод создания документа
         public void CreateDoc(WordInfo info, OfficeOperationEnum operationEnum)
         {
-            if (operationEnum == OfficeOperationEnum.Между_cчетами)
-            {
-                CreateMoneyTransferWord(info);
-            }
+			if (operationEnum == OfficeOperationEnum.Между_cчетами)
+			{
+				CreateMoneyTransferWord(info);
+			}
 
-            if (operationEnum == OfficeOperationEnum.Пополнение_карт)
-            {
-                CreateCreditingWord(info);
-            }
+			if (operationEnum == OfficeOperationEnum.Пополнение_карт)
+			{
+				CreateCreditingWord(info);
+			}
 
-            if (operationEnum == OfficeOperationEnum.Cнятие_с_карты)
-            {
-                CreateDebitingWord(info);
-            }
+			if (operationEnum == OfficeOperationEnum.Cнятие_с_карты)
+			{
+				CreateDebitingWord(info);
+			}
 
-            if (operationEnum == OfficeOperationEnum.Для_кассира)
-            {
-                CreateCashierWord(info);
-            }
-        }
+			if (operationEnum == OfficeOperationEnum.Для_кассира)
+			{
+				CreateCashierWord(info);
+			}
+		}
 
-        private void CreateMoneyTransferWord(WordInfo info)
+		private void CreateMoneyTransferWord(WordInfo info)
         {
-            CreateWord(info);
+			CreateWord(info);
 
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
+			CreateParagraph(new WordParagraph
+			{
+				Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
+				TextProperties = new WordTextProperties
+				{
+					Size = "24",
+					JustificationType = WordJustificationType.Center
+				}
+			});
 
-            foreach (var transfer in info.MoneyTransfer)
-            {
-                List<List<(string, WordTextProperties)>> rowList = new()
-                {
-                    new()
-                    {
-                        new("Номер счёта отправителя", new WordTextProperties { Bold = true, Size = "20" } ),
-                        new("Номер счёта получателя", new WordTextProperties { Bold = true, Size = "20" } ),
-                        new("Сумма операции", new WordTextProperties { Bold = true, Size = "20" } ),
-                        new("Дата перевода", new WordTextProperties { Bold = true, Size = "20" } )
-                    }
-                };
+			foreach (var transfer in info.MoneyTransfer)
+			{
+				List<List<(string, WordTextProperties)>> rowList = new()
+				{
+					new()
+					{
+						new("Номер счёта отправителя", new WordTextProperties { Bold = true, Size = "20" } ),
+						new("Номер счёта получателя", new WordTextProperties { Bold = true, Size = "20" } ),
+						new("Сумма операции", new WordTextProperties { Bold = true, Size = "20" } ),
+						new("Дата перевода", new WordTextProperties { Bold = true, Size = "20" } )
+					}
+				};
 
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { ("Перевод №" + transfer.Id.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Center
-                    }
-                });
+				CreateParagraph(new WordParagraph
+				{
+					Texts = new List<(string, WordTextProperties)> { ("Перевод №" + transfer.Id.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Center
+					}
+				});
 
-                List<(string, WordTextProperties)> cellList = new()
-                {
-                    new(transfer.AccountSenderNumber, new WordTextProperties { Size = "20" }),
-                    new(transfer.AccountPayeeNumber, new WordTextProperties { Size = "20" }),
+				List<(string, WordTextProperties)> cellList = new()
+				{
+					new(transfer.AccountSenderNumber, new WordTextProperties { Size = "20" }),
+					new(transfer.AccountPayeeNumber, new WordTextProperties { Size = "20" }),
                     new(transfer.Sum.ToString(), new WordTextProperties { Size = "20"}),
-                    new(transfer.DateTransfer.ToString(), new WordTextProperties { Size = "20"}),
-                };
+					new(transfer.DateOperation.ToString(), new WordTextProperties { Size = "20"}),
+				};
 
-                rowList.Add(cellList);
+				rowList.Add(cellList);
 
-                CreateTable(new WordParagraph
-                {
-                    RowTexts = rowList,
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Center
-                    }
-                });
-            }
+				CreateTable(new WordParagraph
+				{
+					RowTexts = rowList,
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Center
+					}
+				});
+			}
 
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { ("Суммарный объём переводов: " + info.MoneyTransfer.Sum(x => x.Sum).ToString(),
-                    new WordTextProperties { Bold = true, Size = "24" }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Both
-                }
-            });
+			CreateParagraph(new WordParagraph
+			{
+				Texts = new List<(string, WordTextProperties)> { ("Суммарный объём переводов: " + info.MoneyTransfer.Sum(x => x.Sum).ToString(), 
+					new WordTextProperties { Bold = true, Size = "24" }) },
+				TextProperties = new WordTextProperties
+				{
+					Size = "24",
+					JustificationType = WordJustificationType.Both
+				}
+			});
 
-            SaveWord(info);
-        }
+			SaveWord(info);
+		}
 
-        private void CreateCreditingWord(WordInfo info)
-        {
-            CreateWord(info);
+		private void CreateCreditingWord(WordInfo info)
+		{
+			CreateWord(info);
 
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
+			CreateParagraph(new WordParagraph
+			{
+				Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
+				TextProperties = new WordTextProperties
+				{
+					Size = "24",
+					JustificationType = WordJustificationType.Center
+				}
+			});
 
-            foreach (var crediting in info.Crediting)
-            {
-                List<List<(string, WordTextProperties)>> rowList = new()
-                {
-                    new()
-                    {
-                        new("Номер карты", new WordTextProperties { Bold = true, Size = "24" } ),
-                        new("Сумма пополнения", new WordTextProperties { Bold = true, Size = "24" } ),
-                        new("Дата выполнения", new WordTextProperties { Bold = true, Size = "24" } )
-                    }
-                };
+			foreach (var crediting in info.Crediting)
+			{
+				List<List<(string, WordTextProperties)>> rowList = new()
+				{
+					new()
+					{
+						new("Номер карты", new WordTextProperties { Bold = true, Size = "24" } ),
+						new("Сумма пополнения", new WordTextProperties { Bold = true, Size = "24" } ),
+						new("Дата выполнения", new WordTextProperties { Bold = true, Size = "24" } )
+					}
+				};
 
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { ("Пополнение №" + crediting.Id.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Center
-                    }
-                });
+				CreateParagraph(new WordParagraph
+				{
+					Texts = new List<(string, WordTextProperties)> { ("Пополнение №" + crediting.Id.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Center
+					}
+				});
 
-                List<(string, WordTextProperties)> cellList = new()
-                {
-                    new(crediting.CardNumber, new WordTextProperties { Size = "24" }),
-                    new(crediting.Sum.ToString(), new WordTextProperties { Size = "24" }),
-                    new(crediting.DateCredit == null ? "В обработке" : crediting.DateCredit.ToString(), new WordTextProperties { Size = "24" })
-                };
+				List<(string, WordTextProperties)> cellList = new()
+				{
+					new(crediting.CardNumber, new WordTextProperties { Size = "24" }),
+					new(crediting.Sum.ToString(), new WordTextProperties { Size = "24" }),
+					new(crediting.DateClose == null ? "В обработке" : crediting.DateClose.ToString(), new WordTextProperties { Size = "24" })
+				};
 
-                rowList.Add(cellList);
+				rowList.Add(cellList);
 
-                CreateTable(new WordParagraph
-                {
-                    RowTexts = rowList,
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Center
-                    }
-                });
-            }
+				CreateTable(new WordParagraph
+				{
+					RowTexts = rowList,
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Center
+					}
+				});
+			}
 
-            //формирование списка поступления по каждой карте
-            var dict = new Dictionary<string, double>();
+			//формирование списка поступления по каждой карте
+			var dict = new Dictionary<string, int>();
 
-            foreach (var elem in info.Crediting)
-            {
-                if (dict.ContainsKey(elem.CardNumber))
-                {
-                    dict[elem.CardNumber] += elem.Sum;
-                }
-                else
-                {
-                    dict[elem.CardNumber] = elem.Sum;
-                }
-            }
+			foreach (var elem in info.Crediting)
+			{
+				if (dict.ContainsKey(elem.CardNumber))
+				{
+					dict[elem.CardNumber] += elem.Sum;
+				}
+				else
+				{
+					dict[elem.CardNumber] = elem.Sum;
+				}
+			}
 
-            foreach (var elem in dict)
-            {
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { ("Суммарное пополнение на карту №" + elem.Key + ": " + elem.Value.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
+			foreach (var elem in dict)
+			{
+				CreateParagraph(new WordParagraph
+				{
+					Texts = new List<(string, WordTextProperties)> { ("Суммарное пополнение на карту №" + elem.Key + ": " + elem.Value.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Both
+					}
+				});
+			}
 
-            SaveWord(info);
-        }
+			SaveWord(info);
+		}
 
-        private void CreateDebitingWord(WordInfo info)
-        {
-            CreateWord(info);
+		private void CreateDebitingWord(WordInfo info)
+		{
+			CreateWord(info);
 
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
+			CreateParagraph(new WordParagraph
+			{
+				Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
+				TextProperties = new WordTextProperties
+				{
+					Size = "24",
+					JustificationType = WordJustificationType.Center
+				}
+			});
 
-            foreach (var crediting in info.Debiting)
-            {
-                List<List<(string, WordTextProperties)>> rowList = new()
-                {
-                    new()
-                    {
-                        new("Номер карты", new WordTextProperties { Bold = true, Size = "24" } ),
-                        new("Сумма снятия", new WordTextProperties { Bold = true, Size = "24" } ),
-                        new("Дата выполнения", new WordTextProperties { Bold = true, Size = "24" } )
-                    }
-                };
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { ("Снятие №" + crediting.Id.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Center
-                    }
-                });
+			foreach (var crediting in info.Debiting)
+			{
+				List<List<(string, WordTextProperties)>> rowList = new()
+				{
+					new()
+					{
+						new("Номер карты", new WordTextProperties { Bold = true, Size = "24" } ),
+						new("Сумма снятия", new WordTextProperties { Bold = true, Size = "24" } ),
+						new("Дата выполнения", new WordTextProperties { Bold = true, Size = "24" } )
+					}
+				};
+				CreateParagraph(new WordParagraph
+				{
+					Texts = new List<(string, WordTextProperties)> { ("Снятие №" + crediting.Id.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Center
+					}
+				});
 
-                List<(string, WordTextProperties)> cellList = new()
-                {
-                    new(crediting.CardNumber, new WordTextProperties { Size = "24" }),
-                    new(crediting.Sum.ToString(), new WordTextProperties { Size = "24" }),
-                    new(crediting.DateDebit == null ? "В обработке" : crediting.DateDebit.ToString(), new WordTextProperties { Size = "24" })
-                };
+				List<(string, WordTextProperties)> cellList = new()
+				{
+					new(crediting.CardNumber, new WordTextProperties { Size = "24" }),
+					new(crediting.Sum.ToString(), new WordTextProperties { Size = "24" }),
+					new(crediting.DateClose == null ? "В обработке" : crediting.DateClose.ToString(), new WordTextProperties { Size = "24" })
+				};
 
-                rowList.Add(cellList);
+				rowList.Add(cellList);
 
-                CreateTable(new WordParagraph
-                {
-                    RowTexts = rowList,
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Center
-                    }
-                });
-            }
+				CreateTable(new WordParagraph
+				{
+					RowTexts = rowList,
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Center
+					}
+				});
+			}
 
-            //формирование списка поступления по каждой карте
-            var dict = new Dictionary<string, double>();
+			//формирование списка поступления по каждой карте
+			var dict = new Dictionary<string, int>();
 
-            foreach (var elem in info.Debiting)
-            {
-                if (dict.ContainsKey(elem.CardNumber))
-                {
-                    dict[elem.CardNumber] += elem.Sum;
-                }
-                else
-                {
-                    dict[elem.CardNumber] = elem.Sum;
-                }
-            }
+			foreach (var elem in info.Debiting)
+			{
+				if (dict.ContainsKey(elem.CardNumber))
+				{
+					dict[elem.CardNumber] += elem.Sum;
+				}
+				else
+				{
+					dict[elem.CardNumber] = elem.Sum;
+				}
+			}
 
-            foreach (var elem in dict)
-            {
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { ("Суммарное снятие с карты №" + elem.Key + ": " + elem.Value.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
+			foreach (var elem in dict)
+			{
+				CreateParagraph(new WordParagraph
+				{
+					Texts = new List<(string, WordTextProperties)> { ("Суммарное снятие с карты №" + elem.Key + ": " + elem.Value.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Both
+					}
+				});
+			}
 
-            SaveWord(info);
-        }
+			SaveWord(info);
+		}
 
-        private void CreateCashierWord(WordInfo info)
-        {
-            CreateWord(info);
+		private void CreateCashierWord(WordInfo info)
+		{
+			CreateWord(info);
 
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
+			CreateParagraph(new WordParagraph
+			{
+				Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
+				TextProperties = new WordTextProperties
+				{
+					Size = "24",
+					JustificationType = WordJustificationType.Center
+				}
+			});
 
-            foreach (var crediting in info.Debiting)
-            {
-                List<List<(string, WordTextProperties)>> rowList = new()
-                {
-                    new()
-                    {
-                        new("Сумма заявки", new WordTextProperties { Bold = true, Size = "24" } ),
-                        new("Дата открытия", new WordTextProperties { Bold = true, Size = "24" } ),
-                        new("Статус", new WordTextProperties { Bold = true, Size = "24" } )
-                    }
-                };
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { ("Заявка №" + crediting.Id.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Center
-                    }
-                });
+			foreach (var crediting in info.Debiting)
+			{
+				List<List<(string, WordTextProperties)>> rowList = new()
+				{
+					new()
+					{
+						new("Сумма заявки", new WordTextProperties { Bold = true, Size = "24" } ),
+						new("Дата открытия", new WordTextProperties { Bold = true, Size = "24" } ),
+						new("Статус", new WordTextProperties { Bold = true, Size = "24" } )
+					}
+				};
+				CreateParagraph(new WordParagraph
+				{
+					Texts = new List<(string, WordTextProperties)> { ("Заявка №" + crediting.Id.ToString(), new WordTextProperties { Bold = true, Size = "24" }) },
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Center
+					}
+				});
 
-                List<(string, WordTextProperties)> cellList = new()
-                {
-                    new(crediting.Sum.ToString(), new WordTextProperties { Size = "24" }),
-                    new(crediting.DateDebit.ToString(), new WordTextProperties { Size = "24" }),
-                    new(crediting.Status.ToString(), new WordTextProperties { Size = "24" })
-                };
+				List<(string, WordTextProperties)> cellList = new()
+				{
+					new(crediting.Sum.ToString(), new WordTextProperties { Size = "24" }),
+					new(crediting.DateOpen.ToString(), new WordTextProperties { Size = "24" }),
+					new(crediting.Status.ToString(), new WordTextProperties { Size = "24" })
+				};
 
-                rowList.Add(cellList);
+				rowList.Add(cellList);
 
-                CreateTable(new WordParagraph
-                {
-                    RowTexts = rowList,
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Center
-                    }
-                });
-            }
+				CreateTable(new WordParagraph
+				{
+					RowTexts = rowList,
+					TextProperties = new WordTextProperties
+					{
+						Size = "24",
+						JustificationType = WordJustificationType.Center
+					}
+				});
+			}
 
-            SaveWord(info);
-        }
+			SaveWord(info);
+		}
 
-        /// Создание doc-файла
-        protected abstract void CreateWord(WordInfo info);
+		// Создание doc-файла
+		protected abstract void CreateWord(WordInfo info);
 
-        /// Создание абзаца с текстом
+        // Создание абзаца с текстом
         protected abstract void CreateParagraph(WordParagraph paragraph);
 
-        /// Создание таблицы
-        protected abstract void CreateTable(WordParagraph paragraph);
+		//Создание таблицы
+		protected abstract void CreateTable(WordParagraph paragraph);
 
-        /// Сохранение файла
-        protected abstract void SaveWord(WordInfo info);
+		// Сохранение файла
+		protected abstract void SaveWord(WordInfo info);
     }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/Bank/BankBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
index fbdadf4..d05d92f 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
@@ -6,16 +6,16 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperEnums
 {
-	// Вспомогательное перечисление для оформления Excel
-	public enum ExcelStyleInfoType
-	{
-		// Заголовок
-		Title,
+    //вспомогательное перечисление для оформления exel 
+    public enum ExcelStyleInfoType
+    {
+        //заголовок
+        Title,
 
-		// Просто текст
-		Text,
+        //просто текст
+        Text,
 
-		// Текст в рамке
-		TextWithBorder
-	}
+        //текст в рамке
+        TextWithBorder
+    }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/Bank/BankBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
index a52a139..2503bd3 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
@@ -6,16 +6,16 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperEnums
 {
-	// Вспомогательное перечисление для оформления pdf документа
-	public enum PdfParagraphAlignmentType
-	{
-		// Либо по центру
-		Center,
+    //вспомогательное перечисление для оформления pdf документа
+    public enum PdfParagraphAlignmentType
+    {
+        //либо по центру
+        Center,
 
-		// Либо с левого края
-		Left,
+        //либо с левого края
+        Left,
 
-		// Либо с правого края
-		Right
-	}
+        //либо с правого края
+        Right
+    }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/Bank/BankBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
index f9f60a4..5a83fb3 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
@@ -6,13 +6,13 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperEnums
 {
-	// Вспомогательное перечисление для настройки формата word документа
-	public enum WordJustificationType
-	{
-		// Выравниваем либо по центру
-		Center,
+    //вспомогательное перечисление для настройки формата word документа
+    public enum WordJustificationType
+    {
+        //выравниваем либо по центру
+        Center,
 
-        // Либо на всю ширину
+        //либо на всю ширину
         Both
-	}
+    }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
index 97d80c5..4a8edca 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
@@ -7,22 +7,22 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Информация по ячейке в таблице Excel
-	public class ExcelCellParameters
-	{
-		// Название колонки
-		public string ColumnName { get; set; } = string.Empty;
+    //информация по ячейке в таблице excel
+    public class ExcelCellParameters
+    {
+        //название колонки
+        public string ColumnName { get; set; } = string.Empty;
 
-		// Строка
-		public uint RowIndex { get; set; }
+        //строка
+        public uint RowIndex { get; set; }
 
-		// текст в ячейке
-		public string Text { get; set; } = string.Empty;
+        //тект в ячейке
+        public string Text { get; set; } = string.Empty;
 
-		// Геттер для того, чтобы не искать каждый раз
-		public string CellReference => $"{ColumnName}{RowIndex}";
+        //геттер для того, чтобы не искать каждый раз
+        public string CellReference => $"{ColumnName}{RowIndex}";
 
-		// В каком стиле выводить информацию
-		public ExcelStyleInfoType StyleInfo { get; set; }
-	}
+        //в каком стиле выводить информацию
+        public ExcelStyleInfoType StyleInfo { get; set; }
+    }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
index 5d17a03..d6849f6 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
@@ -1,28 +1,23 @@
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Информация по excel файлу, который хотим создать
+	//информация по excel файлу, который хотим создать
 	public class ExcelInfo
-	{
-		// Название файла
-		public string FileName { get; set; } = string.Empty;
+    {
+        //название файла
+        public string FileName { get; set; } = string.Empty; 
 
-		// Заголовок
-		public string Title { get; set; } = string.Empty;
+        //заголовок
+        public string Title { get; set; } = string.Empty;
 
-		// Списки для отчёта клиента
-		public List<MoneyTransferViewModel> MoneyTransfer { get; set; } = new();
+		//списки для отчёта клиента
+        public List<MoneyTransferViewModel> MoneyTransfer { get; set; } = new();
 
 		public List<CreditingViewModel> Crediting { get; set; } = new();
 
-		// Список для отчёта кассира и клиента
+		//список для отчёта кассира и клиента
 		public List<DebitingViewModel> Debiting { get; set; } = new();
 	}
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
index b70c3cd..07982d6 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
@@ -6,14 +6,14 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Информация для объединения ячеек
-	public class ExcelMergeParameters
-	{
-		public string CellFromName { get; set; } = string.Empty;
+    //информация для объединения ячеек
+    public class ExcelMergeParameters
+    {
+        public string CellFromName { get; set; } = string.Empty;
 
-		public string CellToName { get; set; } = string.Empty;
+        public string CellToName { get; set; } = string.Empty;
 
-		// Геттер для указания диапазона для объединения, чтобы каждый раз его не вычислять
-		public string Merge => $"{CellFromName}:{CellToName}";
-	}
+        //гетер для указания диапазона для объединения, чтобы каждый раз его не вычислять
+        public string Merge => $"{CellFromName}:{CellToName}";
+    }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
index 54a0259..1af7cf5 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
@@ -1,40 +1,35 @@
 using BankContracts.ViewModels.Reports.Cashier;
 using BankContracts.ViewModels.Reports.Client;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Общая информация по pdf файлу
+	//общая информация по pdf файлу
 	public class PdfInfo
-	{
-		public string FileName { get; set; } = string.Empty;
+    {
+        public string FileName { get; set; } = string.Empty;
 
-		public string Title { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
 
-		public DateTime DateFrom { get; set; }
+        public DateTime DateFrom { get; set; }
 
-		public DateTime DateTo { get; set; }
+        public DateTime DateTo { get; set; }
 
-		// По умолчанию отчёт делается для клиента
-		public bool ForClient { get; set; } = true;
+        //по умолчанию отчёт делается для клиента
+        public bool ForClient { get; set; } = true;
 
-		// Для передачи полного имени клиента в отчёт
-		public string FullClientName { get; set; } = string.Empty;
+        //для передачи полного имени клиента в отчёт
+        public string FullClientName { get; set; } = string.Empty;
 
-		// Перечень заказов за указанный период для вывода/сохранения
-		public List<ReportClientViewModel> ReportCrediting { get; set; } = new();
+        //перечень заказов за указанный период для вывода/сохранения
+        public List<ReportClientViewModel> ReportCrediting { get; set; } = new();
 
-		// Перечень заказов за указанный период для вывода/сохранения
+		//перечень заказов за указанный период для вывода/сохранения
 		public List<ReportClientViewModel> ReportDebiting { get; set; } = new();
 
-		// Перечень переводов со счёта на счёт
-		public List<ReportCashierViewModel> ReportMoneyTransfer { get; set; } = new();
+        //перечень переводов со счёта на счёт
+        public List<ReportCashierViewModel> ReportMoneyTransfer { get; set; } = new();
 
-		// Перечень зачислений денежных средств
+		//перечень зачислений денежных средств на карту (т. е. на её счёт)
 		public List<ReportCashierViewModel> ReportCashWithdrawal { get; set; } = new();
 	}
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
index b74fbf7..efdc625 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
@@ -7,14 +7,14 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Информация по параграфу в pdf документе
-	public class PdfParagraph
-	{
-		public string Text { get; set; } = string.Empty;
+    //информация п параграфу в pdf документе
+    public class PdfParagraph
+    {
+        public string Text { get; set; } = string.Empty;
 
-		public string Style { get; set; } = string.Empty;
+        public string Style { get; set; } = string.Empty;
 
-		// Информация по выравниванию текста в параграфе
-		public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-	}
+        //информация по выравниванию текста в параграфе
+        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+    }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
index d386b15..e4c43ae 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
@@ -7,16 +7,16 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Информация по параметрам строк таблицы
-	public class PdfRowParameters
-	{
-		// Набор текстов
-		public List<string> Texts { get; set; } = new();
+    //информация по параметрам строк таблицы
+    public class PdfRowParameters
+    {
+        //набор текстов
+        public List<string> Texts { get; set; } = new();
 
-		// Стиль к текстам
-		public string Style { get; set; } = string.Empty;
+        //стиль к текстам
+        public string Style { get; set; } = string.Empty;
 
-		// Как выравниваем
-		public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-	}
+        //как выравниваем
+        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
+    }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
index ad7f3c4..b489bab 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
@@ -1,26 +1,21 @@
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Общая информация по документу
+	//общая информация по документу
 	public class WordInfo
-	{
-		public string FileName { get; set; } = string.Empty;
+    {
+        public string FileName { get; set; } = string.Empty;
 
-		public string Title { get; set; } = string.Empty;
+        public string Title { get; set; } = string.Empty;
 
-		// Списки для отчёта клиента
+		//списки для отчёта клиента
 		public List<MoneyTransferViewModel> MoneyTransfer { get; set; } = new();
 
 		public List<CreditingViewModel> Crediting { get; set; } = new();
 
-		// Список для отчёта кассира и клиента
+		//список для отчёта кассира и клиента
 		public List<DebitingViewModel> Debiting { get; set; } = new();
 	}
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
index 3352a75..42374ca 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
@@ -6,14 +6,14 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Модель параграфов, которые есть в тексте
-	public class WordParagraph
-	{
-		// Набор текстов в абзаце (для случая, если в абзаце текст разных стилей)
-		public List<(string, WordTextProperties)> Texts { get; set; } = new();
+    //модель параграфов, которые есть в тексте
+    public class WordParagraph
+    {
+        //набор текстов в абзаце (для случая, если в абзаце текст разных стилей)
+        public List<(string, WordTextProperties)> Texts { get; set; } = new();
 
-		// Свойства параграфа, если они есть
-		public WordTextProperties? TextProperties { get; set; }
+        //свойства параграфа, если они есть
+        public WordTextProperties? TextProperties { get; set; }
 
 		public List<List<(string, WordTextProperties)>> RowTexts { get; set; } = new();
 	}
diff --git a/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
index 8fb655a..a5d077b 100644
--- a/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
@@ -7,16 +7,16 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.HelperModels
 {
-	// Модель свойств текста, которые нам нужны в word документе
-	public class WordTextProperties
-	{
-		// Размере текста
-		public string Size { get; set; } = string.Empty;
+    //модель свойств текста, которые нам нужны в word документе
+    public class WordTextProperties
+    {
+        //размере текста
+        public string Size { get; set; } = string.Empty;
 
-		// Надо ли делать его жирным
-		public bool Bold { get; set; }
+        //надо ли делать его жирным
+        public bool Bold { get; set; }
 
-		// Выравнивание
-		public WordJustificationType JustificationType { get; set; }
-	}
+        //выравнивание
+        public WordJustificationType JustificationType { get; set; }
+    }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
index 32c8d01..e1b0261 100644
--- a/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -1,10 +1,11 @@
-using BankBusinessLogic.OfficePackage.HelperEnums;
-using BankBusinessLogic.OfficePackage.HelperModels;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Office2013.Excel;
-using DocumentFormat.OpenXml;
+using BankBusinessLogic.OfficePackage.HelperModels;
+using BankBusinessLogic.OfficePackage.HelperEnums;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Office2016.Excel;
+using DocumentFormat.OpenXml;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,22 +14,21 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.Implements
 {
-	// Реализация создания Excel-документа от абстрактного класса
-	public class SaveToExcel : AbstractSaveToExcel
-	{
-		private SpreadsheetDocument? _spreadsheetDocument;
+    public class SaveToExcel : AbstractSaveToExcel
+    {
+        private SpreadsheetDocument? _spreadsheetDocument;
 
-		private SharedStringTablePart? _shareStringPart;
+        private SharedStringTablePart? _shareStringPart;
 
-		private Worksheet? _worksheet;
+        private Worksheet? _worksheet;
 
-        // Настройка стилей для файла
+        //Настройка стилей для файла
         private static void CreateStyles(WorkbookPart workbookpart)
         {
             var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
             sp.Stylesheet = new Stylesheet();
 
-            // Настройка шрифта простого текста
+            //настройка шрифта простого текста
             var fonts = new Fonts() { Count = 2U, KnownFonts = true };
 
             var fontUsual = new Font();
@@ -38,7 +38,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
             fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
 
-            // Настройка шрифта заголока
+            //настройка шрифта заголока
             var fontTitle = new Font();
             fontTitle.Append(new Bold());
             fontTitle.Append(new FontSize() { Val = 14D });
@@ -47,17 +47,17 @@ namespace BankBusinessLogic.OfficePackage.Implements
             fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
             fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
 
-            // Добавление созданных шрифтов
+            //добавление созданных шрифтов
             fonts.Append(fontUsual);
             fonts.Append(fontTitle);
 
-            // Создание заливки
+            //создание заливки
             var fills = new Fills() { Count = 2U };
 
             var fill1 = new Fill();
-            fill1.Append(new PatternFill()
-            {
-                PatternType = PatternValues.None
+            fill1.Append(new PatternFill() 
+            { 
+                PatternType = PatternValues.None 
             });
 
             var fill2 = new Fill();
@@ -69,7 +69,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             fills.Append(fill1);
             fills.Append(fill2);
 
-            // Стиль границ ячейки - незакрашенный (для заголовка) и закрашенный
+            //стиль границ ячейки - незакрашенный (для заголовка) и закрашенный
             var borders = new Borders() { Count = 2U };
 
             var borderNoBorder = new Border();
@@ -88,7 +88,6 @@ namespace BankBusinessLogic.OfficePackage.Implements
             {
                 Style = BorderStyleValues.Thin
             };
-
             rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
 
             var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
@@ -98,7 +97,6 @@ namespace BankBusinessLogic.OfficePackage.Implements
             {
                 Style = BorderStyleValues.Thin
             };
-
             bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
 
             borderThin.Append(leftBorder);
@@ -110,7 +108,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             borders.Append(borderNoBorder);
             borders.Append(borderThin);
 
-            // Формирование CellFormat из комбинаций шрифтов, заливок и т. д.
+            //формирование CellFormat из комбинаций шрифтов, заливок и т. д.
             var cellStyleFormats = new CellStyleFormats() { Count = 1U };
 
             var cellFormatStyle = new CellFormat()
@@ -162,7 +160,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
                 ApplyFont = true
             };
 
-            // В итоге создали 3 стиля
+            //по итогу создали 3 стиля
             cellFormats.Append(cellFormatFont);
             cellFormats.Append(cellFormatFontAndBorder);
             cellFormats.Append(cellFormatTitle);
@@ -203,7 +201,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             };
 
             stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
-
+            
             stylesheetExtension2.Append(new TimelineStyles()
             {
                 DefaultTimelineStyle = "TimeSlicerStyleLight1"
@@ -223,7 +221,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             sp.Stylesheet.Append(stylesheetExtensionList);
         }
 
-        // Получение номера стиля (одного из 3-х нами созданных) из типа
+        //Получение номера стиля (одного из 3-х нами созданных) из типа
         private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
         {
             return styleInfo switch
@@ -237,7 +235,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
 
         protected override void CreateExcel(ExcelInfo info)
         {
-            // Создаём документ Excel
+            //создаём документ Excel
             _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
 
             // Создаем книгу (в ней хранятся листы)
@@ -277,7 +275,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             _worksheet = worksheetPart.Worksheet;
         }
 
-        // Метод вставки в лист книги
+        //метод вставки в лист книги
         protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
         {
             if (_worksheet == null || _shareStringPart == null)
@@ -315,7 +313,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             else
             {
                 // Все ячейки должны быть последовательно друг за другом расположены
-                // Нужно определить, после какой вставлять
+                // нужно определить, после какой вставлять
                 Cell? refCell = null;
 
                 foreach (Cell rowCell in row.Elements<Cell>())
@@ -336,7 +334,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
                 cell = newCell;
             }
 
-            // Вставляем новый текст
+            // вставляем новый текст
             _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
             _shareStringPart.SharedStringTable.Save();
 
@@ -345,7 +343,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
         }
 
-        // Метод объединения ячеек
+        //метод объединения ячеек
         protected override void MergeCells(ExcelMergeParameters excelParams)
         {
             if (_worksheet == null)
@@ -389,7 +387,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             }
 
             _spreadsheetDocument.WorkbookPart!.Workbook.Save();
-            _spreadsheetDocument.Dispose();
+            _spreadsheetDocument.Close();
         }
     }
 }
diff --git a/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
index ee6aab1..6dfb77b 100644
--- a/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -11,16 +11,16 @@ using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.Implements
 {
-	// Реализация создания Pdf-документа от абстрактного класса
-	public class SaveToPdf : AbstractSaveToPdf
-	{
-		private Document? _document;
+    //реализация астрактного класса создания pdf документа
+    public class SaveToPdf : AbstractSaveToPdf
+    {
+        private Document? _document;
 
-		private Section? _section;
+        private Section? _section;
 
-		private Table? _table;
+        private Table? _table;
 
-        // Преобразование необходимого типа выравнивания в соотвествующее выравнивание в MigraDoc
+        //преобразование необходимого типа выравнивания в соотвествующее выравнивание в MigraDoc
         private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
         {
             return type switch
@@ -32,7 +32,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             };
         }
 
-        // Создание стилей для документа
+        //Создание стилей для документа
         private static void DefineStyles(Document document)
         {
             var style = document.Styles["Normal"];
@@ -46,13 +46,13 @@ namespace BankBusinessLogic.OfficePackage.Implements
 
         protected override void CreatePdf(PdfInfo info)
         {
-            // Создаём документ
+            //создаём документ
             _document = new Document();
 
-            // Передаём для него стили
+            //передаём для него стили
             DefineStyles(_document);
 
-            // Получение первой секции документа
+            //получение первой секции документа
             _section = _document.AddSection();
         }
 
@@ -76,7 +76,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
                 return;
             }
 
-            // Добавляем таблицу в документ как последнюю секцию (?)
+            //добавляем таблицу в документ как последнюю секцию (?)
             _table = _document.LastSection.AddTable();
 
             foreach (var elem in columns)
@@ -92,12 +92,12 @@ namespace BankBusinessLogic.OfficePackage.Implements
                 return;
             }
 
-            // Добавление строки в таблицу
+            //добавление строки в таблицу
             var row = _table.AddRow();
 
             for (int i = 0; i < rowParameters.Texts.Count; ++i)
             {
-                // Ячейка добавляется добавлением параграфа
+                //ячейка добавляется добавлением параграфа
                 row.Cells[i].AddParagraph(rowParameters.Texts[i]);
 
                 if (!string.IsNullOrEmpty(rowParameters.Style))
diff --git a/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToWord.cs
index d4b4566..f7ff71a 100644
--- a/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToWord.cs
+++ b/Bank/BankBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -1,27 +1,23 @@
-using BankBusinessLogic.OfficePackage.HelperEnums;
+
+using BankBusinessLogic.OfficePackage.HelperEnums;
 using BankBusinessLogic.OfficePackage.HelperModels;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankBusinessLogic.OfficePackage.Implements
 {
-	// Реализация создания Word-документа от абстрактного класса
-	public class SaveToWord : AbstractSaveToWord
-	{
-		private WordprocessingDocument? _wordDocument;
+    //реализация абстрактного класса сохранения в word
+    public class SaveToWord : AbstractSaveToWord
+    {
+        private WordprocessingDocument? _wordDocument;
 
-		private Body? _docBody;
+        private Body? _docBody;
 
-        // Получение типа выравнивания
+        //Получение типа выравнивания
         private static JustificationValues GetJustificationValues(WordJustificationType type)
         {
-            // Выравнивание слева будет в том случае, если передаётся неизвестный тип выравнивания
+            //выравнивание слева будет в том случае, если передаётся неизвестный тип выравнивания
             return type switch
             {
                 WordJustificationType.Both => JustificationValues.Both,
@@ -30,12 +26,12 @@ namespace BankBusinessLogic.OfficePackage.Implements
             };
         }
 
-        // Настройки страницы
+        //Настройки страницы
         private static SectionProperties CreateSectionProperties()
         {
             var properties = new SectionProperties();
 
-            // Прописываем портретную ориентацию
+            //прописываем портретную ориентацию
             var pageSize = new PageSize
             {
                 Orient = PageOrientationValues.Portrait
@@ -46,7 +42,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
             return properties;
         }
 
-        // Задание форматирования для абзаца
+        //Задание форматирования для абзаца
         private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
         {
             if (paragraphProperties == null)
@@ -56,7 +52,7 @@ namespace BankBusinessLogic.OfficePackage.Implements
 
             var properties = new ParagraphProperties();
 
-            // Вытаскиваем выравнивание текста
+            //вытаскиваем выравнивание текста
             properties.AppendChild(new Justification()
             {
                 Val = GetJustificationValues(paragraphProperties.JustificationType)
@@ -86,21 +82,21 @@ namespace BankBusinessLogic.OfficePackage.Implements
 
         protected override void CreateWord(WordInfo info)
         {
-            // Создаём документ word
+            //создаём документ word
             _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
 
-            // Вытаскиваем главную часть из вордовского документа
+            //вытаскиваем главную часть из вордовского документа
             MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
 
             mainPart.Document = new Document();
 
-            //Ггенерируем тело основной части документа
+            //генерируем тело основной части документа
             _docBody = mainPart.Document.AppendChild(new Body());
         }
 
         protected override void CreateParagraph(WordParagraph paragraph)
         {
-            // Проверка на то, был ли вызван WordprocessingDocument.Create (создался ли документ) и есть ли вообще параграф для вставки
+            //проверка на то, был ли вызван WordprocessingDocument.Create (создался ли документ) и есть ли вообще параграф для вставки
             if (_docBody == null || paragraph == null)
             {
                 return;
@@ -108,16 +104,16 @@ namespace BankBusinessLogic.OfficePackage.Implements
 
             var docParagraph = new Paragraph();
 
-            // Добавляем свойства параграфа
+            //добавляем свойства параграфа
             docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
 
-            // Вставляем блоки текста (их называют Run)
+            //вставляем блоки текста (их называют Run)
             foreach (var run in paragraph.Texts)
             {
                 var docRun = new Run();
                 var properties = new RunProperties();
 
-                //Ззадание свойств текста - размер и жирность
+                //задание свойств текста - размер и жирность
                 properties.AppendChild(new FontSize { Val = run.Item2.Size });
 
                 if (run.Item2.Bold)
@@ -139,92 +135,92 @@ namespace BankBusinessLogic.OfficePackage.Implements
             _docBody.AppendChild(docParagraph);
         }
 
-        // Метод, отвечающий за создание таблицы
-        protected override void CreateTable(WordParagraph paragraph)
-        {
-            if (_docBody == null || paragraph == null)
-            {
-                return;
-            }
+        //метод, отвечающий за создание таблицы
+		protected override void CreateTable(WordParagraph paragraph)
+		{
+			if (_docBody == null || paragraph == null)
+			{
+				return;
+			}
 
-            Table table = new Table();
+			Table table = new Table();
 
-            var tableProp = new TableProperties();
+			var tableProp = new TableProperties();
 
-            tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
-            tableProp.AppendChild(new TableBorders(
-                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
-                ));
-            tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
+			tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
+			tableProp.AppendChild(new TableBorders(
+					new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+					new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+					new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+					new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+					new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
+					new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
+				));
+			tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
 
-            table.AppendChild(tableProp);
+			table.AppendChild(tableProp);
 
-            TableGrid tableGrid = new TableGrid();
+			TableGrid tableGrid = new TableGrid();
 
-            for (int j = 0; j < paragraph.RowTexts[0].Count; ++j)
-            {
-                tableGrid.AppendChild(new GridColumn() { Width = "2500" });
-            }
+			for (int j = 0; j < paragraph.RowTexts[0].Count; ++j)
+			{
+				tableGrid.AppendChild(new GridColumn() { Width = "2500" });
+			}
 
-            table.AppendChild(tableGrid);
+			table.AppendChild(tableGrid);
 
-            for (int i = 0; i < paragraph.RowTexts.Count; ++i)
-            {
-                TableRow docRow = new TableRow();
+			for (int i = 0; i < paragraph.RowTexts.Count; ++i)
+			{
+				TableRow docRow = new TableRow();
 
-                for (int j = 0; j < paragraph.RowTexts[i].Count; ++j)
-                {
-                    var docParagraph = new Paragraph();
+				for (int j = 0; j < paragraph.RowTexts[i].Count; ++j)
+				{
+					var docParagraph = new Paragraph();
 
-                    docParagraph.AppendChild(CreateParagraphProperties(paragraph.RowTexts[i][j].Item2));
+					docParagraph.AppendChild(CreateParagraphProperties(paragraph.RowTexts[i][j].Item2));
 
-                    var docRun = new Run();
+					var docRun = new Run();
 
-                    var properties = new RunProperties();
+					var properties = new RunProperties();
 
-                    properties.AppendChild(new FontSize { Val = paragraph.RowTexts[i][j].Item2.Size });
+					properties.AppendChild(new FontSize { Val = paragraph.RowTexts[i][j].Item2.Size });
 
-                    if (paragraph.RowTexts[i][j].Item2.Bold)
-                    {
-                        properties.AppendChild(new Bold());
-                    }
+					if (paragraph.RowTexts[i][j].Item2.Bold)
+					{
+						properties.AppendChild(new Bold());
+					}
 
-                    docRun.AppendChild(properties);
+					docRun.AppendChild(properties);
 
-                    docRun.AppendChild(new Text { Text = paragraph.RowTexts[i][j].Item1, Space = SpaceProcessingModeValues.Preserve });
+					docRun.AppendChild(new Text { Text = paragraph.RowTexts[i][j].Item1, Space = SpaceProcessingModeValues.Preserve });
 
-                    docParagraph.AppendChild(docRun);
-                    TableCell docCell = new TableCell();
-                    docCell.AppendChild(docParagraph);
-                    docRow.AppendChild(docCell);
-                }
+					docParagraph.AppendChild(docRun);
+					TableCell docCell = new TableCell();
+					docCell.AppendChild(docParagraph);
+					docRow.AppendChild(docCell);
+				}
 
-                table.AppendChild(docRow);
-            }
+				table.AppendChild(docRow);
+			}
 
-            _docBody.AppendChild(table);
-        }
+			_docBody.AppendChild(table);
+		}
 
-        // Метод сохранения документа
-        protected override void SaveWord(WordInfo info)
+		//метод сохранения документа
+		protected override void SaveWord(WordInfo info)
         {
             if (_docBody == null || _wordDocument == null)
             {
                 return;
             }
 
-            // Вставляем информацию по секциям (смотри, что является входным параметром)
+            //вставляем информацию по секциям (смотри, что является входным параметром)
             _docBody.AppendChild(CreateSectionProperties());
 
-            // Сохраняем документ
+            //сохраняем документ
             _wordDocument.MainDocumentPart!.Document.Save();
 
-            _wordDocument.Dispose();
+            _wordDocument.Close();
         }
     }
 }
diff --git a/Bank/BankCashierApp/APICashier.cs b/Bank/BankCashierApp/APICashier.cs
index 10a1d37..dd1d0ab 100644
--- a/Bank/BankCashierApp/APICashier.cs
+++ b/Bank/BankCashierApp/APICashier.cs
@@ -1,5 +1,4 @@
-using Azure;
-using BankContracts.ViewModels;
+using BankContracts.ViewModels;
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankContracts.ViewModels.Client.ViewModels;
 using Newtonsoft.Json;
@@ -53,24 +52,24 @@ namespace BankCashierApp
 			}
 		}
 
-        //Post-запрос
-        public static async Task PostRequest<T>(string requestUrl, T model)
-        {
-            var json = JsonConvert.SerializeObject(model);
-            var data = new StringContent(json, Encoding.UTF8, "application/json");
+		//Post-запрос
+		public static void PostRequest<T>(string requestUrl, T model)
+		{
+			var json = JsonConvert.SerializeObject(model);
+			var data = new StringContent(json, Encoding.UTF8, "application/json");
 
-            var response = await _client.PostAsync(requestUrl, data);
+			var response = _client.PostAsync(requestUrl, data);
 
-            if (!response.IsSuccessStatusCode)
-            {
-                var result = await response.Content.ReadAsStringAsync();
-                throw new HttpRequestException($"Request failed with status code {response.StatusCode}: {result}");
-            }
-        }
+			var result = response.Result.Content.ReadAsStringAsync().Result;
 
+			if (!response.Result.IsSuccessStatusCode)
+			{
+				throw new Exception(result);
+			}
+		}
 
-        //Post-запрос для получения данных
-        public static T? PostRequestReport<T, U>(string requestUrl, U model)
+		//Post-запрос для получения данных
+		public static T? PostRequestReport<T, U>(string requestUrl, U model)
 		{
 			var json = JsonConvert.SerializeObject(model);
 			var data = new StringContent(json, Encoding.UTF8, "application/json");
diff --git a/Bank/BankCashierApp/Controllers/HomeController.cs b/Bank/BankCashierApp/Controllers/HomeController.cs
index c499a2b..a954f1b 100644
--- a/Bank/BankCashierApp/Controllers/HomeController.cs
+++ b/Bank/BankCashierApp/Controllers/HomeController.cs
@@ -6,7 +6,6 @@ using BankContracts.ViewModels.Cashier.ViewModels;
 using BankContracts.ViewModels.Client.ViewModels;
 using BankContracts.ViewModels.Reports.Cashier;
 using BankContracts.ViewModels.Reports;
-using BankContracts.ViewModels;
 using BankDataModels.Enums;
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
@@ -74,7 +73,7 @@ namespace BankCashierApp.Controllers
 				Name = name,
 				Surname = surname,
 				Patronymic = patronymic,
-				MobilePhone = telephone,
+				Telephone = telephone,
 				Email = login,
 				Password = password
 			});
@@ -84,7 +83,7 @@ namespace BankCashierApp.Controllers
 			APICashier.Cashier.Patronymic = patronymic;
 			APICashier.Cashier.Email = login;
 			APICashier.Cashier.Password = password;
-			APICashier.Cashier.MobilePhone = telephone;
+			APICashier.Cashier.Telephone = telephone;
 
 			Response.Redirect("Enter");
 		}
@@ -207,7 +206,7 @@ namespace BankCashierApp.Controllers
 				Patronymic = patronymic,
 				Email = login,
 				Password = password,
-				MobilePhone = telephone
+				Telephone = telephone
 			});
 
 			//переход на вкладку "Enter", чтобы пользователь сразу смог зайти
@@ -257,11 +256,12 @@ namespace BankCashierApp.Controllers
 				return Redirect("ErrorPage");
 			}
 
-			APICashier.PostRequest("/api/Account/RegisterAccount", new AccountBindingModel
+			APICashier.PostRequest("/api/Account/Register", new AccountBindingModel
 			{
 				CashierId = APICashier.Cashier.Id,
 				ClientId = clientId,
 				AccountNumber = accountNumber,
+				PasswordAccount = password,
 				Balance = balance,
 				DateOpen = DateTime.Now
 			});
@@ -588,9 +588,10 @@ namespace BankCashierApp.Controllers
 			var cashWithdrawals = APICashier.GetRequest<List<CashWithdrawalViewModel>>("api/Account/FindAllCashWithdrawal").Where(x => x.AccountId == int.Parse(accountId))
 				.Select(x => new ReportCashierAccountsViewModel
 				{
-					Sum = (int)x.Sum,
+					CashierSurname = x.SurmaneCashier,
+					Sum = x.Sum,
 					AccountSenderNumber = x.AccountNumber,
-					DateOperation = x.DateWithdrawal,
+					DateOperation = x.DateOperation,
 					typeOperation = TypeOperationEnum.Снятие
 				});
 
@@ -598,10 +599,10 @@ namespace BankCashierApp.Controllers
 				.Select(x => new ReportCashierAccountsViewModel
 				{
 					CashierSurname = x.CashierSurname,
-					Sum = (int)x.Sum,
+					Sum = x.Sum,
 					AccountPayeeNumber = x.AccountPayeeNumber,
 					AccountSenderNumber = x.AccountSenderNumber != null ? x.AccountSenderNumber : "---",
-					DateOperation = x.DateTransfer,
+					DateOperation = x.DateOperation,
 					typeOperation = x.AccountSenderId.HasValue ? TypeOperationEnum.Перевод : TypeOperationEnum.Пополнение
 				});
 
diff --git a/Bank/BankCashierApp/Views/Home/CloseDebiting.cshtml b/Bank/BankCashierApp/Views/Home/CloseDebiting.cshtml
index a567f89..1fc3ec8 100644
--- a/Bank/BankCashierApp/Views/Home/CloseDebiting.cshtml
+++ b/Bank/BankCashierApp/Views/Home/CloseDebiting.cshtml
@@ -1,5 +1,5 @@
 @{
-	ViewData["Title"] = "Одобрение снятия";
+	ViewData["Title"] = "Одобрение зачислений";
 }
 
 <div class="text-center">
diff --git a/Bank/BankCashierApp/Views/Home/CreateAccount.cshtml b/Bank/BankCashierApp/Views/Home/CreateAccount.cshtml
index 67653fb..58721cb 100644
--- a/Bank/BankCashierApp/Views/Home/CreateAccount.cshtml
+++ b/Bank/BankCashierApp/Views/Home/CreateAccount.cshtml
@@ -15,7 +15,7 @@
 	<div class="row mb-2">
 		<div class="col-4">Номер счёта:</div>
 		<div class="col-8">
-			<input type="text" id="accountNumber" class="form-control" name="accountNumber" required />
+			<input type="text" id="accountNumber" class="form-control" name="accountNumber" required/>
 		</div>
 	</div>
 	<div class="row mb-2">
@@ -27,7 +27,7 @@
 	<div class="row mb-2">
 		<div class="col-4">Баланс:</div>
 		<div class="col-8">
-			<input type="number" id="balance" class="form-control" name="balance" value=0 required min=0 />
+			<input type="number" id="balance" class="form-control" name="balance" value=0 required min=0/>
 		</div>
 	</div>
 	<div class="row mb-2">
diff --git a/Bank/BankCashierApp/Views/Home/CreateReport.cshtml b/Bank/BankCashierApp/Views/Home/CreateReport.cshtml
index e5dd909..766bad9 100644
--- a/Bank/BankCashierApp/Views/Home/CreateReport.cshtml
+++ b/Bank/BankCashierApp/Views/Home/CreateReport.cshtml
@@ -1,4 +1,5 @@
-@using BankContracts.ViewModels.Reports;
+@using BankContracts.ViewModels;
+@using BankContracts.ViewModels.Reports
 
 @model ReportCashierViewModelForHTML
 
@@ -125,3 +126,51 @@
 		</div>
 	}
 </form>
+
+<!--@{
+	ViewData["Title"] = "Создание отчёта";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Создание отчёта</h2>
+</div>
+<form method="post">
+	<div class="container px-4">
+		<div class="row gx-5">
+			<div class="col">
+				<div class="p-3">С</div>
+			</div>
+			<div class="col">
+				<div class="p-3 btn-group">
+					<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false" padding="10">
+						Начало периода
+					</button>
+					<ul class="dropdown-menu">
+						...
+					</ul>
+				</div>
+			</div>
+			<div class="col">
+				<div class="p-3">по</div>
+			</div>
+			<div class="col">
+				<div class="p-3 btn-group">
+					<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false" padding="10">
+						Конец периода
+					</button>
+					<ul class="dropdown-menu">
+						...
+					</ul>
+				</div>
+			</div>
+			<div class="col">
+				<div class="p-3">
+					<button type="button" class="btn btn-primary з-3">Создать</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Отчёт:</div>
+	</div>
+</form> -->
\ No newline at end of file
diff --git a/Bank/BankCashierApp/Views/Home/Crediting.cshtml b/Bank/BankCashierApp/Views/Home/Crediting.cshtml
index 59ab1b3..7185fc9 100644
--- a/Bank/BankCashierApp/Views/Home/Crediting.cshtml
+++ b/Bank/BankCashierApp/Views/Home/Crediting.cshtml
@@ -33,7 +33,10 @@
 						Сумма зачисления
 					</th>
 					<th>
-						Дата заявки
+						Дата открытия заявки
+					</th>
+					<th>
+						Статус заявки
 					</th>
 				</tr>
 			</thead>
@@ -51,7 +54,10 @@
 							@Html.DisplayFor(modelItem => item.Sum)
 						</td>
 						<td>
-							@Html.DisplayFor(modelItem => item.DateCredit)
+							@Html.DisplayFor(modelItem => item.DateOpen)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Status)
 						</td>
 					</tr>
 				}
diff --git a/Bank/BankCashierApp/Views/Home/Debiting.cshtml b/Bank/BankCashierApp/Views/Home/Debiting.cshtml
index 0d6fe63..a5c0a2f 100644
--- a/Bank/BankCashierApp/Views/Home/Debiting.cshtml
+++ b/Bank/BankCashierApp/Views/Home/Debiting.cshtml
@@ -1,5 +1,5 @@
 @using BankContracts.ViewModels.Client.ViewModels
-
+    
 
 @model List<DebitingViewModel>
 
@@ -36,6 +36,9 @@
 					<th>
 						Дата открытия заявки
 					</th>
+					<th>
+						Статус заявки
+					</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -52,7 +55,10 @@
 							@Html.DisplayFor(modelItem => item.Sum)
 						</td>
 						<td>
-							@Html.DisplayFor(modelItem => item.DateDebit)
+							@Html.DisplayFor(modelItem => item.DateOpen)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Status)
 						</td>
 					</tr>
 				}
diff --git a/Bank/BankCashierApp/Views/Home/Diagram.cshtml b/Bank/BankCashierApp/Views/Home/Diagram.cshtml
index ecae093..9aee666 100644
--- a/Bank/BankCashierApp/Views/Home/Diagram.cshtml
+++ b/Bank/BankCashierApp/Views/Home/Diagram.cshtml
@@ -3,7 +3,7 @@
 @model CashierDiagramViewModel
 
 @{
-    ViewData["Title"] = "Диаграмма";
+	ViewData["Title"] = "Диаграмма";
 }
 
 <div class="text-center">
@@ -14,23 +14,22 @@
     <div class="row mb-2">
         <div class="row">Номер счета:</div>
         <select id="accountId" name="accountId" class="form-control" asp-items="@(new SelectList( @ViewBag.Accounts, "Id", "AccountNumber"))">
-            <option disabled selected>Выберите счёт</option>
-        </select>
+				<option disabled selected>Выберите счёт</option>
+		</select>
     </div>
     <div class="row mb-2">
         <input style="width:100%;" type="submit" value="Выбрать" class="btn btn-dark" />
     </div>
 </form>
 
-@if (Model == null) return;
+@if (Model == null) return; 
 
 <div id="Diagrams" class="text-center">
     <div id="@Model.DiagramName Diagram">
         <canvas id="Chart"></canvas>
         <div id="params">
-            @foreach (var info in Model.Elements)
-            {
-                <input type="hidden" id="@info.Name" value="@info.Value" />
+            @foreach (var info in Model.Elements) {
+            <input type="hidden" id="@info.Name" value="@info.Value" />
             }
         </div>
     </div>
@@ -41,7 +40,7 @@
     const diagrams = document.getElementById('Diagrams').childNodes;
 
     let diagram_name = diagrams[1].id;
-
+    
     console.log(diagram_name);
     let diagram = document.getElementById(diagram_name).childNodes;
     console.log(diagram);
@@ -60,15 +59,15 @@
 
     new Chart(diagram.item(1), {
         type: 'bar',
-        data: {
-            labels: labels,
-            datasets: [{
-                label: 'Денег в этом месяце',
-                data: data,
-                borderWidth: 1,
-                backgroundColor: 'rgb(33, 37, 41)'
-            }]
-        },
+            data: {
+                labels: labels,
+                datasets: [{
+                    label: 'Денег в этом месяце',
+                    data: data,
+                    borderWidth: 1,
+                    backgroundColor: 'rgb(33, 37, 41)'
+                }]
+            },
         options: {
             plugins: {
                 legend: {
@@ -84,5 +83,5 @@
         }
     }
     );
-
+   
 </script>
diff --git a/Bank/BankCashierApp/Views/Home/Index.cshtml b/Bank/BankCashierApp/Views/Home/Index.cshtml
index 63138cb..5dfcb53 100644
--- a/Bank/BankCashierApp/Views/Home/Index.cshtml
+++ b/Bank/BankCashierApp/Views/Home/Index.cshtml
@@ -1,4 +1,4 @@
-@using BankContracts.ViewModels
+@using BankContracts.ViewModels.Cashier.ViewModels
 
 @model List<AccountViewModel>
 
diff --git a/Bank/BankCashierApp/Views/Home/Login.cshtml b/Bank/BankCashierApp/Views/Home/Login.cshtml
index 67c957c..f533506 100644
--- a/Bank/BankCashierApp/Views/Home/Login.cshtml
+++ b/Bank/BankCashierApp/Views/Home/Login.cshtml
@@ -7,7 +7,7 @@
 </div>
 
 <form class="form-signin text-center" method="post">
-	<h1 class="h3 mb-3 font-weight-normal">Логин</h1>
+    <h1 class="h3 mb-3 font-weight-normal">Логин</h1>
 	<input type="email" id="login" name="login" class="form-control" placeholder="Почта" required autofocus>
 	<input type="password" id="password" name="password" class="form-control" placeholder="Пароль" required>
 	<button class="btn btn-lg btn-dark btn-block" type="submit" asp-controller="Home" asp-action="Login">Войти</button>
diff --git a/Bank/BankCashierApp/Views/Home/MoneyTransfers.cshtml b/Bank/BankCashierApp/Views/Home/MoneyTransfers.cshtml
index e23b511..5c14cab 100644
--- a/Bank/BankCashierApp/Views/Home/MoneyTransfers.cshtml
+++ b/Bank/BankCashierApp/Views/Home/MoneyTransfers.cshtml
@@ -25,7 +25,7 @@
 	<div class="row mb-2">
 		<div class="col-4">Сумма перевода:</div>
 		<div class="col-8">
-			<input type="number" id="sumMoneyTransfer" class="form-control" name="sumMoneyTransfer" required min=1 value=1 />
+			<input type="number" id="sumMoneyTransfer" class="form-control" name="sumMoneyTransfer" required min=1 value=1/>
 		</div>
 	</div>
 	<div class="row mb-2">
diff --git a/Bank/BankCashierApp/Views/Home/Privacy.cshtml b/Bank/BankCashierApp/Views/Home/Privacy.cshtml
index eb50ee8..177f186 100644
--- a/Bank/BankCashierApp/Views/Home/Privacy.cshtml
+++ b/Bank/BankCashierApp/Views/Home/Privacy.cshtml
@@ -1,4 +1,5 @@
-@using BankContracts.ViewModels.Cashier.ViewModels
+@using BankContracts.ViewModels
+@using BankContracts.ViewModels.Cashier.ViewModels
 
 @model CashierViewModel
 
@@ -28,10 +29,10 @@
     </div>
     <div class="row mb-2">
         <div class="col-4">Телефон:</div>
-        <input type="text" id="telephone" name="telephone" class="form-control" placeholder="Телефон" value=@Html.DisplayFor(modelItem => Model.MobilePhone) required>
+        <input type="text" id="telephone" name="telephone" class="form-control" placeholder="Телефон" value=@Html.DisplayFor(modelItem => Model.Telephone) required>
     </div>
     <div class="row mb-2">
-        <button class="btn btn-lg btn-warning btn-block mb-2" type="submit" asp-controller="Home" asp-action="Privacy">Coхранить</button>
-        <button class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="Logout">Выйти из аккаунта</button>
+        <button class="btn btn-lg btn-dark btn-block mb-2" type="submit" asp-controller="Home" asp-action="Privacy">Coхранить</button>
+        <button class="btn btn-lg btn-dark btn-block" type="submit" asp-controller="Home" asp-action="Logout">Выйти из аккаунта</button>
     </div>
-</form>
+</form>
\ No newline at end of file
diff --git a/Bank/BankCashierApp/Views/Home/Register.cshtml b/Bank/BankCashierApp/Views/Home/Register.cshtml
index ceae1a0..830b6ab 100644
--- a/Bank/BankCashierApp/Views/Home/Register.cshtml
+++ b/Bank/BankCashierApp/Views/Home/Register.cshtml
@@ -1,38 +1,18 @@
 @{
-    ViewData["Title"] = "Регистрация";
+	ViewData["Title"] = "Регистрация";
 }
 
 <div class="text-center">
-    <h2 class="display-4">Регистрация</h2>
+	<h2 class="display-4">Регистрация</h2>
 </div>
 <form class="form-signin text-center" method="post">
-    <input type="email" id="login" name="login" class="form-control short-input mb-2" placeholder="Почта" required>
-    <input type="password" id="password" name="password" class="form-control short-input mb-2" placeholder="Пароль" required>
-    <input type="text" id="name" name="name" class="form-control short-input mb-2" placeholder="Имя" required>
-    <input type="text" id="surname" name="surname" class="form-control short-input mb-2" placeholder="Фамилия" required>
-    <input type="text" id="patronymic" name="patronymic" class="form-control short-input mb-2" placeholder="Отчество" required>
-    <input type="text" id="telephone" name="telephone" class="form-control short-input mb-2" placeholder="Телефон" required>
+	<h1 class="h3 mb-3 font-weight-normal">Регистрация</h1>
+	<input type="email" id="login" name="login" class="form-control" placeholder="Почта" required>
+	<input type="password" id="password" name="password" class="form-control" placeholder="Пароль" required>
+	<input type="text" id="name" name="name" class="form-control" placeholder="Имя" required>
+	<input type="text" id="surname" name="surname" class="form-control" placeholder="Фамилия" required>
+	<input type="text" id="patronymic" name="patronymic" class="form-control" placeholder="Отчество" required>
+	<input type="text" id="telephone" name="telephone" class="form-control" placeholder="Телефон" required>
 
-    <button class="btn btn-lg btn-dark btn-block mt-3" type="submit" asp-controller="Home" asp-action="Register">Зарегистрироваться</button>
-</form>
-
-<style>
-    .form-signin {
-        max-width: 300px;
-        margin: auto;
-    }
-
-    .short-input {
-        width: 100%;
-        padding: 10px;
-        margin-bottom: 15px;
-    }
-
-    .mb-2 {
-        margin-bottom: 10px;
-    }
-
-    .mt-3 {
-        margin-top: 20px;
-    }
-</style>
+	<button class="btn btn-lg btn-dark btn-block" type="submit" asp-controller="Home" asp-action="Register">Регистрация</button>
+</form>
\ No newline at end of file
diff --git a/Bank/BankCashierApp/Views/Home/ReportWithAccounts.cshtml b/Bank/BankCashierApp/Views/Home/ReportWithAccounts.cshtml
index 2983da5..3f97867 100644
--- a/Bank/BankCashierApp/Views/Home/ReportWithAccounts.cshtml
+++ b/Bank/BankCashierApp/Views/Home/ReportWithAccounts.cshtml
@@ -1,4 +1,5 @@
-@using BankContracts.ViewModels.Reports.Cashier
+@using BankContracts.ViewModels
+@using BankContracts.ViewModels.Reports.Cashier
 
 @model List<ReportCashierAccountsViewModel>?
 
@@ -12,9 +13,9 @@
 
 <div class="container" sf-type="container" sf-label="Bootstrap Container" sf-uid="2">
 
-	<div class="row" sf-type="container" sf-label="Row" sf-uid="3">
-		<div class="mb-4 mb-md-0 aos-init aos-animate col-md-3" sf-type="container" sf-label="Column" sf-anim-delay="1.5" data-aos="fade-down" data-aos-delay="400" sf-uid="4">
-			<div sf-type="container" sf-label="Container" class="py-15 h-100 bg-bg-2" sf-uid="5">
+    <div class="row" sf-type="container" sf-label="Row" sf-uid="3">
+        <div class="mb-4 mb-md-0 aos-init aos-animate col-md-3" sf-type="container" sf-label="Column" sf-anim-delay="1.5" data-aos="fade-down" data-aos-delay="400" sf-uid="4">
+            <div sf-type="container" sf-label="Container" class="py-15 h-100 bg-bg-2" sf-uid="5">
 				<form method="post">
 					<select id="accountId" name="accountId" class="form-control mb-2" asp-items="@(new SelectList(ViewBag.Accounts, "Id", "AccountNumber"))">
 						<option disabled selected>Выберите счёт</option>
@@ -29,10 +30,10 @@
 						<button class="btn btn-lg btn-dark btn-block" style="width: 100%;" type="submit" asp-controller="Home" asp-action="CreateCashierWordReport">Создать отчёт по заявкам снятия (WORD</button>
 					</div>
 				</form>
-			</div>
-		</div>
-		<div class="aos-init aos-animate col-md" sf-type="container" sf-label="Column" sf-anim-delay="2" data-aos="fade-down" data-aos-delay="500" sf-uid="8">
-			<div sf-type="container" sf-label="Container" class="py-15 h-100 bg-bg-2" sf-uid="9">
+            </div>
+        </div>
+        <div class="aos-init aos-animate col-md" sf-type="container" sf-label="Column" sf-anim-delay="2" data-aos="fade-down" data-aos-delay="500" sf-uid="8">
+            <div sf-type="container" sf-label="Container" class="py-15 h-100 bg-bg-2" sf-uid="9">
 				<table class="table">
 					<thead>
 						<tr>
@@ -58,31 +59,31 @@
 					</thead>
 					<tbody>
 						@foreach (var item in Model)
-						{
-							<tr>
-								<td>
-									@Html.DisplayFor(modelItem => item.typeOperation)
-								</td>
-								<td>
-									@Html.DisplayFor(modelItem => item.CashierSurname)
-								</td>
-								<td>
-									@Html.DisplayFor(modelItem => item.AccountSenderNumber)
-								</td>
-								<td>
-									@Html.DisplayFor(modelItem => item.AccountPayeeNumber)
-								</td>
-								<td>
-									@Html.DisplayFor(modelItem => item.Sum)
-								</td>
-								<td>
-									@Html.DisplayFor(modelItem => item.DateOperation)
-								</td>
-							</tr>
-						}
+					{
+					<tr>
+						<td>
+							@Html.DisplayFor(modelItem => item.typeOperation)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.CashierSurname)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.AccountSenderNumber)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.AccountPayeeNumber)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Sum)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.DateOperation)
+						</td>
+					</tr>
+					}
 					</tbody>
 				</table>
-			</div>
-		</div>
-	</div>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/Bank/BankCashierApp/Views/Shared/_Layout.cshtml b/Bank/BankCashierApp/Views/Shared/_Layout.cshtml
index 416cdb0..5f33dd4 100644
--- a/Bank/BankCashierApp/Views/Shared/_Layout.cshtml
+++ b/Bank/BankCashierApp/Views/Shared/_Layout.cshtml
@@ -1,67 +1,165 @@
-<!DOCTYPE html>
-<html lang="ru">
+@using BankCashierApp
+
+@{
+    bool authenticated = APICashier.Cashier != null;
+}
+
+<!DOCTYPE html>
+<html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - BankCashierApp</title>
+    <title>@ViewData["Title"]</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
-    <link rel="stylesheet" href="~/BankCashierApp.styles.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/css/site.css" />
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <style>
-        body.MyBody {
-            background-color: #f8f9fa;
+
+        body {
+            margin-bottom: 60px;
+            background-color: #ececec; /* Измененный цвет фона */
+            color: #333; /* Основной цвет текста */
+        }
+
+        .nav-main a {
+            position: relative;
+            color: #333;
+            cursor: pointer;
+            line-height: 1.5;
+            text-decoration: none;
+            padding: 10px;
+            transition: color 0.3s ease-out;
+        }
+
+            .nav-main a:after {
+                display: block;
+                position: absolute;
+                left: 0;
+                bottom: -5px;
+                width: 0;
+                height: 2px;
+                background-color: #333;
+                content: "";
+                transition: width 0.3s ease-out;
+            }
+
+            .nav-main a:hover, .nav-main a:focus {
+                color: #007bff; /* Цвет при наведении */
+            }
+
+                .nav-main a:hover:after,
+                .nav-main a:focus:after {
+                    width: 100%;
+                }
+
+        .nav-main .dropdown:hover .dropdown-menu {
+            display: block;
+            margin-top: 0;
+        }
+
+        .footer {
+            position: fixed;
+            left: 0;
+            bottom: 0;
+            width: 100%;
+            height: 80px;
+            background-color: #333;
+            color: #fff;
+        }
+
+        .form-signin {
+            width: 100%;
+            max-width: 400px;
+            padding: 20px;
+            margin: auto;
+            background-color: #fff;
+            border-radius: 10px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+        }
+
+            .form-signin .form-control {
+                position: relative;
+                box-sizing: border-box;
+                height: auto;
+                padding: 10px;
+                font-size: 16px;
+            }
+
+                .form-signin .form-control:focus {
+                    z-index: 2;
+                }
+
+            .form-signin input[type="email"] {
+                margin-bottom: -1px;
+                border-bottom-right-radius: 0;
+                border-bottom-left-radius: 0;
+            }
+
+            .form-signin input[type="password"] {
+                margin-bottom: 10px;
+                border-top-left-radius: 0;
+                border-top-right-radius: 0;
+            }
+
+        table.table tbody tr td,
+        table.table thead tr th,
+        table.table thead {
+            border-left: solid;
+            border-right: solid;
+            border-width: 2px;
+            border-color: #333;
+        }
+
+        table {
+            vertical-align: middle;
         }
 
         header {
-            background-color: #343a40;
+            background-color: #007bff; /* Цвет фона шапки */
+            color: #fff; /* Цвет текста шапки */
         }
 
             header a {
-                color: #fff !important;
+                color: #fff; /* Цвет текста ссылок в шапке */
             }
 
-            header .btn-warning {
-                color: #343a40;
-            }
+                header a:hover {
+                    color: #ffd700; /* Цвет текста ссылок при наведении */
+                }
 
-            header .dropdown-menu {
-                background-color: #343a40;
-            }
-
-        .nav-link:hover, .dropdown-item:hover {
-            background-color: #495057;
+        .btn-custom {
+            background-color: #007bff; /* Пользовательский цвет кнопки */
+            color: #fff; /* Цвет текста кнопки */
+            border: none;
         }
 
-        footer {
-            padding: 1rem 0;
-        }
+            .btn-custom:hover {
+                background-color: #0056b3; /* Цвет кнопки при наведении */
+            }
     </style>
 </head>
 <body class="MyBody">
-    <header class="d-flex flex-wrap align-items-center justify-content-center justify-content-md-between py-3 px-4 mb-4 border-bottom">
+    <header class="d-flex flex-wrap align-items-center justify-content-between py-3 px-4 mb-4 border-bottom">
         <div class="col-md-3 mb-2 mb-md-0">
             <a asp-controller="Home" asp-action="Enter" class="d-inline-flex link-body-emphasis text-decoration-none">
-                <span class="fs-4 text-light">Банк "Вы банкрот"</span>
+                <span class="fs-4">Банк "Вы банкрот"</span>
             </a>
         </div>
 
         <ul class="nav col-12 col-md-auto mb-2 justify-content-center mb-md-0 nav-main">
-            <li>
-                <a class="nav-link px-2 link-light" asparea="" asp-controller="Home" asp-action="Index">Счета</a>
-            </li>
+            <li><a class="nav-link px-2" asparea="" asp-controller="Home" asp-action="Index">Счета</a></li>
             <li class="dropdown">
-                <a href="#" class="nav-link px-2 link-light dropdown-toggle" id="navbarOperations" role="button" data-bs-toggle="dropdown" aria-expanded="false">Операции</a>
-                <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarOperations">
+                <a href="#" class="nav-link px-2">Операции</a>
+                <ul class="dropdown-menu">
                     <li><a class="dropdown-item" asp-controller="Home" asp-action="Debiting">Заявки на снятие</a></li>
                     <li><a class="dropdown-item" asp-controller="Home" asp-action="Crediting">Заявки на начисление</a></li>
                     <li><a class="dropdown-item" asp-controller="Home" asp-action="MoneyTransfers">Заявки на перевод</a></li>
                 </ul>
             </li>
             <li class="dropdown">
-                <a href="#" class="nav-link px-2 link-light dropdown-toggle" id="navbarReports" role="button" data-bs-toggle="dropdown" aria-expanded="false">Отчеты</a>
-                <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarReports">
+                <a href="#" class="nav-link px-2">Отчеты</a>
+                <ul class="dropdown-menu">
                     <li><a class="dropdown-item" asp-controller="Home" asp-action="ReportWithAccounts">Отчёт по аккаунтам</a></li>
                     <li><a class="dropdown-item" asp-controller="Home" asp-action="CreateReport">Отчёт за период</a></li>
                     <li><a class="dropdown-item" asp-controller="Home" asp-action="Diagram">Диаграмма</a></li>
@@ -72,14 +170,14 @@
             if (APICashier.Cashier == null)
             {
                 <div class="col-md-3 text-end">
-                    <a class="btn btn-warning me-2" asp-controller="Home" asp-action="Login">Войти</a>
-                    <a class="btn btn-warning" asp-controller="Home" asp-action="Register">Регистрация</a>
+                    <a class="btn btn-custom me-2" asp-controller="Home" asp-action="Login">Войти</a>
+                    <a class="btn btn-custom" asp-controller="Home" asp-action="Register">Регистрация</a>
                 </div>
             }
             else
             {
                 <div class="col-md-3 text-end">
-                    <a class="btn btn-warning me-2" id="exit" name="exit" asp-controller="Home" asp-action="Privacy">@APICashier.Cashier.Surname @APICashier.Cashier.Name</a>
+                    <a class="btn btn-custom me-2" id="exit" name="exit" asp-controller="Home" asp-action="Privacy">@APICashier.Cashier.Surname @APICashier.Cashier.Name</a>
                 </div>
             }
         }
@@ -90,7 +188,7 @@
         </main>
     </div>
 
-    <footer class="border-top bg-dark border-dark footer text-light">
+    <footer class="border-top footer">
         <div class="container text-center">
             &copy; 2024 - BankCashierApp
         </div>
diff --git a/Bank/BankCashierApp/Views/Shared/_Layout.cshtml.css b/Bank/BankCashierApp/Views/Shared/_Layout.cshtml.css
index a72cbea..947d5b5 100644
--- a/Bank/BankCashierApp/Views/Shared/_Layout.cshtml.css
+++ b/Bank/BankCashierApp/Views/Shared/_Layout.cshtml.css
@@ -2,47 +2,48 @@
 for details on configuring this project to bundle and minify static web assets. */
 
 a.navbar-brand {
-  white-space: normal;
-  text-align: center;
-  word-break: break-all;
+    white-space: normal;
+    text-align: center;
+    word-break: break-all;
 }
 
 a {
-  color: #0077cc;
+    color: #0077cc;
 }
 
 .btn-primary {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
 }
 
 .nav-pills .nav-link.active, .nav-pills .show > .nav-link {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
 }
 
 .border-top {
-  border-top: 1px solid #e5e5e5;
+    border-top: 1px solid #e5e5e5;
 }
+
 .border-bottom {
-  border-bottom: 1px solid #e5e5e5;
+    border-bottom: 1px solid #e5e5e5;
 }
 
 .box-shadow {
-  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+    box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
 }
 
 button.accept-policy {
-  font-size: 1rem;
-  line-height: inherit;
+    font-size: 1rem;
+    line-height: inherit;
 }
 
 .footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  white-space: nowrap;
-  line-height: 60px;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    white-space: nowrap;
+    line-height: 60px;
 }
diff --git a/Bank/BankClientApp/APIClient.cs b/Bank/BankClientApp/APIClient.cs
index 684f1cc..2f2f138 100644
--- a/Bank/BankClientApp/APIClient.cs
+++ b/Bank/BankClientApp/APIClient.cs
@@ -1,82 +1,81 @@
-using Azure;
-using BankContracts.ViewModels.Client.ViewModels;
+using BankContracts.ViewModels.Client.ViewModels;
 using Newtonsoft.Json;
 using System.Net.Http.Headers;
 using System.Text;
 
-namespace BankClientApp
+namespace BankСlientApp
 {
-	public class APIClient
-	{
-		private static readonly HttpClient _client = new();
+    public class APIClient
+    {
+        private static readonly HttpClient _client = new();
 
-		public static ClientViewModel? Client { get; set; } = null;
+        public static ClientViewModel? Client { get; set; } = null;
 
-		public static string ErrorMessage = string.Empty;
+        public static string ErrorMessage = string.Empty;
 
-		public static void Connect(IConfiguration configuration)
-		{
-			_client.BaseAddress = new Uri(configuration["IPAddress"]);
-			_client.DefaultRequestHeaders.Accept.Clear();
-			_client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-		}
+        public static void Connect(IConfiguration configuration)
+        {
+            _client.BaseAddress = new Uri(configuration["IPAddress"]);
+            _client.DefaultRequestHeaders.Accept.Clear();
+            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+        }
 
-		public static void SetErrorMessage(string error)
-		{
-			ErrorMessage = error;
-		}
+        public static void SetErrorMessage(string error)
+        {
+            ErrorMessage = error;
+        }
 
-		// Get-запрос
-		public static T? GetRequest<T>(string requestUrl)
-		{
-			var response = _client.GetAsync(requestUrl);
+        //Get-запрос
+        public static T? GetRequest<T>(string requestUrl)
+        {
+            var response = _client.GetAsync(requestUrl);
 
-			var result = response.Result.Content.ReadAsStringAsync().Result;
+            var result = response.Result.Content.ReadAsStringAsync().Result;
 
-			if (response.Result.IsSuccessStatusCode)
-			{
-				return JsonConvert.DeserializeObject<T>(result);
-			}
-			else
-			{
-				throw new Exception(result);
-			}
-		}
+            if (response.Result.IsSuccessStatusCode)
+            {
+                return JsonConvert.DeserializeObject<T>(result);
+            }
+            else
+            {
+                throw new Exception(result);
+            }
+        }
 
-		// Post-запрос
-		public static void PostRequest<T>(string requestUrl, T model)
-		{
-			var json = JsonConvert.SerializeObject(model);
-			var data = new StringContent(json, Encoding.UTF8, "application/json");
+        //Post-запрос
+        public static void PostRequest<T>(string requestUrl, T model)
+        {
+            var json = JsonConvert.SerializeObject(model);
+            var data = new StringContent(json, Encoding.UTF8, "application/json");
 
-			var response = _client.PostAsync(requestUrl, data);
+            var response = _client.PostAsync(requestUrl, data);
 
-			var result = response.Result.Content.ReadAsStringAsync().Result;
+            var result = response.Result.Content.ReadAsStringAsync().Result;
 
-			if (!response.Result.IsSuccessStatusCode)
-			{
-				throw new Exception(result);
-			}
-		}
+            if (!response.Result.IsSuccessStatusCode)
+            {
+                throw new Exception(result);
+            }
+        }
 
-		// Post-запрос для получения данных
-		public static T? PostRequestReport<T, U>(string requestUrl, U model)
-		{
-			var json = JsonConvert.SerializeObject(model);
-			var data = new StringContent(json, Encoding.UTF8, "application/json");
+        //Post-запрос для получения данных
+        public static T? PostRequestReport<T, U>(string requestUrl, U model)
+        {
+            var json = JsonConvert.SerializeObject(model);
+            var data = new StringContent(json, Encoding.UTF8, "application/json");
 
-			var response = _client.PostAsync(requestUrl, data);
+            var response = _client.PostAsync(requestUrl, data);
 
-			var result = response.Result.Content.ReadAsStringAsync().Result;
+            var result = response.Result.Content.ReadAsStringAsync().Result;
 
-			if (response.Result.IsSuccessStatusCode)
-			{
-				return JsonConvert.DeserializeObject<T>(result);
-			}
-			else
-			{
-				throw new Exception(result);
-			}
-		}
-	}
+            if (response.Result.IsSuccessStatusCode)
+            {
+                return JsonConvert.DeserializeObject<T>(result);
+            }
+            else
+            {
+                throw new Exception(result);
+            }
+        }
+    }
 }
diff --git a/Bank/BankClientApp/BankClientApp.csproj b/Bank/BankClientApp/BankClientApp.csproj
index 752393d..091403d 100644
--- a/Bank/BankClientApp/BankClientApp.csproj
+++ b/Bank/BankClientApp/BankClientApp.csproj
@@ -11,6 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BankBusinessLogic\BankBusinessLogic.csproj" />
     <ProjectReference Include="..\BankContracts\BankContracts.csproj" />
     <ProjectReference Include="..\BankDatabaseImplement\BankDatabaseImplement.csproj" />
   </ItemGroup>
diff --git a/Bank/BankClientApp/Controllers/HomeController.cs b/Bank/BankClientApp/Controllers/HomeController.cs
index bac904d..cc681cd 100644
--- a/Bank/BankClientApp/Controllers/HomeController.cs
+++ b/Bank/BankClientApp/Controllers/HomeController.cs
@@ -1,15 +1,15 @@
 using BankClientApp.Models;
+using BankContracts.ViewModels.Client.Diagram;
+using BankDataModels.Enums;
+using BankСlientApp;
+using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
 using BankContracts.BindingModels.Client;
 using BankContracts.BindingModels.Reports;
-using BankContracts.ViewModels;
-using BankContracts.ViewModels.Client.Diagram;
+using BankContracts.ViewModels.Cashier.ViewModels;
 using BankContracts.ViewModels.Client.ViewModels;
-using BankContracts.ViewModels.Reports;
 using BankContracts.ViewModels.Reports.Client;
-using BankDataModels.Enums;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.IdentityModel.Tokens;
-using System.Diagnostics;
+using BankContracts.ViewModels.Reports;
 
 namespace BankClientApp.Controllers
 {
@@ -22,631 +22,645 @@ namespace BankClientApp.Controllers
 			_logger = logger;
 		}
 
-		// Профиль, вход и регистрация
-		public IActionResult Index()
+		#region Профиль, вход и регистрация
+
+		[HttpGet]
+		public IActionResult Enter()
 		{
 			return View();
 		}
 
-        [HttpGet]
-        public IActionResult Enter()
-        {
-            return View();
-        }
-
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
-        }
-
-        [HttpGet]
-        public IActionResult ErrorPage()
-        {
-            return View();
-        }
-
-        // Логин и регистрация 
-
-        [HttpGet]
-        public IActionResult Login()
-        {
-            return View();
-        }
-
-        [HttpPost]
-        public IActionResult Login(string login, string password)
-        {
-            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password))
-            {
-                APIClient.SetErrorMessage("Введите логин и пароль");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.Client = APIClient.GetRequest<ClientViewModel>($"api/Client/Login?login={login}&password={password}");
-
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Неверный логин и пароль");
-
-                return Redirect("ErrorPage");
-            }
-
-            return Redirect("Enter");
-        }
-
-        [HttpGet]
-        public IActionResult Register()
-        {
-            return View();
-        }
-
-        [HttpPost]
-        public void Register(string login, string password, string name, string surname, string patronymic, string mobilephone)
-        {
-            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(name) 
-                || string.IsNullOrEmpty(surname) || string.IsNullOrEmpty(patronymic) || string.IsNullOrEmpty(mobilephone))
-            {
-                APIClient.SetErrorMessage("Проверьте правильность заполнения полей");
-
-                Response.Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Client/Register", new ClientBindingModel
-            {
-                Name = name,
-                Surname = surname,
-                Patronymic = patronymic,
-                Email = login,
-                Password = password,
-                MobilePhone = mobilephone
-            });
-
-            Response.Redirect("Enter");
-
-            return;
-        }
-
-        [HttpPost]
-        public IActionResult Logout()
-        {
-            APIClient.Client = null;
-
-            return Redirect("~/Home/Enter");
-        }
-
-        public IActionResult Privacy()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            return View(APIClient.Client);
-        }
-
-        [HttpPost]
-        public void Privacy(string login, string password, string name, string surname, string patronymic, string mobilephone)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
-            }
-
-            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(name)
-                || string.IsNullOrEmpty(surname) || string.IsNullOrEmpty(patronymic) || string.IsNullOrEmpty(mobilephone))
-            {
-                APIClient.SetErrorMessage("Проверьте правильность заполнения полей");
-
-                Response.Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("/api/Client/UpdateData", new ClientBindingModel
-            {
-                Id = APIClient.Client.Id,
-                Name = name,
-                Surname = surname,
-                Patronymic = patronymic,
-                MobilePhone = mobilephone,
-                Email = login,
-                Password = password
-            });
-
-            APIClient.Client.Name = name;
-            APIClient.Client.Surname = surname;
-            APIClient.Client.Patronymic = patronymic;
-            APIClient.Client.Email = login;
-            APIClient.Client.Password = password;
-            APIClient.Client.MobilePhone = mobilephone;
-
-            Response.Redirect("Enter");
-        
-        }
-
-        // Банковские карты, работа с картами //
-
-        [HttpGet]
-        public IActionResult CardsList()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            return View(APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetClientsCardsList?id={APIClient.Client.Id}"));
-        }
-
-        [HttpGet]
-        public IActionResult CreateCard()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            ViewBag.Accounts = APIClient.GetRequest<List<AccountViewModel>>($"api/Account/SearchAccountsOfClient?clientId={APIClient.Client.Id}");
-            return View();
-        }
-
-        [HttpPost]
-        public IActionResult CreateCard(string accountId, string number, double balance, DateTime period)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Необходимо авторизоваться");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (string.IsNullOrEmpty(accountId) || string.IsNullOrEmpty(number) || balance < 0
-                || period.Year == 0001 || period <= DateTime.Now)
-            {
-                APIClient.SetErrorMessage("Проверьте корректность параметров создаваемой карты");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Card/CreateCard", new CardBindingModel
-            {
-                Id = APIClient.Client.Id,
-                AccountId = int.Parse(accountId),
-                Number = number,
-                Balance = balance,
-                Period = period,
-            });
-
-            return Redirect("~/Home/CardsList");
-        }
-
-
-        // Снятие средств с банковской карты
-
-        [HttpGet]
-        public IActionResult DebitingList()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            return View(APIClient.GetRequest<List<DebitingViewModel>>($"api/Client/getUsersDebitings?userId={APIClient.Client.Id}"));
-        }
-
-        [HttpGet]
-        public IActionResult CreateDebiting()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            ViewBag.Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}");
-            return View();
-        }
-
-        [HttpPost]
-        public IActionResult CreateDebiting(string cardId, int sum)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Необходимо авторизоваться");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (string.IsNullOrEmpty(cardId) || sum <= 0)
-            {
-                APIClient.SetErrorMessage("Необходимо ввести корректную сумму для снятия");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Card/CreateDebitingRequest", new DebitingBindingModel()
-            {
-                CardId = int.Parse(cardId),
-                Sum = sum,
-                //DateOpen = DateTime.Now,
-                //Status = StatusEnum.Открыта
-            });
-
-            return Redirect("~/Home/DebitingList");
-        }
-
-        // === Пополнение средств === //
-
-        [HttpGet]
-        public IActionResult CreditingList()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            return View(APIClient.GetRequest<List<CreditingViewModel>>($"api/Client/getUsersCreditings?userId={APIClient.Client.Id}"));
-        }
-
-        [HttpGet]
-        public IActionResult CreateCrediting()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            ViewBag.Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}");
-            return View();
-        }
-
-        [HttpPost]
-        public IActionResult CreateCrediting(string cardId, int sum)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Не авторизованы");
-            }
-
-            if (string.IsNullOrEmpty(cardId) || sum <= 0)
-            {
-                APIClient.SetErrorMessage("Необходимо ввести корректную сумму для пополнения");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Card/CreateCreditingOperation", new CreditingBindingModel()
-            {
-                CardId = int.Parse(cardId),
-                Sum = sum,
-                //DateOpen = DateTime.Now,
-                //Status = StatusEnum.Открыта
-            });
-
-            return Redirect("~/Home/CreditingList");
-        }
-
-        //=== Получение отчёта PDF ===//
-
-        [HttpGet]
-        public IActionResult CreateReport()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            return View();
-        }
-
-        [HttpPost]
-        public IActionResult CreateReport(DateTime dateFrom, DateTime dateTo)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Не авторизованы");
-            }
-
-            if (dateFrom == dateTo || dateFrom > dateTo || dateFrom.Year == 0001 || dateTo.Year == 0001)
-            {
-                APIClient.SetErrorMessage("Необходимо задать корректные границы периода");
-
-                return Redirect("ErrorPage");
-            }
-
-            return View(APIClient.PostRequestReport<ReportClientViewModelForHTML, ReportSupportBindingModel>("api/Report/CreateClientReport", new ReportSupportBindingModel()
-            {
-                DateFrom = dateFrom,
-                DateTo = dateTo,
-                Email = APIClient.Client.Email
-            }));
-        }
-
-        //=== Excel отчёты ===//
-
-        // Отчёт клиента по переводам
-        [HttpPost]
-        public IActionResult CreateExcelReport(List<CheckboxViewModel> cards)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
-            {
-                APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Report/CreateExcelClient", new ReportSupportBindingModel()
-            {
-                CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
-                Email = APIClient.Client.Email
-            });
-
-            return Redirect("ReportSuccess");
-        }
-
-        // Отчёт клиента по пополнениям
-        [HttpPost]
-        public IActionResult CreateCreditingExcelReport(List<CheckboxViewModel> cards)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
-            {
-                APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Report/CreateExcelCrediting", new ReportSupportBindingModel()
-            {
-                CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
-                Email = APIClient.Client.Email
-            });
-
-            return Redirect("ReportSuccess");
-        }
-
-        // Отчёт клиента по снятиям
-        [HttpPost]
-        public IActionResult CreateDebitingExcelReport(List<CheckboxViewModel> cards)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
-            {
-                APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Report/CreateExcelDebiting", new ReportSupportBindingModel()
-            {
-                CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
-                Email = APIClient.Client.Email
-            });
-
-            return Redirect("ReportSuccess");
-        }
-
-        //=== Word отчёты клиента ===//
-
-        // Отчёт клиента по переводам
-        [HttpPost]
-        public IActionResult CreateWordReport(List<CheckboxViewModel> cards)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
-            {
-                APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Report/CreateWordClient", new ReportSupportBindingModel()
-            {
-                CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
-                Email = APIClient.Client.Email
-            });
-
-            return Redirect("ReportSuccess");
-        }
-
-        // Отчёт клиента по пополнениям
-        [HttpPost]
-        public IActionResult CreateCreditingWordReport(List<CheckboxViewModel> cards)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
-            {
-                APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Report/CreateWordCrediting", new ReportSupportBindingModel()
-            {
-                CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
-                Email = APIClient.Client.Email
-            });
-
-            return Redirect("ReportSuccess");
-        }
-
-        // Отчёт клиента по снятиям
-        [HttpPost]
-        public IActionResult CreateDebitingWordReport(List<CheckboxViewModel> cards)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
-            {
-                APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
-
-                return Redirect("ErrorPage");
-            }
-
-            APIClient.PostRequest("api/Report/CreateWordDebiting", new ReportSupportBindingModel()
-            {
-                CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
-                Email = APIClient.Client.Email
-            });
-
-            return Redirect("ReportSuccess");
-        }
-
-        // === Получение отчета по картам === //
-
-        [HttpGet]
-        public IActionResult ReportWithCards()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            return View(new ReportClientCardsViewModel()
-            {
-                Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}").Select(x => new CheckboxViewModel()
-                {
-                    Id = x.Id,
-                    LabelName = x.Number,
-                    IsChecked = false
-                }).ToList()
-            });
-        }
-
-        [HttpPost]
-        public IActionResult ReportWithCards(List<CheckboxViewModel> cards)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
-            {
-                APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
-
-                return Redirect("ErrorPage");
-            }
-
-            List<int> cardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList();
-
-            //List<ReportViewModel> creditings = APIClient.GetRequest<List<CreditingViewModel>>($"api/Client/getUsersCreditings?userId={APIClient.Client.Id}")
-            //    .Where(x => cardList.Contains(x.CardId)).Select(x => new ReportViewModel()
-            //    {
-            //        Id = x.Id,
-            //        CardId = x.CardId,
-            //       // DateOpen = x.DateOpen,
-            //       // DateClose = x.DateClose,
-            //        CardNumber = x.CardNumber,
-            //        //Status = x.Status,
-            //        Sum = x.Sum,
-            //        TypeOperation = TypeOperationEnum.Пополнение
-            //    }).ToList();
-
-            //List<ReportViewModel> debitings = APIClient.GetRequest<List<DebitingViewModel>>($"api/Client/getUsersDebitings?userId={APIClient.Client.Id}")
-            //    .Where(x => cardList.Contains(x.CardId)).Select(x => new ReportViewModel()
-            //    {
-            //        Id = x.Id,
-            //        CardId = x.CardId,
-            //        DateOpen = x.DateOpen,
-            //        DateClose = x.DateClose,
-            //        CardNumber = x.CardNumber,
-            //        Status = x.Status,
-            //        Sum = x.Sum,
-            //        TypeOperation = TypeOperationEnum.Снятие
-            //    }).ToList();
-
-            //List<ReportViewModel> result = creditings.Concat(debitings).OrderBy(x => x.DateOpen).ToList();
-
-            return View(new ReportClientCardsViewModel()
-            {
-                Cards = cards,
-                //Operations = result,
-            });
-        }
-
-        // === Диаграмма === //
-
-        [HttpGet]
-        public IActionResult Diagram()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            ViewBag.Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}");
-
-            return View();
-        }
-
-        [HttpPost]
-        public IActionResult Diagram(int cardId)
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            ViewBag.Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}");
-
-            return View(new ClientDiagramViewModel()
-            {
-                DiagramName = "Hello World",
-                Elements = APIClient.GetRequest<List<ClientDiagramElementsViewModel>>($"api/Card/getCardMonthResult?cardId={cardId}")
-            });
-        }
-
-        // Сообщение об успешной отправке отчёта на почту
-        [HttpGet]
-        public IActionResult ReportSuccess()
-        {
-            if (APIClient.Client == null)
-            {
-                APIClient.SetErrorMessage("Не авторизованы");
-
-                return Redirect("ErrorPage");
-            }
-
-            return View();
-        }
-    }
-}
+		[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+		public IActionResult Error()
+		{
+			return View(new ErrorViewModel
+			{
+				RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier
+			});
+		}
+
+		[HttpGet]
+		public IActionResult Login()
+		{
+			return View();
+		}
+
+		[HttpGet]
+		public IActionResult ErrorPage()
+		{
+			return View();
+		}
+
+		[HttpPost]
+		public IActionResult Login(string login, string password)
+		{
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password))
+			{
+				APIClient.SetErrorMessage("Введите логин и пароль");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.Client = APIClient.GetRequest<ClientViewModel>($"api/Client/Login?login={login}&password={password}");
+
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Неверный логин или пароль");
+
+				return Redirect("ErrorPage");
+			}
+
+			return Redirect("Enter");
+		}
+
+
+		[HttpGet]
+		public IActionResult Register()
+		{
+			return View();
+		}
+
+
+		[HttpPost]
+		public void Register(string login, string password, string name, string surname, string patronymic, string telephone)
+		{
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(name)
+				|| string.IsNullOrEmpty(surname) || string.IsNullOrEmpty(patronymic) || string.IsNullOrEmpty(telephone))
+			{
+				APIClient.SetErrorMessage("Проверьте правильность заполнения полей");
+
+				Response.Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Client/Register", new ClientBindingModel
+			{
+				Name = name,
+				Surname = surname,
+				Patronymic = patronymic,
+				Email = login,
+				Password = password,
+				Telephone = telephone
+			});
+
+			Response.Redirect("Enter");
+
+			return;
+		}
+
+		[HttpPost]
+		public IActionResult Logout()
+		{
+			APIClient.Client = null;
+
+			return Redirect("~/Home/Enter");
+		}
+
+		[HttpGet]
+		public IActionResult Privacy()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			return View(APIClient.Client);
+		}
+
+		[HttpPost]
+		public void Privacy(string login, string password, string name, string surname, string patronymic, string telephone)
+		{
+			if (APIClient.Client == null)
+			{
+				throw new Exception("Вы как сюда попали? Суда вход только авторизованным");
+			}
+
+			if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(name)
+				|| string.IsNullOrEmpty(surname) || string.IsNullOrEmpty(patronymic)
+				|| string.IsNullOrEmpty(telephone))
+			{
+				APIClient.SetErrorMessage("Проверьте правильность заполнения полей");
+
+				Response.Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("/api/Client/UpdateData", new ClientBindingModel
+			{
+				Id = APIClient.Client.Id,
+				Name = name,
+				Surname = surname,
+				Patronymic = patronymic,
+				Telephone = telephone,
+				Email = login,
+				Password = password
+			});
+
+			APIClient.Client.Name = name;
+			APIClient.Client.Surname = surname;
+			APIClient.Client.Patronymic = patronymic;
+			APIClient.Client.Email = login;
+			APIClient.Client.Password = password;
+			APIClient.Client.Telephone = telephone;
+
+			Response.Redirect("Enter");
+		}
+
+		#endregion
+
+		#region Карты
+		[HttpGet]
+		public IActionResult CardsList()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			return View(APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}"));
+		}
+
+		[HttpGet]
+		public IActionResult CreateCard()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			ViewBag.Accounts = APIClient.GetRequest<List<AccountViewModel>>($"api/Account/SearchAccountsOfCLient?clientId={APIClient.Client.Id}");
+			return View();
+		}
+
+		[HttpPost]
+		public IActionResult CreateCard(string accountId, string number, string cvc, DateTime period)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Необходимо авторизоваться");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (string.IsNullOrEmpty(accountId) || string.IsNullOrEmpty(number) || string.IsNullOrEmpty(cvc)
+				|| period.Year == 0001 || period <= DateTime.Now)
+			{
+				APIClient.SetErrorMessage("Проверьте корректность параметров создаваемой карты");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Card/CreateCard", new CardBindingModel
+			{
+				ClientID = APIClient.Client.Id,
+				AccountId = int.Parse(accountId),
+				Number = number,
+				CVC = cvc,
+				Period = period
+			});
+
+			return Redirect("~/Home/CardsList");
+		}
+
+		#endregion
+
+		#region Снятие средств
+
+		[HttpGet]
+		public IActionResult DebitingList()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			return View(APIClient.GetRequest<List<DebitingViewModel>>($"api/Client/getUsersDebitings?userId={APIClient.Client.Id}"));
+		}
+
+		[HttpGet]
+		public IActionResult CreateDebiting()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			ViewBag.Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}");
+			return View();
+		}
+
+		[HttpPost]
+		public IActionResult CreateDebiting(string cardId, int sum)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Необходимо авторизоваться");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (string.IsNullOrEmpty(cardId) || sum <= 0)
+			{
+				APIClient.SetErrorMessage("Необходимо ввести корректную сумму для снятия");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Card/CreateDebitingRequest", new DebitingBindingModel()
+			{
+				CardId = int.Parse(cardId),
+				Sum = sum,
+				DateOpen = DateTime.Now,
+				Status = StatusEnum.Открыта
+			});
+
+			return Redirect("~/Home/DebitingList");
+		}
+
+		#endregion
+
+		#region Пополнение средств
+
+		[HttpGet]
+		public IActionResult CreditingList()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			return View(APIClient.GetRequest<List<CreditingViewModel>>($"api/Client/getUsersCreditings?userId={APIClient.Client.Id}"));
+		}
+
+		[HttpGet]
+		public IActionResult CreateCrediting()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			ViewBag.Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}");
+			return View();
+		}
+
+		[HttpPost]
+		public IActionResult CreateCrediting(string cardId, int sum)
+		{
+			if (APIClient.Client == null)
+			{
+				throw new Exception("Не авторизованы");
+			}
+
+			if (string.IsNullOrEmpty(cardId) || sum <= 0)
+			{
+				APIClient.SetErrorMessage("Необходимо ввести корректную сумму для пополнения");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Card/CreateCreditingOperation", new CreditingBindingModel()
+			{
+				CardId = int.Parse(cardId),
+				Sum = sum,
+				DateOpen = DateTime.Now,
+				Status = StatusEnum.Открыта
+			});
+
+			return Redirect("~/Home/CreditingList");
+		}
+
+		#endregion
+
+		#region Получение отчёта PDF
+
+		[HttpGet]
+		public IActionResult CreateReport()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			return View();
+		}
+
+		[HttpPost]
+		public IActionResult CreateReport(DateTime dateFrom, DateTime dateTo)
+		{
+			if (APIClient.Client == null)
+			{
+				throw new Exception("Не авторизованы");
+			}
+
+			if (dateFrom == dateTo || dateFrom > dateTo || dateFrom.Year == 0001 || dateTo.Year == 0001)
+			{
+				APIClient.SetErrorMessage("Необходимо задать корректные границы периода");
+
+				return Redirect("ErrorPage");
+			}
+
+			return View(APIClient.PostRequestReport<ReportClientViewModelForHTML, ReportSupportBindingModel>("api/Report/CreateClientReport", new ReportSupportBindingModel()
+			{
+				DateFrom = dateFrom,
+				DateTo = dateTo,
+				Email = APIClient.Client.Email
+			}));
+		}
+
+		#endregion
+
+		#region Excel отчёты
+
+		//отчёт клиента по переводам
+		[HttpPost]
+		public IActionResult CreateExcelReport(List<CheckboxViewModel> cards)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
+			{
+				APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Report/CreateExcelClient", new ReportSupportBindingModel()
+			{
+				CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
+				Email = APIClient.Client.Email
+			});
+
+			return Redirect("ReportSuccess");
+		}
+
+		//отчёт клиента по пополнениям
+		[HttpPost]
+		public IActionResult CreateCreditingExcelReport(List<CheckboxViewModel> cards)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
+			{
+				APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Report/CreateExcelCrediting", new ReportSupportBindingModel()
+			{
+				CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
+				Email = APIClient.Client.Email
+			});
+
+			return Redirect("ReportSuccess");
+		}
+
+		//отчёт клиента по снятиям
+		[HttpPost]
+		public IActionResult CreateDebitingExcelReport(List<CheckboxViewModel> cards)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
+			{
+				APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Report/CreateExcelDebiting", new ReportSupportBindingModel()
+			{
+				CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
+				Email = APIClient.Client.Email
+			});
+
+			return Redirect("ReportSuccess");
+		}
+
+		#endregion
+
+		#region Word отчёты клиента 
+
+		//отчёт клиента по переводам
+		[HttpPost]
+		public IActionResult CreateWordReport(List<CheckboxViewModel> cards)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
+			{
+				APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Report/CreateWordClient", new ReportSupportBindingModel()
+			{
+				CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
+				Email = APIClient.Client.Email
+			});
+
+			return Redirect("ReportSuccess");
+		}
+
+		//отчёт клиента по пополнениям
+		[HttpPost]
+		public IActionResult CreateCreditingWordReport(List<CheckboxViewModel> cards)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
+			{
+				APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Report/CreateWordCrediting", new ReportSupportBindingModel()
+			{
+				CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
+				Email = APIClient.Client.Email
+			});
+
+			return Redirect("ReportSuccess");
+		}
+
+		//отчёт клиента по снятиям
+		[HttpPost]
+		public IActionResult CreateDebitingWordReport(List<CheckboxViewModel> cards)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
+			{
+				APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
+
+				return Redirect("ErrorPage");
+			}
+
+			APIClient.PostRequest("api/Report/CreateWordDebiting", new ReportSupportBindingModel()
+			{
+				CardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList(),
+				Email = APIClient.Client.Email
+			});
+
+			return Redirect("ReportSuccess");
+		}
+
+		#endregion
+
+		#region Получение отчета по картам
+		[HttpGet]
+		public IActionResult ReportWithCards()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			return View(new ReportClientCardsViewModel()
+			{
+				Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}").Select(x => new CheckboxViewModel()
+				{
+					Id = x.Id,
+					LabelName = x.Number,
+					IsChecked = false
+				}).ToList()
+			});
+		}
+
+		[HttpPost]
+		public IActionResult ReportWithCards(List<CheckboxViewModel> cards)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			if (cards.Count == 0 || cards.Count == cards.Where(x => x.IsChecked == false).ToList().Count)
+			{
+				APIClient.SetErrorMessage("Необходимо выбрать хотя-бы 1 карту для отчёта");
+
+				return Redirect("ErrorPage");
+			}
+
+			List<int> cardList = cards.Where(x => x.IsChecked).Select(x => x.Id).ToList();
+
+			List<ReportViewModel> creditings = APIClient.GetRequest<List<CreditingViewModel>>($"api/Client/getUsersCreditings?userId={APIClient.Client.Id}")
+				.Where(x => cardList.Contains(x.CardId)).Select(x => new ReportViewModel()
+				{
+					Id = x.Id,
+					CardId = x.CardId,
+					DateOpen = x.DateOpen,
+					DateClose = x.DateClose,
+					CardNumber = x.CardNumber,
+					Status = x.Status,
+					Sum = x.Sum,
+					TypeOperation = TypeOperationEnum.Пополнение
+				}).ToList();
+
+			List<ReportViewModel> debitings = APIClient.GetRequest<List<DebitingViewModel>>($"api/Client/getUsersDebitings?userId={APIClient.Client.Id}")
+				.Where(x => cardList.Contains(x.CardId)).Select(x => new ReportViewModel()
+				{
+					Id = x.Id,
+					CardId = x.CardId,
+					DateOpen = x.DateOpen,
+					DateClose = x.DateClose,
+					CardNumber = x.CardNumber,
+					Status = x.Status,
+					Sum = x.Sum,
+					TypeOperation = TypeOperationEnum.Снятие
+				}).ToList();
+
+			List<ReportViewModel> result = creditings.Concat(debitings).OrderBy(x => x.DateOpen).ToList();
+
+			return View(new ReportClientCardsViewModel()
+			{
+				Cards = cards,
+				Operations = result,
+			});
+		}
+		#endregion
+
+		#region Диаграмма
+
+		[HttpGet]
+		public IActionResult Diagram()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			ViewBag.Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}");
+
+			return View();
+		}
+
+		[HttpPost]
+		public IActionResult Diagram(int cardId)
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			ViewBag.Cards = APIClient.GetRequest<List<CardViewModel>>($"api/Card/GetUsersCardsList?id={APIClient.Client.Id}");
+
+			return View(new ClientDiagramViewModel()
+			{
+				DiagramName = "Hello World",
+				Elements = APIClient.GetRequest<List<ClientDiagramElementsViewModel>>($"api/Card/getCardMonthResult?cardId={cardId}")
+			});
+		}
+
+		#endregion
+
+		//сообщение об успешной отправке отчёта на почту
+		[HttpGet]
+		public IActionResult ReportSuccess()
+		{
+			if (APIClient.Client == null)
+			{
+				APIClient.SetErrorMessage("Не авторизованы");
+
+				return Redirect("ErrorPage");
+			}
+
+			return View();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Bank/BankClientApp/Program.cs b/Bank/BankClientApp/Program.cs
index a702470..f73fd3c 100644
--- a/Bank/BankClientApp/Program.cs
+++ b/Bank/BankClientApp/Program.cs
@@ -1,4 +1,4 @@
-using BankClientApp;
+using Bank�lientApp;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -12,9 +12,9 @@ APIClient.Connect(builder.Configuration);
 // Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())
 {
-	app.UseExceptionHandler("/Home/Error");
-	// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-	app.UseHsts();
+    app.UseExceptionHandler("/Home/Error");
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
 }
 
 app.UseHttpsRedirection();
@@ -25,7 +25,7 @@ app.UseRouting();
 app.UseAuthorization();
 
 app.MapControllerRoute(
-	name: "default",
-	pattern: "{controller=Home}/{action=Index}/{id?}");
+    name: "default",
+    pattern: "{controller=Home}/{action=Enter}/{id?}");
 
 app.Run();
diff --git a/Bank/BankClientApp/Views/Home/CardsList.cshtml b/Bank/BankClientApp/Views/Home/CardsList.cshtml
index e2ac9ee..419f857 100644
--- a/Bank/BankClientApp/Views/Home/CardsList.cshtml
+++ b/Bank/BankClientApp/Views/Home/CardsList.cshtml
@@ -1,60 +1,62 @@
 @using BankContracts.ViewModels.Client.ViewModels
 
+
 @model List<CardViewModel>
 
 @{
-    ViewData["Title"] = "Cписок банковских карт";
+	ViewData["Title"] = "Список карт";
 }
 
 <div class="text-center">
-    <h1 class="display-4">Банковские карты</h1>
+	<h1 class="display-4">Карты</h1>
 </div>
 
 <div class="text-center">
-    @{
-        <p>
-            <a asp-action="CreateCard">Оформить банковскую карту</a>
-        </p>
-        <table class="table">
-            <thead>
-                <tr>
-                    <th>
-                        Номер карты
-                    </th>
-                    <th>
-                        Фамилия владельца
-                    </th>
-                    <th>
-                        Имя владельца
-                    </th>
-                    <th>
-                        Баланс
-                    </th>
-                    <th>
-                        Период
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (var item in Model)
-                {
-                    <tr>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.Number)
-                        </td>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.ClientSurname)
-                        </td>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.Balance)
-                        </td>
-                        <td>
-                            @Html.DisplayFor(modelItem => item.Period)
-                        </td>
-                    </tr>
-                }
-
-            </tbody>
-        </table>
-    }
-</div>
+	@{
+		if (Model == null)
+		{
+			<h3 class="display-4">Сначала авторизируйтесь</h3>
+			return;
+		}
+		<p>
+			<a asp-action="CreateCard">Создать карту</a>
+		</p>
+		<table class="table">
+			<thead>
+				<tr>
+					<th>
+						Номер карты
+					</th>
+					<th>
+						Баланс
+					</th>
+					<th>
+						CVC
+					</th>
+					<th>
+						Срок действия
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				@foreach (var item in Model)
+				{
+					<tr>
+						<td>
+							@Html.DisplayFor(modelItem => item.Number)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Sum)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.CVC)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Period)
+						</td>
+					</tr>
+				}
+			</tbody>
+		</table>
+	}
+</div>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/CreateCard.cshtml b/Bank/BankClientApp/Views/Home/CreateCard.cshtml
index 794ed50..10c8758 100644
--- a/Bank/BankClientApp/Views/Home/CreateCard.cshtml
+++ b/Bank/BankClientApp/Views/Home/CreateCard.cshtml
@@ -1,43 +1,41 @@
 @{
-	ViewData["Title"] = "Оформление банковской карты";
+	ViewData["Title"] = "Создание карты";
 }
 
 <div class="text-center">
-	<h2 class="display-4">Оформление банковской карты</h2>
+	<h2 class="display-4">Создание карты</h2>
 </div>
 <form method="post">
 	<div class="row mb-2">
-		<div class="col-4">Номер счёта:</div>
+		<div class="col-4">Номер счета:</div>
 		<div class="col-8">
-			<select id="account" name="accountId" class="form-control" asp-items="@(new SelectList( @ViewBag.Accounts, "Id", "AccountNumber"))"></select>
+			<select id="accountId" name="accountId" class="form-control" asp-items="@(new SelectList( @ViewBag.Accounts, "Id", "AccountNumber"))"></select>
 		</div>
 	</div>
 	<div class="row mb-2">
 		<div class="col-4">Номер карты:</div>
 		<div class="col-8">
-			<input type="text" id="number" class="form-control" name="number" required />
+			<input type="text" class="form-control" name="number" id="number" required />
 		</div>
 	</div>
 	<div class="row mb-2">
-		<div class="col-4">Период:</div>
+		<div class="col-4">CVC:</div>
 		<div class="col-8">
-			<input type="date" id="period" class="form-control" name="period" required />
+			<input type="text" class="form-control" name="cvc" id="cvc" required />
 		</div>
 	</div>
 	<div class="row mb-2">
-		<div class="col-4">Баланс:</div>
+		<div class="col-4">Срок действия:</div>
 		<div class="col-8">
-			<input type="number" id="balance" class="form-control" name="balance" value=0 required min=0 />
+			<input type="date" class="form-control" name="period" id="period" required />
 		</div>
 	</div>
 	<div class="row mb-2">
-		<div class="col-8"></div>
-		<div class="col-4">
-			<input type="submit" value="Создать" class="form-control" class="btn btn-dark" />
-		</div>
+		<input type="submit" value="Создание" style="width: 100%" class="btn btn-warning" />
 	</div>
 </form>
 
+
 <script>
 	function createNum(len) {
 		chrs = '0123456789';
@@ -50,6 +48,7 @@
 	}
 
 	document.getElementById("number").value = createNum(16);
+	document.getElementById("cvc").value = createNum(3);
 	let year = new Date();
 	year.setFullYear(year.getFullYear() + 5)
 	document.getElementById("period").valueAsDate = new Date(year);
diff --git a/Bank/BankClientApp/Views/Home/CreateCrediting.cshtml b/Bank/BankClientApp/Views/Home/CreateCrediting.cshtml
new file mode 100644
index 0000000..2c91c07
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/CreateCrediting.cshtml
@@ -0,0 +1,24 @@
+@{
+	ViewData["Title"] = "Операция пополнения";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Создание операции</h2>
+</div>
+<form method="post">
+	<div class="row mb-2">
+		<div class="col-4">Номер карты:</div>
+		<div class="col-8">
+			<select id="cardId" name="cardId" class="form-control" asp-items="@(new SelectList( @ViewBag.Cards, "Id", "Number"))"></select>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<div class="col-4">Cумма операции:</div>
+		<div class="col-8">
+			<input type="number" class="form-control" name="sum" required autofocus/>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<input type="submit" value="Создание" style="width: 100%" class="btn btn-warning" />
+	</div>
+</form>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/CreateDebiting.cshtml b/Bank/BankClientApp/Views/Home/CreateDebiting.cshtml
new file mode 100644
index 0000000..03e2e5e
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/CreateDebiting.cshtml
@@ -0,0 +1,24 @@
+@{
+	ViewData["Title"] = "Операция снятия";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Создание операции</h2>
+</div>
+<form method="post">
+	<div class="row mb-2">
+		<div class="col-4">Номер карты:</div>
+		<div class="col-8">
+			<select id="cardId" name="cardId" class="form-control" asp-items="@(new SelectList( @ViewBag.Cards, "Id", "Number"))"></select>
+		</div>
+	</div>
+	<div class="row mb-2">
+		<div class="col-4">Cумма операции:</div>
+		<div class="col-8">
+			<input type="number" name="sum" class="form-control" required autofocus />
+		</div>
+	</div>
+	<div class="row mb-2">
+		<input type="submit" style="width: 100%" value="Создание" class="btn btn-warning" />
+	</div>
+</form>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/CreateExcelReport.cshtml b/Bank/BankClientApp/Views/Home/CreateExcelReport.cshtml
new file mode 100644
index 0000000..2561e8b
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/CreateExcelReport.cshtml
@@ -0,0 +1,20 @@
+@{
+	ViewData["Title"] = "Создание Excel отчёта";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Создание отчёта</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Выберите карту:</div>
+		<div class="col-8">
+			<select id="cardId" name="cardId" class="form-control" asp-items="@(new SelectList( @ViewBag.Cards, "Id", "Number"))"></select>
+		</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4">
+				<input type="submit" value="Создание" class="btn btn-warning" />
+		</div>
+	</div>
+</form>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/CreateReport.cshtml b/Bank/BankClientApp/Views/Home/CreateReport.cshtml
index e1dd794..97ac65b 100644
--- a/Bank/BankClientApp/Views/Home/CreateReport.cshtml
+++ b/Bank/BankClientApp/Views/Home/CreateReport.cshtml
@@ -1,5 +1,118 @@
-@*
-    For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
-*@
+@using BankContracts.ViewModels;
+@using BankContracts.ViewModels.Reports
+@using BankСlientApp
+
+@model ReportClientViewModelForHTML
+
 @{
+	ViewData["Title"] = "Создание отчёта";
 }
+
+<div class="text-center">
+	<h2 class="display-4">Отчёт по картам за выбранный период</h2>
+</div>
+<form method="post">
+	<div class="row mb-2">
+		<div class="col-4">Дата начала периода:</div>
+		<div class="col-8">
+			<input id="dateFrom" name="dateFrom" class="form-control" type="date" required />
+		</div>
+	</div>
+	<div class="row mb-2">
+		<div class="col-4">Дата конца периода:</div>
+		<div class="col-8">
+			<input id="dateTo" name="dateTo" class="form-control" type="date" required />
+		</div>
+	</div>
+	<div class="row">
+		<input id="createReport" style="width:100%;" type="submit" value="Сформировать отчёт" class="btn btn-warning" />
+	</div>
+
+	<hr class="mt-5 mb-3" />
+	@if (Model != null)
+	{
+		<div class="row text-center">
+			<h3>Отчет отправлен на почту @APIClient.Client.Email</h3>
+			<hr class="mt-5 mb-3" />
+			<p>Отчёт по пополнениям</p>
+			<table class="table">
+				<thead>
+					<tr>
+						<th>
+							Номер операции
+						</th>
+						<th>
+							Номер карты
+						</th>
+						<th>
+							Сумма
+						</th>
+						<th>
+							Дата операции
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+					@foreach (var item in Model.ReportCrediting)
+					{
+						<tr>
+							<td>
+								@Html.DisplayFor(modelItem => item.OperationId)
+							</td>
+							<td>
+								@Html.DisplayFor(modelItem => item.CardNumber)
+							</td>
+							<td>
+								@Html.DisplayFor(modelItem => item.SumOperation)
+							</td>
+							<td>
+								@Html.DisplayFor(modelItem => item.DateComplite)
+							</td>
+						</tr>
+					}
+				</tbody>
+			</table>
+		</div>
+		<hr class="my-12" />
+		<div class="row text-center">
+			<p>Отчёт по снятиям</p>
+			<table class="table">
+				<thead>
+					<tr>
+						<th>
+							Номер операции
+						</th>
+						<th>
+							Номер карты
+						</th>
+						<th>
+							Сумма
+						</th>
+						<th>
+							Дата операции
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+					@foreach (var item in Model.ReportDebiting)
+					{
+						<tr>
+							<td>
+								@Html.DisplayFor(modelItem => item.OperationId)
+							</td>
+							<td>
+								@Html.DisplayFor(modelItem => item.CardNumber)
+							</td>
+							<td>
+								@Html.DisplayFor(modelItem => item.SumOperation)
+							</td>
+							<td>
+								@Html.DisplayFor(modelItem => item.DateComplite)
+							</td>
+						</tr>
+					}
+				</tbody>
+			</table>
+		</div>
+	}
+</form>
diff --git a/Bank/BankClientApp/Views/Home/CreditingList.cshtml b/Bank/BankClientApp/Views/Home/CreditingList.cshtml
new file mode 100644
index 0000000..0386355
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/CreditingList.cshtml
@@ -0,0 +1,67 @@
+@using BankContracts.ViewModels.Client.ViewModels
+
+@model List<CreditingViewModel>
+
+@{
+	ViewData["Title"] = "Операция пополнения";
+}
+
+<div class="text-center">
+	<h1 class="display-4">Операция пополнения</h1>
+</div>
+
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+			<h3 class="display-4">Сначала авторизируйтесь</h3>
+			return;
+		}
+		<p>
+			<a asp-action="CreateCrediting">Пополнить средства</a>
+		</p>
+		<table class="table">
+			<thead>
+				<tr>
+					<th>
+						Номер карты
+					</th>
+					<th>
+						Сумма
+					</th>
+					<th>
+						Статус
+					</th>
+					<th>
+						Дата открытия
+					</th>
+					<th>
+						Дата закрытия
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				@foreach (var item in Model)
+				{
+					<tr>
+						<td>
+							@Html.DisplayFor(modelItem => item.CardNumber)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Sum)
+						</td>
+						<td>
+							@item.Status.ToString().Replace("_", " ")
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.DateOpen)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.DateClose)
+						</td>
+					</tr>
+				}
+			</tbody>
+		</table>
+	}
+</div>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/DebitingList.cshtml b/Bank/BankClientApp/Views/Home/DebitingList.cshtml
new file mode 100644
index 0000000..210693b
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/DebitingList.cshtml
@@ -0,0 +1,67 @@
+@using BankContracts.ViewModels.Client.ViewModels;
+
+@model List<DebitingViewModel>
+
+@{
+	ViewData["Title"] = "Операция снятия";
+}
+
+<div class="text-center">
+	<h1 class="display-4">Операция снятия</h1>
+</div>
+
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+			<h3 class="display-4">Сначала авторизируйтесь</h3>
+			return;
+		}
+		<p>
+			<a asp-action="CreateDebiting">Снять средства</a>
+		</p>
+		<table class="table">
+			<thead>
+				<tr>
+					<th>
+						Номер карты
+					</th>
+					<th>
+						Сумма
+					</th>
+					<th>
+						Статус
+					</th>
+					<th>
+						Дата открытия
+					</th>
+					<th>
+						Дата закрытия
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				@foreach (var item in Model)
+				{
+					<tr>
+						<td>
+							@Html.DisplayFor(modelItem => item.CardNumber)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Sum)
+						</td>
+						<td>
+							@item.Status.ToString().Replace("_", " ")
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.DateOpen)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.DateClose)
+						</td>
+					</tr>
+				}
+			</tbody>
+		</table>
+	}
+</div>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/Diagram.cshtml b/Bank/BankClientApp/Views/Home/Diagram.cshtml
new file mode 100644
index 0000000..5e751c8
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/Diagram.cshtml
@@ -0,0 +1,92 @@
+@using BankContracts.ViewModels.Client.Diagram
+
+@model ClientDiagramViewModel
+
+@{
+	ViewData["Title"] = "Диаграмма";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Диаграмма финансов на карте по месяцам</h1>
+</div>
+
+<form method="post">
+    <div class="row mb-2">
+        <div class="row">Номер карты:</div>
+        <div class="col">
+            <select id="cardId" name="cardId" class="form-control" asp-items="@(new SelectList( @ViewBag.Cards, "Id", "Number"))"></select>
+        </div>
+    </div>
+    <div class="row mb-2">
+        <div class="col">
+            <input style="width: 100%" type="submit" value="Выбрать" class="btn btn-warning"/>
+        </div>
+    </div>
+</form>
+
+@if (Model == null) return; 
+
+<div id="Diagrams" class="text-center">
+    <div id="@Model.DiagramName Diagram">
+        <canvas id="Chart"></canvas>
+        <div id="params">
+            @foreach (var info in Model.Elements) {
+            <input type="hidden" id="@info.Name" value="@info.Value" />
+            }
+        </div>
+    </div>
+</div>
+<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+
+<script>
+    const diagrams = document.getElementById('Diagrams').childNodes;
+
+    let diagram_name = diagrams[1].id;
+    
+    console.log(diagram_name);
+    let diagram = document.getElementById(diagram_name).childNodes;
+    console.log(diagram);
+    let labels = [];
+    let data = [];
+    document.getElementById('params').childNodes.forEach(element => {
+        if (element.id != undefined) {
+            labels.push(element.id);
+        }
+    });
+    document.getElementById('params').childNodes.forEach(element => {
+        if (element.id != undefined) {
+            data.push(Number(element.value));
+        }
+    });
+
+    new Chart(diagram.item(1), {
+        type: 'bar',
+            data: {
+                labels: labels,
+                datasets: [{
+                    label: 'Денег в этом месяце',
+                    data: data,
+                    borderWidth: 6,
+                    backgroundColor: 'rgb(255, 165, 0)'
+                }]
+            },
+        options: {
+            plugins: {
+                legend: {
+                    display: false
+                },
+                customCanvasBackgroundColor: {
+                    color: 'white',
+                }
+            },
+            scales: {
+                y: {
+                    suggestedMin: Math.min(data) - Math.min(data) * -0.1,
+                    suggestedMax: Math.max(data) + Math.max(data) * 0.1,
+                }
+            }
+        }
+    }
+    );
+   
+</script>
diff --git a/Bank/BankClientApp/Views/Home/Enter.cshtml b/Bank/BankClientApp/Views/Home/Enter.cshtml
index e14b5ff..03d5460 100644
--- a/Bank/BankClientApp/Views/Home/Enter.cshtml
+++ b/Bank/BankClientApp/Views/Home/Enter.cshtml
@@ -1,4 +1,4 @@
-@using BankClientApp
+@using BankСlientApp
 
 @{
 	ViewData["Title"] = "Страница пользователя";
@@ -10,7 +10,7 @@
 
 <div class="text-center">
 	@{
-		<img src="~/lib/logo.png" style="width: 80%"/>
+		<img src="https://i1.ytimg.com/vi/nNQemfCR9Ms/maxresdefault.jpg" alt="*" class="img-fluid" style="width: 70%; display: block; margin: 0 auto;">
 
 		if (APIClient.Client == null)
 		{
@@ -20,4 +20,4 @@
 
 		<h3 class="display-4">Здравствуйтe, @APIClient.Client.Name   @APIClient.Client.Patronymic</h3>
 	}
-</div>
+</div>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/ErrorPage.cshtml b/Bank/BankClientApp/Views/Home/ErrorPage.cshtml
new file mode 100644
index 0000000..298fb19
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/ErrorPage.cshtml
@@ -0,0 +1,10 @@
+@using BankСlientApp
+
+@{
+	ViewData["Title"] = "Отправка отчета";
+}
+
+<div class="text-center p-5">
+	<h3 class="display-4">Упс, что-то пошло не так...</h3>
+	<h3 class="display-4">Ошибка: @APIClient.ErrorMessage</h3>
+</div>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/Index.cshtml b/Bank/BankClientApp/Views/Home/Index.cshtml
index 709e78c..2f367c4 100644
--- a/Bank/BankClientApp/Views/Home/Index.cshtml
+++ b/Bank/BankClientApp/Views/Home/Index.cshtml
@@ -1,4 +1,5 @@
-@{
+@using BankСlientApp
+@{
     ViewData["Title"] = "Добро пожаловать";
 }
 
diff --git a/Bank/BankClientApp/Views/Home/Login.cshtml b/Bank/BankClientApp/Views/Home/Login.cshtml
index 2addc20..f73e135 100644
--- a/Bank/BankClientApp/Views/Home/Login.cshtml
+++ b/Bank/BankClientApp/Views/Home/Login.cshtml
@@ -6,16 +6,9 @@
 	<h2 class="display-4">Вход в приложение</h2>
 </div>
 
-
-<form class="form-signin text-center w-50 mx-auto" method="post">
-    <div class="mt-3 mb-3 h3">
-        <label for="login" class="form-label font-weight-normal">Логин</label>
-        <input type="text" name="login" id="login" class="form-control" placeholder="Логин" required autofocus />
-    </div>
-    <div class="mb-3 h3">
-        <label for="password" class="form-label font-weight-normal">Пароль</label>
-        <input type="password" name="password" id="password" class="form-control" placeholder="Пароль" required />
-    </div>
-    <button type="submit" class="btn btn-primary btn-warning btn-block mt-2">Вход</button>
-</form>
-
+<form class="form-signin text-center" method="post">
+    <h1 class="h3 mb-3 font-weight-normal">Логин</h1>
+	<input type="email" id="login" name="login" class="form-control" placeholder="Почта" required autofocus>
+	<input type="password" id="password" name="password" class="form-control" placeholder="Пароль" required>
+	<button class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="Login">Войти</button>
+</form>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/Privacy.cshtml b/Bank/BankClientApp/Views/Home/Privacy.cshtml
index 0d57090..5400c58 100644
--- a/Bank/BankClientApp/Views/Home/Privacy.cshtml
+++ b/Bank/BankClientApp/Views/Home/Privacy.cshtml
@@ -9,30 +9,29 @@
 <div class="text-center">
     <h2 class="display-4">Личные данные</h2>
 </div>
-
-<form method="post" class="form-signin w-75 mx-auto">
+<form method="post" class="form-signin">
     <div class="row">
-        <div class="col-4 mt-2">Логин:</div>
+        <div class="col-4">Логин:</div>
         <input type="email" id="login" name="login" class="form-control" placeholder="Почта" value=@Html.DisplayFor(modelItem => Model.Email) required>
     </div>
     <div class="row">
-        <div class="col-4 mt-2">Пароль:</div>
+        <div class="col-4">Пароль:</div>
         <input type="password" id="password" name="password" class="form-control" placeholder="Пароль" value=@Html.DisplayFor(modelItem => Model.Password) required>
     </div>
     <div class="row">
-        <div class="col-4 mt-2">Имя:</div>
+        <div class="col-4">Имя:</div>
         <input type="text" id="name" name="name" class="form-control" placeholder="Имя" value=@Html.DisplayFor(modelItem => Model.Name) required>
-        <div class="col-4 mt-2">Фамилия:</div>
+        <div class="col-4">Фамилия:</div>
         <input type="text" id="surname" name="surname" class="form-control" placeholder="Фамилия" value=@Html.DisplayFor(modelItem => Model.Surname) required>
-        <div class="col-4 mt-2">Отчество:</div>
+        <div class="col-4">Отчество:</div>
         <input type="text" id="patronymic" name="patronymic" class="form-control" placeholder="Отчество" value=@Html.DisplayFor(modelItem => Model.Patronymic) required>
     </div>
-    <div class="row mt-2">
+    <div class="row mb-2">
         <div class="col-4">Телефон:</div>
-        <input type="text" id="mobilephone" name="mobilephone" class="form-control" placeholder="Телефон" value=@Html.DisplayFor(modelItem => Model.MobilePhone) required>
+        <input type="text" id="telephone" name="telephone" class="form-control" placeholder="Телефон" value=@Html.DisplayFor(modelItem => Model.Telephone) required>
     </div>
-    <div class="row mt-2 mb-2">
+    <div class="row mb-2">
         <button class="btn btn-lg btn-warning btn-block mb-2" type="submit" asp-controller="Home" asp-action="Privacy">Coхранить</button>
         <button class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="Logout">Выйти из аккаунта</button>
     </div>
-</form>
+</form>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/Register.cshtml b/Bank/BankClientApp/Views/Home/Register.cshtml
index 562401e..79a8edd 100644
--- a/Bank/BankClientApp/Views/Home/Register.cshtml
+++ b/Bank/BankClientApp/Views/Home/Register.cshtml
@@ -3,16 +3,17 @@
 }
 
 <div class="text-center">
-	<h1 class="display-4">Регистрация</h1>
+	<h2 class="display-4">Регистрация</h2>
 </div>
 
-<form class="form-signin text-center w-75 mx-auto" method="post">
-	<input type="email" id="login" name="login" class="form-control mb-2" placeholder="Почта" required>
-	<input type="password" id="password" name="password" class="form-control mb-2" placeholder="Пароль" required>
-	<input type="text" id="name" name="name" class="form-control mb-2" placeholder="Имя" required>
-	<input type="text" id="surname" name="surname" class="form-control mb-2" placeholder="Фамилия" required>
-	<input type="text" id="patronymic" name="patronymic" class="form-control mb-2" placeholder="Отчество" required>
-	<input type="text" id="mobilephone" name="mobilephone" class="form-control mb-2" placeholder="Телефон" required>
+<form class="form-signin text-center" method="post">
+    <h1 class="h3 mb-3 font-weight-normal">Регистрация</h1>
+	<input type="email" id="login" name="login" class="form-control" placeholder="Почта" required>
+	<input type="password" id="password" name="password" class="form-control" placeholder="Пароль" required>
+	<input type="text" id="name" name="name" class="form-control" placeholder="Имя" required>
+	<input type="text" id="surname" name="surname" class="form-control" placeholder="Фамилия" required>
+	<input type="text" id="patronymic" name="patronymic" class="form-control" placeholder="Отчество" required>
+	<input type="text" id="telephone" name="telephone" class="form-control" placeholder="Телефон" required>
 
 	<button class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="Register">Регистрация</button>
-</form>
+</form>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/ReportSuccess.cshtml b/Bank/BankClientApp/Views/Home/ReportSuccess.cshtml
new file mode 100644
index 0000000..cea3289
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/ReportSuccess.cshtml
@@ -0,0 +1,16 @@
+@using BankСlientApp
+
+@{
+	ViewData["Title"] = "Отправка отчета";
+}
+
+<div class="text-center">
+	@{
+		if (APIClient.Client == null)
+		{
+			<h3 class="display-4">Сначала авторизируйтесь</h3>
+			return;
+		}
+	}
+	<h3 class="display-4">Отчeт был отправлен на почту @APIClient.Client.Email</h3>
+</div>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Home/ReportWithCards.cshtml b/Bank/BankClientApp/Views/Home/ReportWithCards.cshtml
new file mode 100644
index 0000000..17a553a
--- /dev/null
+++ b/Bank/BankClientApp/Views/Home/ReportWithCards.cshtml
@@ -0,0 +1,140 @@
+@using BankContracts.ViewModels.Reports.Client
+@using Microsoft.JSInterop;
+@inject IJSRuntime JS
+
+@model ReportClientCardsViewModel
+
+@{
+	ViewData["Title"] = "Отчет по картам";
+}
+
+<div class="text-center">
+	<h1 class="display-4">Отчет</h1>
+</div>
+
+<div class="container" sf-type="container" sf-label="Bootstrap Container" sf-uid="2">
+
+    <div class="row" sf-type="container" sf-label="Row" sf-uid="3">
+        <div class="mb-4 mb-md-0 aos-init aos-animate col-md-3" sf-type="container" sf-label="Column" sf-anim-delay="1.5" data-aos="fade-down" data-aos-delay="400" sf-uid="4">
+            <div sf-type="container" sf-label="Container" class="py-15 h-100 bg-bg-2" sf-uid="5">
+				<form method="post">
+					<h3>Карты:</h3>
+					@for (var item = 0; item < @Model.Cards.Count(); item++)
+					{
+						<div class="form-check form-switch">
+							<input class="form-check-input" type="checkbox" id="flexSwitchCheckDefault" asp-for="@Model.Cards[item].IsChecked">
+							<label class="form-check-label" for="flexSwitchCheckDefault">@Model.Cards[item].LabelName</label>
+							<input type="hidden" asp-for="@Model.Cards[item].Id" />
+							<input type="hidden" asp-for="@Model.Cards[item].LabelName" />
+						</div>
+					}
+					<hr>
+					<div class="mb-2">
+						<button style="width:100%" class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="ReportWithCards">Создать отчёт</button>
+					</div>
+					<hr/>
+					<div class="mb-2">
+						<button type="button" id="ExcelBut" class="btn btn-lg btn-warning btn-block">Excel отчеты</button>
+					</div>
+					<div id="ExcelDiv" style="display: none">
+						<div class="mb-2" >
+							<button style="width:100%" class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="CreateExcelReport">Создать отчёт по переводам (EXCEL)</button>
+						</div>
+						<div class="mb-2">
+							<button style="width:100%" class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="CreateCreditingExcelReport">Создать отчёт по пополнениям (EXCEL)</button>
+						</div>
+						<div class="mb-2">
+							<button style="width:100%" class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="CreateDebitingExcelReport">Создать отчёт по снятиям (EXCEL)</button>
+						</div>
+					</div>
+					<div class="mb-2">
+						<button type="button" id="WordBut" class="btn btn-lg btn-warning btn-block">Word отчеты</button>
+					</div>
+					<div id="WordDiv" style="display: none">
+						<div class="mb-2">
+							<button style="width:100%" class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="CreateWordReport">Создать отчёт по переводам (WORD)</button>
+						</div>
+						<div class="mb-2">
+							<button style="width:100%" class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="CreateCreditingWordReport">Создать отчёт по пополнениям (WORD)</button>
+						</div>
+						<div class="mb-2">
+							<button style="width:100%" class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="CreateDebitingWordReport">Создать отчёт по снятиям (WORD)</button>
+						</div>
+					</div>
+				</form>
+            </div>
+        </div>
+        <div class="aos-init aos-animate col-md" sf-type="container" sf-label="Column" sf-anim-delay="2" data-aos="fade-down" data-aos-delay="500" sf-uid="8">
+            <div sf-type="container" sf-label="Container" class="py-15 h-100 bg-bg-2" sf-uid="9">
+				<table class="table">
+					<thead>
+						<tr>
+							<th>
+								Номер карты
+							</th>
+							<th>
+								Тип операции
+							</th>
+							<th>
+								Сумма
+							</th>
+							<th>
+								Статус
+							</th>
+							<th>
+								Дата открытия
+							</th>
+							<th>
+								Дата закрытия
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+						@foreach (var item in Model.Operations)
+						{
+							<tr>
+								<td>
+									@Html.DisplayFor(modelItem => item.CardNumber)
+								</td>
+								<td>
+									@Html.DisplayFor(modelItem => item.TypeOperation)
+								</td>
+								<td>
+									@Html.DisplayFor(modelItem => item.Sum)
+								</td>
+								<td>
+									 @item.Status.ToString().Replace("_", " ");
+								</td>
+								<td>
+									@Html.DisplayFor(modelItem => item.DateOpen)
+								</td>
+								<td>
+									@Html.DisplayFor(modelItem => item.DateClose)
+								</td>
+							</tr>
+						}
+					</tbody>
+				</table>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+	document.getElementById('ExcelBut').addEventListener('click', event => {
+		if (document.getElementById("ExcelDiv").style.display == "none") {
+			document.getElementById("ExcelDiv").style.display = "block";
+		}
+		else {
+			document.getElementById("ExcelDiv").style.display = "none";
+		}
+
+	});
+	document.getElementById('WordBut').addEventListener('click', event => {
+		if (document.getElementById("WordDiv").style.display == "none") {
+			document.getElementById("WordDiv").style.display = "block";
+		}
+		else {
+			document.getElementById("WordDiv").style.display = "none";
+		}
+	});
+</script>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Shared/Error.cshtml b/Bank/BankClientApp/Views/Shared/Error.cshtml
index a1e0478..073fefc 100644
--- a/Bank/BankClientApp/Views/Shared/Error.cshtml
+++ b/Bank/BankClientApp/Views/Shared/Error.cshtml
@@ -1,4 +1,5 @@
 @model ErrorViewModel
+
 @{
     ViewData["Title"] = "Error";
 }
diff --git a/Bank/BankClientApp/Views/Shared/_Layout.cshtml b/Bank/BankClientApp/Views/Shared/_Layout.cshtml
index 86a762d..e503f6b 100644
--- a/Bank/BankClientApp/Views/Shared/_Layout.cshtml
+++ b/Bank/BankClientApp/Views/Shared/_Layout.cshtml
@@ -1,65 +1,157 @@
-<!DOCTYPE html>
+@using BankСlientApp
+
+@{
+    bool authenticated = APIClient.Client != null;
+}
+
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - BankClientApp</title>
+    <title>@ViewData["Title"]</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
-    <link rel="stylesheet" href="~/BankClientApp.styles.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/css/site.css" />
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <style>
+
+        body {
+            margin-bottom: 60px;
+            background-color: white;
+        }
+
+        .nav-main a {
+            position: relative;
+            color: #FFFFFF;
+            cursor: pointer;
+            line-height: 1;
+            text-decoration: none;
+        }
+
+            .nav-main a:after {
+                display: block;
+                position: absolute;
+                left: 0;
+                bottom: 0px;
+                width: 0;
+                height: 1px;
+                background-color: #FFFFFF;
+                content: "";
+                transition: width 0.3s ease-out;
+            }
+
+            .nav-main a:hover:after,
+            .nav-main a:focus:after {
+                width: 100%;
+            }
+
+        .nav-main .dropdown:hover .dropdown-menu {
+            display: block;
+            margin-top: 0;
+        }
+
+        .footer {
+            position: fixed;
+            left: 0;
+            bottom: 0;
+            width: 100%;
+            height: 80px;
+            background-color: #212529
+        }
+
+        .form-signin {
+            width: 100%;
+            max-width: 330px;
+            padding: 15px;
+            margin: auto;
+        }
+
+
+            .form-signin .form-control {
+                position: relative;
+                box-sizing: border-box;
+                height: auto;
+                padding: 10px;
+                font-size: 16px;
+            }
+
+                .form-signin .form-control:focus {
+                    z-index: 2;
+                }
+
+            .form-signin input[type="email"] {
+                margin-bottom: -1px;
+                border-bottom-right-radius: 0;
+                border-bottom-left-radius: 0;
+            }
+
+            .form-signin input[type="password"] {
+                margin-bottom: 10px;
+                border-top-left-radius: 0;
+                border-top-right-radius: 0;
+            }
+
+        table.table tbody tr td,
+        table.table thead tr th,
+        table.table thead {
+            border-left: solid;
+            border-right: solid;
+            border-width: 4px;
+            border-color: #212529;
+        }
+
+        table {
+            vertical-align: middle;
+        }
+    </style>
 </head>
-<body>
-    <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
-            <div class="container-fluid">
-                <a asp-controller="Home" asp-action="Index">
-                    <img src="https://img.icons8.com/?size=80&id=CvryVUzkqqMu&format=png" alt="*" class="navbar-toggler" style="display: block; margin: 0 auto; height:">
-                </a>
-                <a class="navbar-brand ms-4" asp-area="" asp-controller="Home" asp-action="Index">Банк "Вы Банкрот"</a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
-                        aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1 me-2">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="CardsList">Банковские карты</a>
-                        </li>
+<body class="MyBody">
+    <header class="d-flex flex-wrap align-items-center justify-content-center justify-content-md-between py-3 px-4 mg-5 mb-4 border-bottom bg-dark ">
+        <a asp-controller="Home" asp-action="Enter">
+            <img src="https://img.icons8.com/?size=80&id=CvryVUzkqqMu&format=png" alt="*" class="navbar-toggler" style="display: block; margin: 0 auto; height:">
+        </a>
+        <div class="md-4 mb-2 mb-md-0">
+            <a asp-controller="Home" asp-action="Enter" class="d-inline-flex link-body-emphasis text-decoration-none">
+                <span class="fs-4 text-light ">Банк "Вы банкрот"</span>
+            </a>
+        </div>
 
-                        <li class="nav-item dropdown me-2">
-                            <a class="nav-link dropdown-toggle" id="operationsDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">Операции</a>
-                            <ul class="dropdown-menu" aria-labelledby="operationsDropdown">
-                                <li><a class="dropdown-item" asp-controller="Home" asp-action="Crediting">Пополнение карты</a></li>
-                                <li><a class="dropdown-item" asp-controller="Home" asp-action="Debiting">Снятие с карты</a></li>
-                                <li><a class="dropdown-item" asp-controller="Home" asp-action="MoneyTransfers">Заявки на перевод</a></li>
-                            </ul>
-                        </li>
-
-                        <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" id="reportsDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">Отчеты</a>
-                            <ul class="dropdown-menu" aria-labelledby="reportsDropdown">
-                                <li><a class="dropdown-item" asp-controller="Home" asp-action="ReportBankCard">Отчёт по банковским картам</a></li>
-                                <li><a class="dropdown-item" asp-controller="Home" asp-action="CreateReport">Отчёт за период</a></li>
-                                <li><a class="dropdown-item" asp-controller="Home" asp-action="Diagram">Диаграмма</a></li>
-                            </ul>
-                        </li>
-
-                    </ul>
-
-                    <ul class="navbar-nav">
-                        <li class="nav-item">
-                            <a class="nav-link" asp-controller="Home" asp-action="Privacy">Личные данные</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="btn btn-primary ms-2 me-2" asp-controller="Home" asp-action="Login">Вход</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="btn btn-primary ms-2" asp-controller="Home" asp-action="Register">Регистрация</a>
-                        </li>
-                    </ul>
+        <ul class="nav col-md-auto mb-2 justify-content-center mb-md-0 nav-main">
+            <li>
+                <a class="nav-link px-2 link-light" asparea="" asp-controller="Home" asp-action="CardsList">Банковские карты</a>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="nav-link px-2 link-light">Операции</a>
+                <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDarkDropdownMenuLink">
+                    <li><a class="dropdown-item" asp-controller="Home" asp-action="DebitingList">Заявки на снятие</a></li>
+                    <li><a class="dropdown-item" asp-controller="Home" asp-action="CreditingList">Заявки на начисление</a></li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="nav-link px-2 link-light">Отчеты</a>
+                <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDarkDropdownMenuLink">
+                    <li><a class="dropdown-item" asp-controller="Home" asp-controller="Home" asp-action="ReportWithCards">Отчёт по банковским картам</a></li>
+                    <li><a class="dropdown-item" asp-controller="Home" asp-controller="Home" asp-action="CreateReport">Отчёт за период</a></li>
+                    <li><a class="dropdown-item" asp-controller="Home" asp-controller="Home" asp-action="Diagram">Диаграмма</a></li>
+                </ul>
+            </li>
+        </ul>
+        @{
+            if (APIClient.Client == null)
+            {
+                <div class="col-md-3 text-end">
+                    <a class="btn btn-warning me-2" asp-controller="Home" asp-action="Login">Войти</a>
+                    <a class="btn btn-warning" asp-controller="Home" asp-action="Register">Регистрация</a>
                 </div>
-            </div>
-        </nav>
+            }
+            else
+            {
+                <div class="col-md-3 text-end">
+                    <a class="btn btn-warning me-2" id="exit" name="exit" asp-controller="Home" asp-action="Privacy">@APIClient.Client.Surname @APIClient.Client.Name</a>
+                </div>
+            }
+        }
     </header>
     <div class="container">
         <main role="main" class="pb-3">
@@ -67,8 +159,8 @@
         </main>
     </div>
 
-    <footer class="border-top footer text-muted">
-        <div class="container">
+    <footer class="border-top footer text-muted mx-auto">
+        <div class="container mx-auto text-center mt-4 text-white">
             &copy; 2024 - Банк "Вы Банкротищеее" - <a asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
         </div>
     </footer>
@@ -77,4 +169,4 @@
     <script src="~/js/site.js" asp-append-version="true"></script>
     @await RenderSectionAsync("Scripts", required: false)
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/Bank/BankClientApp/Views/Shared/_Layout.cshtml.css b/Bank/BankClientApp/Views/Shared/_Layout.cshtml.css
index a72cbea..3fb1f41 100644
--- a/Bank/BankClientApp/Views/Shared/_Layout.cshtml.css
+++ b/Bank/BankClientApp/Views/Shared/_Layout.cshtml.css
@@ -2,47 +2,56 @@
 for details on configuring this project to bundle and minify static web assets. */
 
 a.navbar-brand {
-  white-space: normal;
-  text-align: center;
-  word-break: break-all;
+    white-space: normal;
+    text-align: center;
+    word-break: break-all;
 }
 
-a {
-  color: #0077cc;
-}
 
 .btn-primary {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
 }
 
 .nav-pills .nav-link.active, .nav-pills .show > .nav-link {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
 }
 
 .border-top {
-  border-top: 1px solid #e5e5e5;
+    border-top: 1px solid #e5e5e5;
 }
+
 .border-bottom {
-  border-bottom: 1px solid #e5e5e5;
+    border-bottom: 1px solid #e5e5e5;
 }
 
 .box-shadow {
-  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+    box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
 }
 
 button.accept-policy {
-  font-size: 1rem;
-  line-height: inherit;
+    font-size: 1rem;
+    line-height: inherit;
 }
 
 .footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  white-space: nowrap;
-  line-height: 60px;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    white-space: nowrap;
+    line-height: 60px;
 }
+
+.nav-main a {
+	position: relative;
+	color: #FFFFFF; /*задаём цвет ссылки*/
+	cursor: pointer;
+	line-height: 1; /*задаём высоту строки*/
+	text-decoration: none; /*убираем подчёркивание*/
+
+}
+
+
diff --git a/Bank/BankContracts/BindingModels/Cashier/AccountBindingModel.cs b/Bank/BankContracts/BindingModels/Cashier/AccountBindingModel.cs
index 9307e90..b2736b8 100644
--- a/Bank/BankContracts/BindingModels/Cashier/AccountBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Cashier/AccountBindingModel.cs
@@ -1,28 +1,21 @@
-using BankDataModels.Enums;
-using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankDataModels.Models.Cashier;
 
 namespace BankContracts.BindingModels.Cashier
 {
-    // Реализация сущности "Счёт"
     public class AccountBindingModel : IAccountModel
-    {
-        public int Id { get; set; }
+	{
+		public int Id { get; set; }
 
-        public int CashierId { get; set; }
+		public int CashierId { get; set; }
 
-        public int ClientId { get; set; }
+		public int ClientId { get; set; }
 
-        public string AccountNumber { get; set; } = string.Empty;
+		public string AccountNumber { get; set; } = string.Empty;
 
-        public double Balance { get; set; }
+		public string PasswordAccount { get; set; } = string.Empty;
 
-        public DateTime DateOpen { get; set; } = DateTime.Now;
+		public double Balance { get; set; }
 
-        public StatusAccount StatusAccount { get; set; } = StatusAccount.Закрыт;
-    }
+		public DateTime DateOpen { get; set; } = DateTime.Now;
+	}
 }
diff --git a/Bank/BankContracts/BindingModels/Cashier/CashWithdrawalBindingModel.cs b/Bank/BankContracts/BindingModels/Cashier/CashWithdrawalBindingModel.cs
index 8deb778..b0f5166 100644
--- a/Bank/BankContracts/BindingModels/Cashier/CashWithdrawalBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Cashier/CashWithdrawalBindingModel.cs
@@ -1,25 +1,19 @@
 using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BindingModels.Cashier
 {
-	// Реализация сущности "Снятие наличных"
-	public class CashWithdrawalBindingModel : ICashWithdrawalModel
-    {
-        public int Id { get; set; }
+    public class CashWithdrawalBindingModel : ICashWithdrawalModel
+	{
+		public int Id { get; set; }
 
-        public int CashierId { get; set; }
+		public int DebitingId { get; set; }
 
-        public int DebitingId { get; set; }
+		public int AccountId { get; set; }
 
-        public int AccountId { get; set; }
+		public int CashierId { get; set; }
 
-        public double Sum { get; set; }
+		public int Sum { get; set; }
 
-        public DateTime DateWithdrawal { get; set; }
-    }
+		public DateTime DateOperation { get; set; } = DateTime.Now;
+	}
 }
diff --git a/Bank/BankContracts/BindingModels/Cashier/CashierBindingModel.cs b/Bank/BankContracts/BindingModels/Cashier/CashierBindingModel.cs
index 1867823..a1665ad 100644
--- a/Bank/BankContracts/BindingModels/Cashier/CashierBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Cashier/CashierBindingModel.cs
@@ -1,27 +1,21 @@
 using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BindingModels.Cashier
 {
-    // Реализация сущности "Кассир"
     public class CashierBindingModel : ICashierModel
-    {
-        public int Id { get; set; }
+	{
+		public int Id { get; set; }
 
-        public string Name { get; set; } = string.Empty;
+		public string Password { get; set; } = string.Empty;
 
-        public string Surname { get; set; } = string.Empty;
+		public string Name { get; set; } = string.Empty;
 
-        public string Patronymic { get; set; } = string.Empty;
+		public string Surname { get; set; } = string.Empty;
 
-        public string Email { get; set; } = string.Empty;
+		public string Patronymic { get; set; } = string.Empty;
 
-        public string Password { get; set; } = string.Empty;
+		public string Email { get; set; } = string.Empty;
 
-        public string MobilePhone { get; set; } = string.Empty;
-    }
+		public string Telephone { get; set; } = string.Empty;
+	}
 }
diff --git a/Bank/BankContracts/BindingModels/Cashier/MoneyTransferBindingModel.cs b/Bank/BankContracts/BindingModels/Cashier/MoneyTransferBindingModel.cs
index 461a975..bb5f9d5 100644
--- a/Bank/BankContracts/BindingModels/Cashier/MoneyTransferBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Cashier/MoneyTransferBindingModel.cs
@@ -1,29 +1,21 @@
 using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BindingModels.Cashier
 {
-	// Реализация сущности "Перевод наличных"
-	public class MoneyTransferBindingModel : IMoneyTransferModel
-    {
-        public int Id { get; set; }
+    public class MoneyTransferBindingModel : IMoneyTransferModel
+	{
+		public int Id { get; set; }
 
-        public double Sum { get; set; }
+		public int Sum { get; set; }
 
-        public int CashierId { get; set; }
-
-        public DateTime DateTransfer { get; set; } = DateTime.Now;
-
-        public int? CreditingId { get; set; }
-
-		// Для реализации между двумя аккаунтами, (клиента?)
 		public int? AccountSenderId { get; set; }
 
-        public int AccountPayeeId { get; set; }
+		public int AccountPayeeId { get; set; }
 
-    }
+		public DateTime DateOperation { get; set; } = DateTime.Now;
+
+		public int? CreditingId { get; set; }
+
+		public int CashierId { get; set; }
+	}
 }
diff --git a/Bank/BankContracts/BindingModels/Client/CardBindingModel.cs b/Bank/BankContracts/BindingModels/Client/CardBindingModel.cs
index 0318a76..1e9db78 100644
--- a/Bank/BankContracts/BindingModels/Client/CardBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Client/CardBindingModel.cs
@@ -1,29 +1,19 @@
-using BankDataModels.Enums;
-using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankDataModels.Models.Client;
 
 namespace BankContracts.BindingModels.Client
 {
-    // Реализация сущности "Карта"
     public class CardBindingModel : ICardModel
     {
         public int Id { get; set; }
 
-        public int ClientId { get; set; }
+        public int ClientID { get; set; }
 
         public int AccountId { get; set; }
 
-        // Номер банковской карты
         public string Number { get; set; } = string.Empty;
 
-        public double Balance { get; set; }
+        public string CVC { get; set; } = string.Empty;
 
         public DateTime Period { get; set; } = DateTime.Now;
-
-        public StatusCard StatusCard { get; set; } = StatusCard.Закрыта;
     }
 }
diff --git a/Bank/BankContracts/BindingModels/Client/ClientBindingModel.cs b/Bank/BankContracts/BindingModels/Client/ClientBindingModel.cs
index 37781e0..7e65cba 100644
--- a/Bank/BankContracts/BindingModels/Client/ClientBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Client/ClientBindingModel.cs
@@ -1,27 +1,21 @@
 using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BindingModels.Client
 {
-    // Реализация сущности "Клиент"
     public class ClientBindingModel : IClientModel
     {
         public int Id { get; set; }
 
+        public string Password { get; set; } = string.Empty;
+
         public string Name { get; set; } = string.Empty;
 
-        public string Surname { get; set; } = string.Empty;
+        public string Surname { get; set; } = string.Empty; 
 
         public string Patronymic { get; set; } = string.Empty;
 
         public string Email { get; set; } = string.Empty;
 
-        public string Password { get; set; } = string.Empty;
-
-        public string MobilePhone { get; set; } = string.Empty;
+        public string Telephone { get; set; } = string.Empty;
     }
 }
diff --git a/Bank/BankContracts/BindingModels/Client/CreditingBindingModel.cs b/Bank/BankContracts/BindingModels/Client/CreditingBindingModel.cs
index f38a7b5..6150e83 100644
--- a/Bank/BankContracts/BindingModels/Client/CreditingBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Client/CreditingBindingModel.cs
@@ -1,24 +1,20 @@
-using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankDataModels.Enums;
+using BankDataModels.Models.Client;
 
 namespace BankContracts.BindingModels.Client
 {
-	// Реализация сущности "Пополнение карты"
-	public class CreditingBindingModel : ICreditingModel
+    public class CreditingBindingModel : ICreditingModel
     {
         public int Id { get; set; }
 
-		// Вот лучше оставим для клиента айдишник
-		public int ClientId { get; set; }
+        public int CardId { get; set; }
 
-		public int CardId { get; set; }
+        public int Sum { get; set; }
 
-		public double Sum { get; set; }
+        public DateTime DateOpen { get; set; } = DateTime.Now;
 
-        public DateTime DateCredit { get; set; }
+        public DateTime? DateClose { get; set; }
+
+        public StatusEnum Status { get; set; }
     }
 }
diff --git a/Bank/BankContracts/BindingModels/Client/DebitingBindingModel.cs b/Bank/BankContracts/BindingModels/Client/DebitingBindingModel.cs
index cfac8dd..3a6c7bb 100644
--- a/Bank/BankContracts/BindingModels/Client/DebitingBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Client/DebitingBindingModel.cs
@@ -1,25 +1,20 @@
-using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankDataModels.Enums;
+using BankDataModels.Models.Client;
 
 namespace BankContracts.BindingModels.Client
 {
-	// Реализация сущности "Клиент"
-	public class DebitingBindingModel : IDebitingModel
+    public class DebitingBindingModel : IDebitingModel
     {
         public int Id { get; set; }
 
         public int CardId { get; set; }
 
-        // И тут я понял почему ты задавался вопросом про id, надо подумать
-        public int ClientId { get; set; }
+        public int Sum { get; set; }
 
-        public double Sum { get; set; }
+        public DateTime DateOpen { get; set; } = DateTime.Now;
 
-        public DateTime DateDebit { get; set; } = DateTime.Now;
+		public DateTime? DateClose { get; set; }
 
+		public StatusEnum Status { get; set; } = StatusEnum.Открыта;
     }
 }
diff --git a/Bank/BankContracts/BindingModels/Messages/MailConfigBindingModel.cs b/Bank/BankContracts/BindingModels/Messages/MailConfigBindingModel.cs
index c450082..6422b6c 100644
--- a/Bank/BankContracts/BindingModels/Messages/MailConfigBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Messages/MailConfigBindingModel.cs
@@ -1,24 +1,20 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankContracts.BindingModels.Messages
+namespace BankContracts.BindingModels.Messages
 {
-    // Класс для передачи данных по почте
+    //один из двух классов для передачи данных по почте
     public class MailConfigBindingModel
-    {
-        public string MailLogin { get; set; } = string.Empty;
+	{
+		public string MailLogin { get; set; } = string.Empty;
 
-        public string MailPassword { get; set; } = string.Empty;
+		public string MailPassword { get; set; } = string.Empty;
 
-        public string SmtpClientHost { get; set; } = string.Empty;
+		public string SmtpClientHost { get; set; } = string.Empty;
 
-        public int SmtpClientPort { get; set; }
+		public int SmtpClientPort { get; set; }
 
-        public string PopHost { get; set; } = string.Empty;
+		//можно без них?
+		public string PopHost { get; set; } = string.Empty;
 
-        public int PopPort { get; set; }
-    }
+		//можно без них?
+		public int PopPort { get; set; }
+	}
 }
diff --git a/Bank/BankContracts/BindingModels/Messages/MailSendInfoBindingModel.cs b/Bank/BankContracts/BindingModels/Messages/MailSendInfoBindingModel.cs
index da64eaf..6780e38 100644
--- a/Bank/BankContracts/BindingModels/Messages/MailSendInfoBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Messages/MailSendInfoBindingModel.cs
@@ -1,26 +1,21 @@
 using BankDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BindingModels.Messages
 {
-    // Класс для обмена информацией по почте
+    //один из двух классов для обмена информацией по почте
     public class MailSendInfoBindingModel
-    {
-        public string MailAddress { get; set; } = string.Empty;
+	{
+		public string MailAddress { get; set; } = string.Empty;
 
-        public string Subject { get; set; } = string.Empty;
+		public string Subject { get; set; } = string.Empty;
 
-        public string Text { get; set; } = string.Empty;
+		public string Text { get; set; } = string.Empty;
 
-        // Для отправки pdf
+		//для отправки pdf
         public byte[] File { get; set; } = Array.Empty<byte>();
 
-        public MailsEnum Role { get; set; }
+		public MailsEnum Role { get; set; }
 
-        public TypeDocEnum TypeDoc { get; set; }
+		public TypeDocEnum TypeDoc { get; set; }
     }
 }
diff --git a/Bank/BankContracts/BindingModels/Messages/MessageInfoBindingModel.cs b/Bank/BankContracts/BindingModels/Messages/MessageInfoBindingModel.cs
index 409ef33..b88f1c9 100644
--- a/Bank/BankContracts/BindingModels/Messages/MessageInfoBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Messages/MessageInfoBindingModel.cs
@@ -1,32 +1,25 @@
 using BankDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BindingModels.Messages
 {
-    // Реализация сущности "Сообщение"
     public class MessageInfoBindingModel : IMessageInfoModel
-    {
-        public int Id { get; set; }
+	{
+		public int Id { get; set; }
 
-        public string MessageId { get; set; } = string.Empty;
+		public string MessageId { get; set; } = string.Empty;
 
-        public int? ClientId { get; set; }
+		public int? ClientId { get; set; }
 
-        public string SenderName { get; set; } = string.Empty;
+		public string SenderName { get; set; } = string.Empty;
 
-        public DateTime DateDelivery { get; set; } = DateTime.Now;
+		public DateTime DateDelivery { get; set; } = DateTime.Now;
 
-        public string Subject { get; set; } = string.Empty;
+		public string Subject { get; set; } = string.Empty;
 
-        public string Body { get; set; } = string.Empty;
+		public string Body { get; set; } = string.Empty;
 
-        // Для ответа
-        public bool IsRead { get; set; } = false;
+		public bool IsRead { get; set; } = false;
 
-        public string? Answer { get; set; } = string.Empty;
-    }
+		public string? Answer { get; set; } = string.Empty;
+	}
 }
diff --git a/Bank/BankContracts/BindingModels/Reports/ReportBindingModel.cs b/Bank/BankContracts/BindingModels/Reports/ReportBindingModel.cs
index cc091d9..e1d5d36 100644
--- a/Bank/BankContracts/BindingModels/Reports/ReportBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Reports/ReportBindingModel.cs
@@ -1,30 +1,25 @@
 using BankDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BindingModels.Reports
 {
-	public class ReportBindingModel
-	{
-		public string FileName { get; set; } = string.Empty;
+    public class ReportBindingModel
+    {
+        public string FileName { get; set; } = string.Empty;
 
-		public int? ClientId { get; set; }
+        public int? ClientId { get; set; }
 
-		public int? AccountId { get; set; }
+        public int? AccountId { get; set; }
 
-		public List<int>? CardList { get; set; }
+        public List<int>? CardList { get; set; }
 
-		public string? ClientFullName { get; set; } = string.Empty;
+        public string? ClientFullName { get; set; } = string.Empty;
 
-		public DateTime? DateFrom { get; set; }
+        public DateTime? DateFrom { get; set; }
+        
+        public DateTime? DateTo { get; set; }
 
-		public DateTime? DateTo { get; set; }
+        public MailsEnum Role { get; set; }
 
-		public MailsEnum Role { get; set; }
-
-		public string? Email { get; set; }
-	}
+        public string? Email { get; set; }
+    }
 }
diff --git a/Bank/BankContracts/BindingModels/Reports/ReportSupportBindingModel.cs b/Bank/BankContracts/BindingModels/Reports/ReportSupportBindingModel.cs
index 9a0a4d4..8a33ce4 100644
--- a/Bank/BankContracts/BindingModels/Reports/ReportSupportBindingModel.cs
+++ b/Bank/BankContracts/BindingModels/Reports/ReportSupportBindingModel.cs
@@ -1,24 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankContracts.BindingModels.Reports
+namespace BankContracts.BindingModels.Reports
 {
-	// Вспомогательная модель для передачи DateTime при формировании отчёта
-	public class ReportSupportBindingModel
+    //вспомогательная модель для передачи DateTime при формировании отчёта
+    public class ReportSupportBindingModel
 	{
 		public int? ClientId { get; set; }
 
 		public int? AccountId { get; set; }
 
-		// Вот для отчётов, чтобы по дате отбирать
 		public DateTime? DateFrom { get; set; }
 
 		public DateTime? DateTo { get; set; }
 
-		// Для Excel отчёта клиента
+		//для Excel отчёта клиента
 		public List<int>? CardList { get; set; }
 
 		public string? Email { get; set; }
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Cashier/IAccountLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Cashier/IAccountLogic.cs
index e6983b9..a1b1087 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Cashier/IAccountLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Cashier/IAccountLogic.cs
@@ -1,27 +1,24 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankContracts.ViewModels.Cashier.Diagram;
+using BankContracts.ViewModels.Cashier.ViewModels;
 
 namespace BankContracts.BusinessLogicsContracts.Cashier
 {
-	// Интерфейс бизнес-логики для счёта
-	public interface IAccountLogic
-    {
-        List<AccountViewModel>? ReadList(AccountSearchModel? model);
+    public interface IAccountLogic
+	{
+		List<AccountViewModel>? ReadList(AccountSearchModel? model);
 
-        AccountViewModel? ReadElement(AccountSearchModel model);
+		AccountViewModel? ReadElement(AccountSearchModel model);
 
-        bool ChangeBalance(AccountSearchModel? model, int sum);
+		bool ChangeBalance(AccountSearchModel? model, int sum);
 
-        bool Create(AccountBindingModel model);
+		bool Create(AccountBindingModel model);
 
-        bool Update(AccountBindingModel model);
+		bool Update(AccountBindingModel model);
+
+		bool Delete(AccountBindingModel model);
+		public List<CashierDiagramElementsViewModel> GetMonthInfo(int AccountId);
 
-        bool Delete(AccountBindingModel model);
     }
 }
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashWithdrawalLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashWithdrawalLogic.cs
index 8fe80bd..90154e6 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashWithdrawalLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashWithdrawalLogic.cs
@@ -1,25 +1,19 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Cashier
 {
-	// Интерфейс бизнес-логики для выдачи наличных
-	public interface ICashWithdrawalLogic
-    {
-        List<CashWithdrawalViewModel>? ReadList(CashWithdrawalSearchModel? model);
+    public interface ICashWithdrawalLogic
+	{
+		List<CashWithdrawalViewModel>? ReadList(CashWithdrawalSearchModel? model);
 
-        CashWithdrawalViewModel? ReadElement(CashWithdrawalSearchModel model);
+		CashWithdrawalViewModel? ReadElement(CashWithdrawalSearchModel model);
 
-        bool Create(CashWithdrawalBindingModel model, bool flag);
+		bool Create(CashWithdrawalBindingModel model, bool flag);
 
-        bool Update(CashWithdrawalBindingModel model);
+		bool Update(CashWithdrawalBindingModel model);
 
-        bool Delete(CashWithdrawalBindingModel model);
-    }
+		bool Delete(CashWithdrawalBindingModel model);
+	}
 }
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashierLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashierLogic.cs
index eb6cc17..8731030 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashierLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Cashier/ICashierLogic.cs
@@ -1,25 +1,19 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Cashier
 {
-	// Интерфейс бизнес-логики для кассира
-	public interface ICashierLogic
-    {
-        List<CashierViewModel>? ReadList(CashierSearchModel? model);
+    public interface ICashierLogic
+	{
+		List<CashierViewModel>? ReadList(CashierSearchModel? model);
 
-        CashierViewModel? ReadElement(CashierSearchModel model);
+		CashierViewModel? ReadElement(CashierSearchModel model);
 
-        bool Create(CashierBindingModel model);
+		bool Create(CashierBindingModel model);
 
-        bool Update(CashierBindingModel model);
+		bool Update(CashierBindingModel model);
 
-        bool Delete(CashierBindingModel model);
-    }
+		bool Delete(CashierBindingModel model);
+	}
 }
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Cashier/IMoneyTransferLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Cashier/IMoneyTransferLogic.cs
index e83e43b..6636877 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Cashier/IMoneyTransferLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Cashier/IMoneyTransferLogic.cs
@@ -1,25 +1,19 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Cashier
 {
-	// Интерфейс бизнес-логики для перевода денег
-	public interface IMoneyTransferLogic
-    {
-        List<MoneyTransferViewModel>? ReadList(MoneyTransferSearchModel? model);
+    public interface IMoneyTransferLogic
+	{
+		List<MoneyTransferViewModel>? ReadList(MoneyTransferSearchModel? model);
 
-        MoneyTransferViewModel? ReadElement(MoneyTransferSearchModel model);
+		MoneyTransferViewModel? ReadElement(MoneyTransferSearchModel model);
 
-        bool Create(MoneyTransferBindingModel model);
+		bool Create(MoneyTransferBindingModel model);
 
-        bool Update(MoneyTransferBindingModel model);
+		bool Update(MoneyTransferBindingModel model);
 
-        bool Delete(MoneyTransferBindingModel model);
-    }
+		bool Delete(MoneyTransferBindingModel model);
+	}
 }
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Client/ICardLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Client/ICardLogic.cs
index 674083e..1d36c7c 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Client/ICardLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Client/ICardLogic.cs
@@ -1,16 +1,11 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
+using BankContracts.ViewModels.Client.Diagram;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Client
 {
-	// Интерфейс бизнес-логики для банковской карты
-	public interface ICardLogic
+    public interface ICardLogic
     {
         List<CardViewModel>? ReadList(CardSearchModel? model);
 
@@ -21,5 +16,7 @@ namespace BankContracts.BusinessLogicsContracts.Client
         bool Update(CardBindingModel model);
 
         bool Delete(CardBindingModel model);
+
+        public List<ClientDiagramElementsViewModel> GetMonthInfo(int CardId);
     }
 }
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Client/IClientLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Client/IClientLogic.cs
index 5750a40..969fc3c 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Client/IClientLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Client/IClientLogic.cs
@@ -1,16 +1,10 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Client
 {
-	// Интерфейс бизнес-логики для клиента
-	public interface IClientLogic
+    public interface IClientLogic
     {
         List<ClientViewModel>? ReadList(ClientSearchModel? model);
 
@@ -21,5 +15,6 @@ namespace BankContracts.BusinessLogicsContracts.Client
         bool Update(ClientBindingModel model);
 
         bool Delete(ClientBindingModel model);
+
     }
 }
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Client/ICreditingLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Client/ICreditingLogic.cs
index b7cf676..2f308e1 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Client/ICreditingLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Client/ICreditingLogic.cs
@@ -1,16 +1,10 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Client
 {
-	// Интерфейс бизнес-логики для пополнения карты
-	public interface ICreditingLogic
+    public interface ICreditingLogic
     {
         List<CreditingViewModel>? ReadList(CreditingSearchModel? model);
 
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Client/IDebitingLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Client/IDebitingLogic.cs
index 1bc63be..e2dccd7 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Client/IDebitingLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Client/IDebitingLogic.cs
@@ -1,16 +1,10 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Client
 {
-	// Интерфейс бизнес-логики для получение наличных по карте
-	public interface IDebitingLogic
+    public interface IDebitingLogic
     {
         List<DebitingViewModel>? ReadList(DebitingSearchModel? model);
 
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Reports/IReportCashierLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Reports/IReportCashierLogic.cs
index 7bbdf0d..6a9fc33 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Reports/IReportCashierLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Reports/IReportCashierLogic.cs
@@ -1,28 +1,22 @@
 using BankContracts.BindingModels.Reports;
 using BankContracts.ViewModels.Reports;
 using BankContracts.ViewModels.Reports.Cashier;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Reports
 {
-    // Интерфейс бизнес-логики для отчёта (Кассир)
     public interface IReportCashierLogic
-	{
-		List<ReportCashierViewModel>? GetMoneyTransfers(ReportBindingModel model);
+    {
+        List<ReportCashierViewModel>? GetMoneyTransfers(ReportBindingModel model);
 
 		List<ReportCashierViewModel>? GetCashWithrawals(ReportBindingModel model);
 
-		// Сохранение отчёта по счетам в файл-Word
+		//Сохранение отчёта по счетам в файл-Word
 		void SaveAccountsToWordFile(ReportBindingModel model);
 
-		// Сохранение отчёта по счетам в файл-Excel
-		void SaveAccountsToExcelFile(ReportBindingModel model);
+        //Сохранение отчёта по счетам в файл-Excel
+        void SaveAccountsToExcelFile(ReportBindingModel model);
 
-		// Сохранение отчёта по счетам в файл-Pdf
+		//Сохранение отчёта по счетам в файл-Pdf
 		ReportCashierViewModelForHTML SaveAccountsToPdfFile(ReportBindingModel model);
-	}
+    }
 }
diff --git a/Bank/BankContracts/BusinessLogicsContracts/Reports/IReportClientLogic.cs b/Bank/BankContracts/BusinessLogicsContracts/Reports/IReportClientLogic.cs
index 4e43fd1..699bb1f 100644
--- a/Bank/BankContracts/BusinessLogicsContracts/Reports/IReportClientLogic.cs
+++ b/Bank/BankContracts/BusinessLogicsContracts/Reports/IReportClientLogic.cs
@@ -2,28 +2,22 @@
 using BankContracts.ViewModels.Reports;
 using BankContracts.ViewModels.Reports.Client;
 using BankDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.BusinessLogicsContracts.Reports
 {
-    // Интерфейс бизнес-логики для отчёта (Клиент)
     public interface IReportClientLogic
-	{
-		List<ReportClientViewModel>? GetCrediting(ReportBindingModel model);
+    {
+        List<ReportClientViewModel>? GetCrediting(ReportBindingModel model);
 
-		List<ReportClientViewModel>? GetDebiting(ReportBindingModel model);
+        List<ReportClientViewModel>? GetDebiting(ReportBindingModel model);
 
-		// Сохранение отчёта по картам в файл-Word
-		void SaveToWordFile(ReportBindingModel model, OfficeOperationEnum operationEnum);
+        //Сохранение отчёта по картам в файл-Word
+        void SaveToWordFile(ReportBindingModel model, OfficeOperationEnum operationEnum);
 
-		// Сохранение отчёта по картам в файл-Excel
-		void SaveToExcelFile(ReportBindingModel model, OfficeOperationEnum operationEnum);
+        //Сохранение отчёта по картам в файл-Excel
+        void SaveToExcelFile(ReportBindingModel model, OfficeOperationEnum operationEnum);
 
-		// Сохранение отчёта по картам в файл-Pdf
+		//Сохранение отчёта по картам в файл-Pdf
 		ReportClientViewModelForHTML SaveClientReportToPdfFile(ReportBindingModel model);
-	}
+    }
 }
diff --git a/Bank/BankContracts/SearchModels/Cashier/AccountSearchModel.cs b/Bank/BankContracts/SearchModels/Cashier/AccountSearchModel.cs
index 4066d2f..5183494 100644
--- a/Bank/BankContracts/SearchModels/Cashier/AccountSearchModel.cs
+++ b/Bank/BankContracts/SearchModels/Cashier/AccountSearchModel.cs
@@ -1,5 +1,4 @@
-using BankDataModels.Enums;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -7,21 +6,20 @@ using System.Threading.Tasks;
 
 namespace BankContracts.SearchModels.Cashier
 {
-    // Для поиска сущности "Счёт"
-    public class AccountSearchModel
-    {
-        public int? Id { get; set; }
+	public class AccountSearchModel
+	{
+		public int? Id { get; set; }
 
-        public int? CashierId { get; set; }
+		public string? AccountNumber { get; set; } = string.Empty;
 
-        public int? ClientId { get; set; }
+		public int? CashierId { get; set; }
 
-        public string? AccountNumber { get; set; } = string.Empty;
+		public int? ClientId { get; set; }
 
-        public double? Balance { get; set; }
+		public string? PasswordAccount { get; set; } = string.Empty;
 
-        public DateTime? DateOpen { get; set; }
+		public double? Balance { get; set; }
 
-        public StatusAccount? StatusAccount { get; set; }
-    }
+		public DateTime? DateOpen { get; set; }
+	}
 }
diff --git a/Bank/BankContracts/SearchModels/Cashier/CashWithdrawalSearchModel.cs b/Bank/BankContracts/SearchModels/Cashier/CashWithdrawalSearchModel.cs
index f46e064..a3c346c 100644
--- a/Bank/BankContracts/SearchModels/Cashier/CashWithdrawalSearchModel.cs
+++ b/Bank/BankContracts/SearchModels/Cashier/CashWithdrawalSearchModel.cs
@@ -6,21 +6,22 @@ using System.Threading.Tasks;
 
 namespace BankContracts.SearchModels.Cashier
 {
-    // Для поиска сущности "Выдача наличных"
-    public class CashWithdrawalSearchModel
-    {
-        public int? Id { get; set; }
+	public class CashWithdrawalSearchModel
+	{
+		public int? Id { get; set; }
 
-        public int? AccountId { get; set; }
+		public int? DebitingId { get; set; }
 
-        public int? CashierId { get; set; }
+		public int? AccountId { get; set; }
 
-        public int? Sum { get; set; }
+		public int? CashierId { get; set; }
 
-        public DateTime? DateWithdrawal { get; set; }
+		public int? ClientId { get; set; }
 
-        public int? DebitingId { get; set; } 
+		public int? Sum { get; set; }
 
-        public int? ClientId { get; set; } 
-    }
+		public DateTime? DateFrom { get; set; }
+
+		public DateTime? DateTo { get; set; }
+	}
 }
diff --git a/Bank/BankContracts/SearchModels/Cashier/CashierSearchModel.cs b/Bank/BankContracts/SearchModels/Cashier/CashierSearchModel.cs
index e88c2a1..3fbbcc6 100644
--- a/Bank/BankContracts/SearchModels/Cashier/CashierSearchModel.cs
+++ b/Bank/BankContracts/SearchModels/Cashier/CashierSearchModel.cs
@@ -6,21 +6,20 @@ using System.Threading.Tasks;
 
 namespace BankContracts.SearchModels.Cashier
 {
-    // Для поиска сущности "Кассир"
-    public class CashierSearchModel
-    {
-        public int? Id { get; set; }
+	public class CashierSearchModel
+	{
+		public int? Id { get; set; }
 
-        public string? Name { get; set; } = string.Empty;
+		public string? Name { get; set; }
 
-        public string? Surname { get; set; } = string.Empty;
+		public string? Surname { get; set; }
 
-        public string? Patronymic { get; set; } = string.Empty;
+		public string? Patronymic { get; set; }
 
-        public string? Email { get; set; } = string.Empty;
+		public string? Email { get; set; }
 
-        public string? Password { get; set; } = string.Empty;
+		public string? Password { get; set; }
 
-        public string? MobilePhone { get; set; } = string.Empty;
-    }
+		public string? Telephone { get; set; }
+	}
 }
diff --git a/Bank/BankContracts/SearchModels/Cashier/MoneyTransferSearchModel.cs b/Bank/BankContracts/SearchModels/Cashier/MoneyTransferSearchModel.cs
index a7dd9d4..886b00c 100644
--- a/Bank/BankContracts/SearchModels/Cashier/MoneyTransferSearchModel.cs
+++ b/Bank/BankContracts/SearchModels/Cashier/MoneyTransferSearchModel.cs
@@ -6,26 +6,22 @@ using System.Threading.Tasks;
 
 namespace BankContracts.SearchModels.Cashier
 {
-    // Для поиска сущности "Перевод денег"
-    public class MoneyTransferSearchModel
-    {
-        public int? Id { get; set; }
+	public class MoneyTransferSearchModel
+	{
+		public int? Id { get; set; }
 
-        public int? Sum { get; set; }
+		public int? Sum { get; set; }
+
+		public int? ClientId { get; set; }
 
         public int? CashierId { get; set; }
 
-        public int? AccountId { get; set; }
-
-        public DateTime? DateTransfer { get; set; }
-
-        public int? Crediting { get; set; }
-
-        public int? ClientId { get; set; } 
-
-        //это надо :)
         public int? AccountSenderId { get; set; }
 
-        public int? AccountPayeeId { get; set; }
-    }
+		public int? AccountPayeeId { get; set; }
+
+		public DateTime? DateFrom { get; set; }
+
+		public DateTime? DateTo { get; set; }
+	}
 }
diff --git a/Bank/BankContracts/SearchModels/Client/CardSearchModel.cs b/Bank/BankContracts/SearchModels/Client/CardSearchModel.cs
index 9add75c..2f62f71 100644
--- a/Bank/BankContracts/SearchModels/Client/CardSearchModel.cs
+++ b/Bank/BankContracts/SearchModels/Client/CardSearchModel.cs
@@ -1,5 +1,4 @@
-using BankDataModels.Enums;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -7,7 +6,6 @@ using System.Threading.Tasks;
 
 namespace BankContracts.SearchModels.Client
 {
-    // Для поиска сущности "Банковская карта"
     public class CardSearchModel
     {
         public int? Id { get; set; }
@@ -16,13 +14,10 @@ namespace BankContracts.SearchModels.Client
 
         public int? AccountId { get; set; }
 
-        // Номер банковской карты
         public string? Number { get; set; }
 
-        public double Balance { get; set; }
+        public string? CVC { get; set; }
 
-        public DateTime Period { get; set; }
-
-        public StatusCard StatusCard { get; set; }
+        public DateTime? Period { get; set; }
     }
 }
diff --git a/Bank/BankContracts/SearchModels/Client/ClientSearchModel.cs b/Bank/BankContracts/SearchModels/Client/ClientSearchModel.cs
index caf5960..9f73c8c 100644
--- a/Bank/BankContracts/SearchModels/Client/ClientSearchModel.cs
+++ b/Bank/BankContracts/SearchModels/Client/ClientSearchModel.cs
@@ -6,21 +6,18 @@ using System.Threading.Tasks;
 
 namespace BankContracts.SearchModels.Client
 {
-    // Для поиска сущности "Клиент"
     public class ClientSearchModel
     {
         public int? Id { get; set; }
 
-        public string? Name { get; set; } = string.Empty;
+        public string? Name { get; set; }
 
-        public string? Surname { get; set; } = string.Empty;
+        public string? Surname { get; set; }
 
-        public string? Patronymic { get; set; } = string.Empty;
+        public string? Patronymic { get; set; }
 
-        public string? Email { get; set; } = string.Empty;
+        public string? Email { get; set; }
 
-        public string? Password { get; set; } = string.Empty;
-
-        public string? MobilePhone { get; set; } = string.Empty;
+        public string? Password { get; set; }
     }
 }
diff --git a/Bank/BankContracts/SearchModels/Client/CreditingSearchModel.cs b/Bank/BankContracts/SearchModels/Client/CreditingSearchModel.cs
index 61e8e8f..24c47d8 100644
--- a/Bank/BankContracts/SearchModels/Client/CreditingSearchModel.cs
+++ b/Bank/BankContracts/SearchModels/Client/CreditingSearchModel.cs
@@ -1,4 +1,5 @@
-using System;
+using BankDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,7 +7,6 @@ using System.Threading.Tasks;
 
 namespace BankContracts.SearchModels.Client
 {
-    // Для поиска сущности "Пополнение карты"
     public class CreditingSearchModel
     {
         public int? Id { get; set; }
@@ -15,8 +15,12 @@ namespace BankContracts.SearchModels.Client
 
         public int? Sum { get; set; }
 
-        public DateTime? DateCrediting { get; set; }
+        public int? UserId { get; set; }
 
-        public int? ClientId { get; set; } // ИЛИ лучше ClientId, ClientId будет лучше :)
+        public DateTime? DateFrom { get; set; }
+
+        public DateTime? DateTo { get; set; }
+
+        public StatusEnum? Status { get; set; }
     }
 }
diff --git a/Bank/BankContracts/SearchModels/Client/DebitingSearchModel.cs b/Bank/BankContracts/SearchModels/Client/DebitingSearchModel.cs
index 3aac08e..36a6dcd 100644
--- a/Bank/BankContracts/SearchModels/Client/DebitingSearchModel.cs
+++ b/Bank/BankContracts/SearchModels/Client/DebitingSearchModel.cs
@@ -1,4 +1,5 @@
-using System;
+using BankDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,17 +7,20 @@ using System.Threading.Tasks;
 
 namespace BankContracts.SearchModels.Client
 {
-    // Для поиска сущности "Получение наличных"
     public class DebitingSearchModel
     {
         public int? Id { get; set; }
 
         public int? CardId { get; set; }
 
-        public int? ClientId { get; set; } // ClientId будет лучше :)
+        public int? UserId { get; set; }
 
         public int? Sum { get; set; }
 
-        public DateTime? DateDebit { get; set; }
+        public DateTime? DateFrom { get; set; }
+
+        public DateTime? DateTo { get; set; }
+
+        public StatusEnum? Status { get; set; }
     }
 }
diff --git a/Bank/BankContracts/StoragesModels/Cashier/IAccountStorage.cs b/Bank/BankContracts/StoragesModels/Cashier/IAccountStorage.cs
index e2c95e5..7b3c6a1 100644
--- a/Bank/BankContracts/StoragesModels/Cashier/IAccountStorage.cs
+++ b/Bank/BankContracts/StoragesModels/Cashier/IAccountStorage.cs
@@ -1,27 +1,21 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankContracts.ViewModels.Cashier.ViewModels;
 
-namespace BankContracts.StoragesModels.Cashier
+namespace BankContracts.StoragesContracts.Cashier
 {
-    // Интерфейс для хранилища счетов
     public interface IAccountStorage
-    {
-        List<AccountViewModel> GetFullList();
+	{
+		List<AccountViewModel> GetFullList();
 
-        List<AccountViewModel> GetFilteredList(AccountSearchModel model);
+		List<AccountViewModel> GetFilteredList(AccountSearchModel model);
 
-        AccountViewModel? GetElement(AccountSearchModel model);
+		AccountViewModel? GetElement(AccountSearchModel model);
 
-        AccountViewModel? Insert(AccountBindingModel model);
+		AccountViewModel? Insert(AccountBindingModel model);
 
-        AccountViewModel? Update(AccountBindingModel model);
+		AccountViewModel? Update(AccountBindingModel model);
 
-        AccountViewModel? Delete(AccountBindingModel model);
-    }
+		AccountViewModel? Delete(AccountBindingModel model);
+	}
 }
diff --git a/Bank/BankContracts/StoragesModels/Cashier/ICashWithdrawalStorage.cs b/Bank/BankContracts/StoragesModels/Cashier/ICashWithdrawalStorage.cs
index 08a516f..1915ad3 100644
--- a/Bank/BankContracts/StoragesModels/Cashier/ICashWithdrawalStorage.cs
+++ b/Bank/BankContracts/StoragesModels/Cashier/ICashWithdrawalStorage.cs
@@ -1,27 +1,21 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankContracts.StoragesModels.Cashier
+namespace BankContracts.StoragesContracts.Cashier
 {
-    // Интерфейс для хранилища выдачи наличных
     public interface ICashWithdrawalStorage
-    {
-        List<CashWithdrawalViewModel> GetFullList();
+	{
+		List<CashWithdrawalViewModel> GetFullList();
 
-        List<CashWithdrawalViewModel> GetFilteredList(CashWithdrawalSearchModel model);
+		List<CashWithdrawalViewModel> GetFilteredList(CashWithdrawalSearchModel model);
 
-        CashWithdrawalViewModel? GetElement(CashWithdrawalSearchModel model);
+		CashWithdrawalViewModel? GetElement(CashWithdrawalSearchModel model);
 
-        CashWithdrawalViewModel? Insert(CashWithdrawalBindingModel model);
+		CashWithdrawalViewModel? Insert(CashWithdrawalBindingModel model);
 
-        CashWithdrawalViewModel? Update(CashWithdrawalBindingModel model);
+		CashWithdrawalViewModel? Update(CashWithdrawalBindingModel model);
 
-        CashWithdrawalViewModel? Delete(CashWithdrawalBindingModel model);
-    }
+		CashWithdrawalViewModel? Delete(CashWithdrawalBindingModel model);
+	}
 }
diff --git a/Bank/BankContracts/StoragesModels/Cashier/ICashierStorage.cs b/Bank/BankContracts/StoragesModels/Cashier/ICashierStorage.cs
index c2337db..e7229c5 100644
--- a/Bank/BankContracts/StoragesModels/Cashier/ICashierStorage.cs
+++ b/Bank/BankContracts/StoragesModels/Cashier/ICashierStorage.cs
@@ -1,27 +1,21 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankContracts.StoragesModels.Cashier
+namespace BankContracts.StoragesContracts.Cashier
 {
-    // Интерфейс для хранилища кассиров
     public interface ICashierStorage
-    {
-        List<CashierViewModel> GetFullList();
+	{
+		List<CashierViewModel> GetFullList();
 
-        List<CashierViewModel> GetFilteredList(CashierSearchModel model);
+		List<CashierViewModel> GetFilteredList(CashierSearchModel model);
 
-        CashierViewModel? GetElement(CashierSearchModel model);
+		CashierViewModel? GetElement(CashierSearchModel model);
 
-        CashierViewModel? Insert(CashierBindingModel model);
+		CashierViewModel? Insert(CashierBindingModel model);
 
-        CashierViewModel? Update(CashierBindingModel model);
+		CashierViewModel? Update(CashierBindingModel model);
 
-        CashierViewModel? Delete(CashierBindingModel model);
-    }
+		CashierViewModel? Delete(CashierBindingModel model);
+	}
 }
diff --git a/Bank/BankContracts/StoragesModels/Cashier/IMoneyTransferStorage.cs b/Bank/BankContracts/StoragesModels/Cashier/IMoneyTransferStorage.cs
index 1d4270b..76f9ffe 100644
--- a/Bank/BankContracts/StoragesModels/Cashier/IMoneyTransferStorage.cs
+++ b/Bank/BankContracts/StoragesModels/Cashier/IMoneyTransferStorage.cs
@@ -1,27 +1,21 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankContracts.StoragesModels.Cashier
+namespace BankContracts.StoragesContracts.Cashier
 {
-    // Интерфейс для хранилища переводов денег
     public interface IMoneyTransferStorage
-    {
-        List<MoneyTransferViewModel> GetFullList();
+	{
+		List<MoneyTransferViewModel> GetFullList();
 
-        List<MoneyTransferViewModel> GetFilteredList(MoneyTransferSearchModel model);
+		List<MoneyTransferViewModel> GetFilteredList(MoneyTransferSearchModel model);
 
-        MoneyTransferViewModel? GetElement(MoneyTransferSearchModel model);
+		MoneyTransferViewModel? GetElement(MoneyTransferSearchModel model);
 
-        MoneyTransferViewModel? Insert(MoneyTransferBindingModel model);
+		MoneyTransferViewModel? Insert(MoneyTransferBindingModel model);
 
-        MoneyTransferViewModel? Update(MoneyTransferBindingModel model);
+		MoneyTransferViewModel? Update(MoneyTransferBindingModel model);
 
-        MoneyTransferViewModel? Delete(MoneyTransferBindingModel model);
-    }
+		MoneyTransferViewModel? Delete(MoneyTransferBindingModel model);
+	}
 }
diff --git a/Bank/BankContracts/StoragesModels/Client/ICardStorage.cs b/Bank/BankContracts/StoragesModels/Client/ICardStorage.cs
index 62d3906..d050546 100644
--- a/Bank/BankContracts/StoragesModels/Client/ICardStorage.cs
+++ b/Bank/BankContracts/StoragesModels/Client/ICardStorage.cs
@@ -1,15 +1,9 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankContracts.StoragesModels.Client
+namespace BankContracts.StoragesContracts.Client
 {
-    // Интерфейс для хранилища банковских карт
     public interface ICardStorage
     {
         List<CardViewModel> GetFullList();
@@ -24,4 +18,4 @@ namespace BankContracts.StoragesModels.Client
 
         CardViewModel? Delete(CardBindingModel model);
     }
-}
+}
\ No newline at end of file
diff --git a/Bank/BankContracts/StoragesModels/Client/IClientStorage.cs b/Bank/BankContracts/StoragesModels/Client/IClientStorage.cs
index 646a7b8..704662e 100644
--- a/Bank/BankContracts/StoragesModels/Client/IClientStorage.cs
+++ b/Bank/BankContracts/StoragesModels/Client/IClientStorage.cs
@@ -1,15 +1,9 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankContracts.StoragesModels.Client
+namespace BankContracts.StoragesContracts.Client
 {
-    // Интерфейс для хранилища клиентов
     public interface IClientStorage
     {
         List<ClientViewModel> GetFullList();
diff --git a/Bank/BankContracts/StoragesModels/Client/ICreditingStorage.cs b/Bank/BankContracts/StoragesModels/Client/ICreditingStorage.cs
index 56aa50e..5c73e34 100644
--- a/Bank/BankContracts/StoragesModels/Client/ICreditingStorage.cs
+++ b/Bank/BankContracts/StoragesModels/Client/ICreditingStorage.cs
@@ -1,15 +1,9 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankContracts.StoragesModels.Client
+namespace BankContracts.StoragesContracts.Client
 {
-    // Интерфейс для хранилища пополнения карты
     public interface ICreditingStorage
     {
         List<CreditingViewModel> GetFullList();
@@ -24,4 +18,4 @@ namespace BankContracts.StoragesModels.Client
 
         CreditingViewModel? Delete(CreditingBindingModel model);
     }
-}
+}
\ No newline at end of file
diff --git a/Bank/BankContracts/StoragesModels/Client/IDebitingStorage.cs b/Bank/BankContracts/StoragesModels/Client/IDebitingStorage.cs
index 3a744ff..08d9796 100644
--- a/Bank/BankContracts/StoragesModels/Client/IDebitingStorage.cs
+++ b/Bank/BankContracts/StoragesModels/Client/IDebitingStorage.cs
@@ -1,15 +1,9 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankContracts.StoragesModels.Client
+namespace BankContracts.StoragesContracts.Client
 {
-    // Интерфейс для хранилища получения наличных
     public interface IDebitingStorage
     {
         List<DebitingViewModel> GetFullList();
@@ -24,4 +18,4 @@ namespace BankContracts.StoragesModels.Client
 
         DebitingViewModel? Delete(DebitingBindingModel model);
     }
-}
+}
\ No newline at end of file
diff --git a/Bank/BankContracts/ViewModels/Cashier/Diagram/CashierDiagramElementsViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/Diagram/CashierDiagramElementsViewModel.cs
index 96ad2ea..ad9d753 100644
--- a/Bank/BankContracts/ViewModels/Cashier/Diagram/CashierDiagramElementsViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Cashier/Diagram/CashierDiagramElementsViewModel.cs
@@ -9,7 +9,7 @@ namespace BankContracts.ViewModels.Cashier.Diagram
     public class CashierDiagramElementsViewModel
     {
         public string Name { get; set; } = "Column";
-
         public int Value { get; set; } = 0;
+
     }
 }
diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/AccountViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/AccountViewModel.cs
index ef55a91..6b3d0c1 100644
--- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/AccountViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/AccountViewModel.cs
@@ -1,16 +1,9 @@
-using BankDataModels.Enums;
-using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
+using BankDataModels.Models.Cashier;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankContracts.ViewModels
+namespace BankContracts.ViewModels.Cashier.ViewModels
 {
-	// Класс для отображения информации о счетах
-	public class AccountViewModel : IAccountModel
+    public class AccountViewModel : IAccountModel
 	{
 		public int Id { get; set; }
 
@@ -21,15 +14,6 @@ namespace BankContracts.ViewModels
 		[DisplayName("Номер счёта")]
 		public string AccountNumber { get; set; } = string.Empty;
 
-		[DisplayName("Баланс")]
-		public double Balance { get; set; }
-
-		[DisplayName("Дата открытия")]
-		public DateTime DateOpen { get; set; } = DateTime.Now;  // ИЛИ ТУТ СРОК ДЕЙСТВИЯ СЧЁТА??? не, дата открытия
-
-		[DisplayName("Статус счёта")]
-		public StatusAccount StatusAccount { get; set; } = StatusAccount.Закрыт;
-
 		[DisplayName("Имя")]
 		public string Name { get; set; } = string.Empty;
 
@@ -37,5 +21,11 @@ namespace BankContracts.ViewModels
 		public string Patronymic { get; set; } = string.Empty;
 
 		public string PasswordAccount { get; set; } = string.Empty;
+
+		[DisplayName("Баланс")]
+		public double Balance { get; set; }
+
+		[DisplayName("Дата открытия")]
+		public DateTime DateOpen { get; set; } = DateTime.Now;
 	}
 }
diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashWithdrawalViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashWithdrawalViewModel.cs
index 17f95ce..221d208 100644
--- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashWithdrawalViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashWithdrawalViewModel.cs
@@ -1,35 +1,34 @@
-using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
+using BankDataModels.Enums;
+using BankDataModels.Models.Cashier;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Cashier.ViewModels
 {
-	// Класс для отображения информации о выдаче наличных
-	public class CashWithdrawalViewModel : ICashWithdrawalModel
-    {
-        [DisplayName("Номер операции")]
-        public int Id { get; set; }
+    public class CashWithdrawalViewModel : ICashWithdrawalModel
+	{
+		public int Id { get; set; }
 
-        public int DebitingId { get; set; }
-        public int AccountId { get; set; }
+		public int DebitingId { get; set; }
 
-        // тут тоже вопрос, у нас операции не связаны ни со счетом ни с картами, поэтому это стоит обсудить 
+		public StatusEnum DebitingStatus { get; set; }
 
-        // Хмм, ну свяжем, хотя бы со счётом, потому как это сущность твоего варианта, уже как минимум стоит
+		[DisplayName("Номер заявки на снятие средств")]
+		public int DebbitingNumber { get; set; }
 
-        [DisplayName("Номер счёта")]
-        public string AccountNumber { get; set; } = string.Empty;
+		public int AccountId { get; set; }
 
-        public int CashierId { get; set; }
+		[DisplayName("Номер счёта")]
+		public string AccountNumber { get; set; } = string.Empty;
 
-        [DisplayName("Сумма выданных наличных")]
-        public double Sum { get; set; }
+		public int CashierId { get; set; }
 
-        [DisplayName("Дата операции")]
-        public DateTime DateWithdrawal { get; set; } = DateTime.Now;
-    }
+		[DisplayName("Кассир")]
+		public string SurmaneCashier { get; set; } = string.Empty;
+
+		[DisplayName("Сумма выданных наличных")]
+		public int Sum { get; set; }
+
+		[DisplayName("Дата операции")]
+		public DateTime DateOperation { get; set; } = DateTime.Now;
+	}
 }
diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashierViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashierViewModel.cs
index b09d06c..1020008 100644
--- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashierViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/CashierViewModel.cs
@@ -1,34 +1,27 @@
 using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Cashier.ViewModels
 {
-	// Класс для отображения информации о кассирах
-	public class CashierViewModel : ICashierModel
-    {
-        public int Id { get; set; }
+    public class CashierViewModel : ICashierModel
+	{
+		public int Id { get; set; }
 
-        [DisplayName("Имя")]
-        public string Name { get; set; } = string.Empty;
+		public string Password { get; set; } = string.Empty;
 
-        [DisplayName("Фамилия")]
-        public string Surname { get; set; } = string.Empty;
+		[DisplayName("Имя")]
+		public string Name { get; set; } = string.Empty;
 
-        [DisplayName("Отчество")]
-        public string Patronymic { get; set; } = string.Empty;
+		[DisplayName("Фамилия")]
+		public string Surname { get; set; } = string.Empty;
 
-        [DisplayName("Почта")]
-        public string Email { get; set; } = string.Empty;
+		[DisplayName("Отчество")]
+		public string Patronymic { get; set; } = string.Empty;
 
-        [DisplayName("Пароль")]
-        public string Password { get; set; } = string.Empty;
+		[DisplayName("Телефон")]
+		public string Telephone { get; set; } = string.Empty;
 
-        [DisplayName("Телефон")]
-        public string MobilePhone { get; set; } = string.Empty;
-    }
+		[DisplayName("Почта")]
+		public string Email { get; set; } = string.Empty;
+	}
 }
diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/ClientSelectViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/ClientSelectViewModel.cs
index 9ec5e75..e83bbff 100644
--- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/ClientSelectViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/ClientSelectViewModel.cs
@@ -1,5 +1,7 @@
-using System;
+using BankDataModels.Models;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
diff --git a/Bank/BankContracts/ViewModels/Cashier/ViewModels/MoneyTransferViewModel.cs b/Bank/BankContracts/ViewModels/Cashier/ViewModels/MoneyTransferViewModel.cs
index f23729e..c42ddec 100644
--- a/Bank/BankContracts/ViewModels/Cashier/ViewModels/MoneyTransferViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Cashier/ViewModels/MoneyTransferViewModel.cs
@@ -1,40 +1,34 @@
 using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Cashier.ViewModels
 {
-	// Класс для отображения информации о переводах денег
-	public class MoneyTransferViewModel : IMoneyTransferModel
-    {
-        public int Id { get; set; }
+    public class MoneyTransferViewModel : IMoneyTransferModel
+	{
+		public int Id { get; set; }
 
-        [DisplayName("Сумма перевода")]
-        public double Sum { get; set; }
+		[DisplayName("Сумма перевода")]
+		public int Sum { get; set; }
 
-        // Для перевода между счетами
-        public int? AccountSenderId { get; set; }
+		public int? AccountSenderId { get; set; }
 
-		[DisplayName("Номер счёта отправителя")]
-        public string AccountSenderNumber { get; set; } = string.Empty;
+		[DisplayName("Номер счёта отп.")]
+		public string AccountSenderNumber { get; set; } = string.Empty;
 
-        public int AccountPayeeId { get; set; }
+		public int AccountPayeeId { get; set; }
 
-        [DisplayName("Номер счёта получателя")]
-        public string AccountPayeeNumber { get; set; } = string.Empty;
+		[DisplayName("Номер счёта получ.")]
+		public string AccountPayeeNumber { get; set; } = string.Empty;
 
 		[DisplayName("Дата операции")]
-        public DateTime DateTransfer { get; set; } = DateTime.Now;
+		public DateTime DateOperation { get; set; } = DateTime.Now;
 
+		[DisplayName("Номер операции на пополнение")]
 		public int? CreditingId { get; set; }
 
 		public int CashierId { get; set; }
 
-        [DisplayName("Фамилия кассира")]
-        public string CashierSurname { get; set; } = string.Empty;
-    }
+		[DisplayName("Фамилия кассира")]
+		public string CashierSurname { get; set; } = string.Empty;
+	}
 }
diff --git a/Bank/BankContracts/ViewModels/Client/Diagram/ClientDiagramElementsViewModel.cs b/Bank/BankContracts/ViewModels/Client/Diagram/ClientDiagramElementsViewModel.cs
index 0fd1eba..9ce6f80 100644
--- a/Bank/BankContracts/ViewModels/Client/Diagram/ClientDiagramElementsViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Client/Diagram/ClientDiagramElementsViewModel.cs
@@ -1,5 +1,7 @@
-using System;
+using BankDataModels.Models;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,7 +11,7 @@ namespace BankContracts.ViewModels.Client.Diagram
     public class ClientDiagramElementsViewModel
     {
         public string Name { get; set; } = "Column";
-
         public int Value { get; set; } = 0;
+
     }
 }
diff --git a/Bank/BankContracts/ViewModels/Client/Diagram/ClientDiagramViewModel.cs b/Bank/BankContracts/ViewModels/Client/Diagram/ClientDiagramViewModel.cs
index 3f48785..fb74336 100644
--- a/Bank/BankContracts/ViewModels/Client/Diagram/ClientDiagramViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Client/Diagram/ClientDiagramViewModel.cs
@@ -1,15 +1,17 @@
-using System;
+using BankDataModels.Models;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Client.Diagram
 {
-    public class ClientDiagramViewModel
-    {
-        public string DiagramName { get; set; } = "Diagram Name";
+	public class ClientDiagramViewModel
+	{
+		public string DiagramName { get; set; } = "Diagram Name";
 
-        public List<ClientDiagramElementsViewModel> Elements { get; set; } = new();
-    }
+		public List<ClientDiagramElementsViewModel> Elements { get; set; } = new();
+	}
 }
diff --git a/Bank/BankContracts/ViewModels/Client/ViewModels/CardViewModel.cs b/Bank/BankContracts/ViewModels/Client/ViewModels/CardViewModel.cs
index e81a05a..a0deeef 100644
--- a/Bank/BankContracts/ViewModels/Client/ViewModels/CardViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Client/ViewModels/CardViewModel.cs
@@ -1,37 +1,28 @@
-using BankDataModels.Enums;
-using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
+using BankDataModels.Models.Client;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Client.ViewModels
 {
-	// Класс для отображения информации о банковских картах
-	public class CardViewModel : ICardModel
+    public class CardViewModel : ICardModel
     {
         public int Id { get; set; }
 
-        public int ClientId { get; set; }
+        public int ClientID { get; set; }
+
+        [DisplayName("Фамилия клиента")]
+        public string? ClientSurname { get; set; }
 
         public int AccountId { get; set; }
 
-        // Номер банковской карты
         [DisplayName("Номер карты")]
         public string Number { get; set; } = string.Empty;
 
         [DisplayName("Баланс карты")]
-        public double Balance { get; set; }
+        public double Sum { get; set; }
 
-        [DisplayName("Срок действия")]
+        public string CVC { get; set; } = string.Empty;
+
+        [DisplayName("Период действия")]
         public DateTime Period { get; set; } = DateTime.Now;
-
-        [DisplayName("Статус карты")]
-        public StatusCard StatusCard { get; set; } = StatusCard.Закрыта;
-
-        [DisplayName("Фамилия клиента")]
-        public string? ClientSurname { get; set; }
     }
 }
diff --git a/Bank/BankContracts/ViewModels/Client/ViewModels/ClientViewModel.cs b/Bank/BankContracts/ViewModels/Client/ViewModels/ClientViewModel.cs
index 23ac782..c5bb75c 100644
--- a/Bank/BankContracts/ViewModels/Client/ViewModels/ClientViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Client/ViewModels/ClientViewModel.cs
@@ -1,17 +1,12 @@
 using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Client.ViewModels
 {
-	// Класс для отображения информации о клиентах
-	public class ClientViewModel : IClientModel
+    public class ClientViewModel : IClientModel
     {
         public int Id { get; set; }
+        public string Password { get; set; } = string.Empty;
 
         [DisplayName("Имя")]
         public string Name { get; set; } = string.Empty;
@@ -25,10 +20,7 @@ namespace BankContracts.ViewModels.Client.ViewModels
         [DisplayName("Почта")]
         public string Email { get; set; } = string.Empty;
 
-        [DisplayName("Пароль")]
-        public string Password { get; set; } = string.Empty;
-
         [DisplayName("Телефон")]
-        public string MobilePhone { get; set; } = string.Empty;
+        public string Telephone { get; set; } = string.Empty;
     }
 }
diff --git a/Bank/BankContracts/ViewModels/Client/ViewModels/CreditingViewModel.cs b/Bank/BankContracts/ViewModels/Client/ViewModels/CreditingViewModel.cs
index c938470..e8ae28e 100644
--- a/Bank/BankContracts/ViewModels/Client/ViewModels/CreditingViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Client/ViewModels/CreditingViewModel.cs
@@ -1,29 +1,28 @@
-using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
+using BankDataModels.Enums;
+using BankDataModels.Models.Client;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Client.ViewModels
 {
-	// Класс для отображения информации о пополнении карты
-	public class CreditingViewModel : ICreditingModel
+    public class CreditingViewModel : ICreditingModel
     {
         public int Id { get; set; }
 
-        public int ClientId { get; set; }
-
         public int CardId { get; set; }
 
         [DisplayName("Номер карты")]
         public string? CardNumber { get; set; }
 
         [DisplayName("Сумма операции")]
-        public double Sum { get; set; }
+        public int Sum { get; set; }
 
-        [DisplayName("Дата заявки")]
-        public DateTime DateCredit { get; set; } = DateTime.Now;
+        [DisplayName("Дата открытия заявки")]
+        public DateTime DateOpen { get; set; } = DateTime.Now;
+
+        [DisplayName("Дата закрытия заявки")]
+        public DateTime? DateClose { get; set; }
+
+        [DisplayName("Статус заявки")]
+        public StatusEnum Status { get; set; }
     }
 }
diff --git a/Bank/BankContracts/ViewModels/Client/ViewModels/DebitingViewModel.cs b/Bank/BankContracts/ViewModels/Client/ViewModels/DebitingViewModel.cs
index 6a02181..ce7d95d 100644
--- a/Bank/BankContracts/ViewModels/Client/ViewModels/DebitingViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Client/ViewModels/DebitingViewModel.cs
@@ -1,33 +1,28 @@
 using BankDataModels.Enums;
 using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Client.ViewModels
 {
-	// Класс для отображения информации о получении наличных по карте
-	public class DebitingViewModel : IDebitingModel
+    public class DebitingViewModel : IDebitingModel
     {
         public int Id { get; set; }
 
-        public int ClientId { get; set; }
-
         public int CardId { get; set; }
 
         [DisplayName("Номер карты")]
         public string CardNumber { get; set; } = string.Empty;
 
         [DisplayName("Сумма операции")]
-        public double Sum { get; set; }
+        public int Sum { get; set; }
 
         [DisplayName("Дата открытия заявки")]
-        public DateTime DateDebit { get; set; } = DateTime.Now;
+        public DateTime DateOpen { get; set; } = DateTime.Now;
+
+        [DisplayName("Дата закрытия заявки")]
+        public DateTime? DateClose { get; set; }
 
         [DisplayName("Статус заявки")]
-        public StatusCard Status { get; set; }
+        public StatusEnum Status { get; set; }
     }
 }
diff --git a/Bank/BankContracts/ViewModels/Reports/Cashier/ReportCashierAccountsViewModel.cs b/Bank/BankContracts/ViewModels/Reports/Cashier/ReportCashierAccountsViewModel.cs
index b3093fb..ba93bb3 100644
--- a/Bank/BankContracts/ViewModels/Reports/Cashier/ReportCashierAccountsViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Reports/Cashier/ReportCashierAccountsViewModel.cs
@@ -1,6 +1,7 @@
 using BankDataModels.Enums;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -8,7 +9,8 @@ using System.Threading.Tasks;
 namespace BankContracts.ViewModels.Reports.Cashier
 {
     public class ReportCashierAccountsViewModel
-    {
+    { 
+
         public int Sum { get; set; }
 
         public string AccountSenderNumber { get; set; } = "---";
diff --git a/Bank/BankContracts/ViewModels/Reports/Cashier/ReportCashierViewModel.cs b/Bank/BankContracts/ViewModels/Reports/Cashier/ReportCashierViewModel.cs
index 18e0537..853cf06 100644
--- a/Bank/BankContracts/ViewModels/Reports/Cashier/ReportCashierViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Reports/Cashier/ReportCashierViewModel.cs
@@ -14,7 +14,7 @@ namespace BankContracts.ViewModels.Reports.Cashier
 
         public string AccountPayeeNumber { get; set; }
 
-        public string AccountSenderNumber { get; set; }
+		public string? AccountSenderNumber { get; set; }
 
         public double SumOperation { get; set; }
 
diff --git a/Bank/BankContracts/ViewModels/Reports/Client/CheckboxViewModel.cs b/Bank/BankContracts/ViewModels/Reports/Client/CheckboxViewModel.cs
index d869b3d..acc90c0 100644
--- a/Bank/BankContracts/ViewModels/Reports/Client/CheckboxViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Reports/Client/CheckboxViewModel.cs
@@ -1,5 +1,7 @@
-using System;
+using BankDataModels.Models;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
diff --git a/Bank/BankContracts/ViewModels/Reports/Client/ReportClientCardsViewModel.cs b/Bank/BankContracts/ViewModels/Reports/Client/ReportClientCardsViewModel.cs
index b46ac91..b6d2c73 100644
--- a/Bank/BankContracts/ViewModels/Reports/Client/ReportClientCardsViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Reports/Client/ReportClientCardsViewModel.cs
@@ -10,6 +10,6 @@ namespace BankContracts.ViewModels.Reports.Client
     {
         public List<CheckboxViewModel>? Cards { get; set; } = new();
 
-        public List<ReportClientCardsViewModel>? Operations { get; set; } = new();
+        public List<ReportViewModel>? Operations { get; set; } = new();
     }
 }
diff --git a/Bank/BankContracts/ViewModels/Reports/Client/ReportClientViewModel.cs b/Bank/BankContracts/ViewModels/Reports/Client/ReportClientViewModel.cs
index 77dd08a..d3f678c 100644
--- a/Bank/BankContracts/ViewModels/Reports/Client/ReportClientViewModel.cs
+++ b/Bank/BankContracts/ViewModels/Reports/Client/ReportClientViewModel.cs
@@ -16,4 +16,4 @@ namespace BankContracts.ViewModels.Reports.Client
 
         public DateTime? DateComplite { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/Bank/BankContracts/ViewModels/Reports/Client/ReportViewModel.cs b/Bank/BankContracts/ViewModels/Reports/Client/ReportViewModel.cs
new file mode 100644
index 0000000..0fe1ab9
--- /dev/null
+++ b/Bank/BankContracts/ViewModels/Reports/Client/ReportViewModel.cs
@@ -0,0 +1,29 @@
+using BankDataModels.Enums;
+using BankDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankContracts.ViewModels.Reports.Client
+{
+    public class ReportViewModel
+    {
+        public int Id { get; set; }
+
+        public int CardId { get; set; }
+
+        public string? CardNumber { get; set; }
+
+        public int Sum { get; set; }
+
+        public DateTime DateOpen { get; set; }
+
+        public DateTime? DateClose { get; set; }
+
+        public StatusEnum Status { get; set; }
+
+        public TypeOperationEnum TypeOperation { get; set; }
+    }
+}
diff --git a/Bank/BankContracts/ViewModels/Reports/ReportCashierViewModelForHTML.cs b/Bank/BankContracts/ViewModels/Reports/ReportCashierViewModelForHTML.cs
index 2814d06..4888ebc 100644
--- a/Bank/BankContracts/ViewModels/Reports/ReportCashierViewModelForHTML.cs
+++ b/Bank/BankContracts/ViewModels/Reports/ReportCashierViewModelForHTML.cs
@@ -1,18 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BankContracts.ViewModels.Reports.Cashier;
+using BankContracts.ViewModels.Reports.Cashier;
 
 namespace BankContracts.ViewModels.Reports
 {
     public class ReportCashierViewModelForHTML
-    {
-		// Список переводов со счёта на счёт для вывода/сохранения в файл
+	{
+		//перечень переводов со счёта на счёт
 		public List<ReportCashierViewModel> ReportMoneyTransfer { get; set; } = new();
 
-		// Список зачислений денежных средств на карту для вывода/сохранения в файл
+		//перечень зачислений денежных средств на карту (т. е. на её счёт)
 		public List<ReportCashierViewModel> ReportCashWithdrawal { get; set; } = new();
-    }
+	}
 }
diff --git a/Bank/BankContracts/ViewModels/Reports/ReportClientViewModelForHTML.cs b/Bank/BankContracts/ViewModels/Reports/ReportClientViewModelForHTML.cs
index 3b10f40..b7ed1b7 100644
--- a/Bank/BankContracts/ViewModels/Reports/ReportClientViewModelForHTML.cs
+++ b/Bank/BankContracts/ViewModels/Reports/ReportClientViewModelForHTML.cs
@@ -1,18 +1,13 @@
 using BankContracts.ViewModels.Reports.Client;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankContracts.ViewModels.Reports
 {
-	public class ReportClientViewModelForHTML
+    public class ReportClientViewModelForHTML
 	{
-		// Список операций пополнения за указанный период для вывода/сохранения в файл
+		//перечень заказов за указанный период для вывода/сохранения
 		public List<ReportClientViewModel> ReportCrediting { get; set; } = new();
 
-		// Список снятий за указанный период для вывода/сохранения в файл
+		//перечень заказов за указанный период для вывода/сохранения
 		public List<ReportClientViewModel> ReportDebiting { get; set; } = new();
 	}
 }
diff --git a/Bank/BankDataModels/Enums/MailsEnum.cs b/Bank/BankDataModels/Enums/MailsEnum.cs
index fb2698a..935332b 100644
--- a/Bank/BankDataModels/Enums/MailsEnum.cs
+++ b/Bank/BankDataModels/Enums/MailsEnum.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 
 namespace BankDataModels.Enums
 {
-	public enum MailsEnum
-	{
-		Клиент = 0,
+    public enum MailsEnum
+    {
+        Клиент = 0,
 
-		Кассир = 1
-	}
+        Кассир = 1
+    }
 }
diff --git a/Bank/BankDataModels/Enums/Months.cs b/Bank/BankDataModels/Enums/Months.cs
new file mode 100644
index 0000000..afce3d5
--- /dev/null
+++ b/Bank/BankDataModels/Enums/Months.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDataModels.Enums
+{
+    public enum Months
+    {
+        Январь = 1,
+        Февраль, Март, Апрель, Май, Июнь,
+        Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь
+    };
+}
diff --git a/Bank/BankDataModels/Enums/StatusAccount.cs b/Bank/BankDataModels/Enums/StatusAccount.cs
deleted file mode 100644
index 9681028..0000000
--- a/Bank/BankDataModels/Enums/StatusAccount.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankDataModels.Enums
-{
-    public enum StatusAccount
-    {
-        Открыт = 0,
-
-        Закрыт = 1,
-
-        Отклонен = 2,
-
-        Счёт_просрочен = 3
-    }
-}
diff --git a/Bank/BankDataModels/Enums/StatusCard.cs b/Bank/BankDataModels/Enums/StatusCard.cs
deleted file mode 100644
index b4508f5..0000000
--- a/Bank/BankDataModels/Enums/StatusCard.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankDataModels.Enums
-{
-    public enum StatusCard
-    {
-        Открыта = 0,
-
-        Закрыта = 1,
-
-        Отклонена = 2,
-
-        Карта_просрочена = 3
-    }
-}
diff --git a/Bank/BankDataModels/Enums/StatusEnum.cs b/Bank/BankDataModels/Enums/StatusEnum.cs
new file mode 100644
index 0000000..759a1d4
--- /dev/null
+++ b/Bank/BankDataModels/Enums/StatusEnum.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDataModels.Enums
+{
+	public enum StatusEnum
+	{
+		Открыта = 0,
+
+		Закрыта = 1,
+
+		Отклонено = 2,
+
+		Карта_просрочена  = 3
+	}
+}
diff --git a/Bank/BankDataModels/Enums/TypeOperationEnum.cs b/Bank/BankDataModels/Enums/TypeOperationEnum.cs
index 9603d83..e996393 100644
--- a/Bank/BankDataModels/Enums/TypeOperationEnum.cs
+++ b/Bank/BankDataModels/Enums/TypeOperationEnum.cs
@@ -6,12 +6,12 @@ using System.Threading.Tasks;
 
 namespace BankDataModels.Enums
 {
-    public enum TypeOperationEnum
-    {
+	public enum TypeOperationEnum
+	{
         Снятие = 1,
 
         Пополнение = 2,
 
-        Перевод = 3
+        Перевод = 3,
     }
 }
diff --git a/Bank/BankDataModels/Models/Cashier/IAccountModel.cs b/Bank/BankDataModels/Models/Cashier/IAccountModel.cs
index 1a70c98..8c5bb23 100644
--- a/Bank/BankDataModels/Models/Cashier/IAccountModel.cs
+++ b/Bank/BankDataModels/Models/Cashier/IAccountModel.cs
@@ -1,29 +1,25 @@
-using BankDataModels.Enums;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Principal;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace BankDataModels.Models.Cashier
 {
-    // Интерфейс, отвечающий за cчёт
-    public interface IAccountModel : IId
-    {
-        int CashierId { get; }
+	//банковский счёт
+	public interface IAccountModel : IId
+	{
+		string AccountNumber { get; }
 
-        int ClientId { get; }
+		int CashierId { get; }
 
-        // Номер счёта
-        string AccountNumber { get; }
+		int ClientId { get; }
 
-        // Сумма на счёте
-        double Balance { get; }
+		string PasswordAccount { get; }
 
-        // Дата открытия
-        DateTime DateOpen { get; }
+		double Balance { get; }
 
-        // Статус счёта
-        StatusAccount StatusAccount { get; }
-    }
+		DateTime DateOpen { get; }
+	}
 }
diff --git a/Bank/BankDataModels/Models/Cashier/ICashWithdrawalModel.cs b/Bank/BankDataModels/Models/Cashier/ICashWithdrawalModel.cs
index 52b5c2c..690829d 100644
--- a/Bank/BankDataModels/Models/Cashier/ICashWithdrawalModel.cs
+++ b/Bank/BankDataModels/Models/Cashier/ICashWithdrawalModel.cs
@@ -6,19 +6,17 @@ using System.Threading.Tasks;
 
 namespace BankDataModels.Models.Cashier
 {
-    // Интерфейс, отвечающий за выдачу наличных
-    public interface ICashWithdrawalModel : IId
-    {
-        int DebitingId { get; }
+	//выдача наличных
+	public interface ICashWithdrawalModel : IId
+	{
+		int DebitingId { get; }
 
-        int AccountId { get; }
+		int AccountId { get; }
 
-        int CashierId { get; }
+		int CashierId { get; }
 
-        // Сумма наличисления наличных
-        double Sum { get; }
+		int Sum { get; }
 
-        // Дата выдачи наличных
-        DateTime DateWithdrawal { get; }
-    }
+		DateTime DateOperation { get; }
+	}
 }
diff --git a/Bank/BankDataModels/Models/Cashier/ICashierModel.cs b/Bank/BankDataModels/Models/Cashier/ICashierModel.cs
index 25f46a0..debf650 100644
--- a/Bank/BankDataModels/Models/Cashier/ICashierModel.cs
+++ b/Bank/BankDataModels/Models/Cashier/ICashierModel.cs
@@ -6,25 +6,19 @@ using System.Threading.Tasks;
 
 namespace BankDataModels.Models.Cashier
 {
-    // Интерфейс, отвечающий за кассира
-    public interface ICashierModel : IId
-    {
-        // Имя кассира
-        string Name { get; }
+	//клиент
+	public interface ICashierModel : IId
+	{
+		string Password { get; }
 
-        // Фамилия кассира
-        string Surname { get; }
+		string Name { get; }
 
-        // Отчество кассира
-        string Patronymic { get; }
+		string Surname { get; }
 
-        // Электронный адрес кассира
-        string Email { get; }
+		string Patronymic { get; }
 
-        // Пароль от аккаунта кассира
-        string Password { get; }
+		string Email { get; }
 
-        // Мобильный телефон кассира
-        string MobilePhone { get; }
-    }
+		string Telephone { get; }
+	}
 }
diff --git a/Bank/BankDataModels/Models/Cashier/IMoneyTransferModel.cs b/Bank/BankDataModels/Models/Cashier/IMoneyTransferModel.cs
index bd40359..c5f4d4e 100644
--- a/Bank/BankDataModels/Models/Cashier/IMoneyTransferModel.cs
+++ b/Bank/BankDataModels/Models/Cashier/IMoneyTransferModel.cs
@@ -6,21 +6,19 @@ using System.Threading.Tasks;
 
 namespace BankDataModels.Models.Cashier
 {
-    // Интерфейс, отвечающий за перевод денег
-    public interface IMoneyTransferModel : IId
-    {
-        // Сумма перевода
-        double Sum { get; }
+	//перевод денег
+	public interface IMoneyTransferModel : IId
+	{
+		int Sum { get; }
 
-        int? AccountSenderId { get; }
+		int? AccountSenderId { get; }
 
-        int AccountPayeeId { get; }
+		int AccountPayeeId { get; }
 
-        // Дата перевода
-        DateTime DateTransfer { get; }
+		DateTime DateOperation { get; }
 
-        int? CreditingId { get; }
+		int? CreditingId { get; }
 
-        int CashierId { get; }
-    }
+		int CashierId { get; }
+	}
 }
diff --git a/Bank/BankDataModels/Models/Client/ICardModel.cs b/Bank/BankDataModels/Models/Client/ICardModel.cs
deleted file mode 100644
index bc631b2..0000000
--- a/Bank/BankDataModels/Models/Client/ICardModel.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using BankDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankDataModels.Models.Client
-{
-    // Интерфейс, отвечающий за банковскую карту
-    public interface ICardModel : IId
-    {
-        int ClientId { get; }
-
-        int AccountId { get; }
-
-        // Номер банковской карты
-        string Number { get; }
-
-        // Сумма на карте
-        double Balance { get; }
-
-        // Период пользования картой
-        DateTime Period { get; }
-
-        // Статус карты
-        StatusCard StatusCard { get; }
-    }
-}
diff --git a/Bank/BankDataModels/Models/Client/IClientModel.cs b/Bank/BankDataModels/Models/Client/IClientModel.cs
deleted file mode 100644
index fb99a29..0000000
--- a/Bank/BankDataModels/Models/Client/IClientModel.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankDataModels.Models.Client
-{
-    // Интерфейс, отвечающий за клиента
-    public interface IClientModel : IId
-    {
-        // Имя клиента
-        string Name { get; }
-
-        // Фамилия клиента
-        string Surname { get; }
-
-        // Отчество клиента
-        string Patronymic { get; }
-
-        // Электронная почта клиента
-        string Email { get; }
-
-        // Пароль от аккаунта клиента
-        string Password { get; }
-
-        // Мобильный телефон клиента
-        string MobilePhone { get; }
-    }
-}
diff --git a/Bank/BankDataModels/Models/Client/ICreditingModel.cs b/Bank/BankDataModels/Models/Client/ICreditingModel.cs
index 9254554..5abfe1a 100644
--- a/Bank/BankDataModels/Models/Client/ICreditingModel.cs
+++ b/Bank/BankDataModels/Models/Client/ICreditingModel.cs
@@ -1,4 +1,5 @@
-using System;
+using BankDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,15 +7,17 @@ using System.Threading.Tasks;
 
 namespace BankDataModels.Models.Client
 {
-    // Интерфейс, отвечающий за пополнение карты
-    public interface ICreditingModel : IId
-    {
-        int CardId { get; }
-        // Сумма на пополнение карты
-        double Sum { get; }
+	//пополнение карты
+	public interface ICreditingModel : IId
+	{
+		int CardId { get; }
 
-        // Дата пополнения карты
-        DateTime DateCredit { get; }
+		int Sum { get; }
 
+        DateTime DateOpen { get; }
+
+        DateTime? DateClose { get; }
+
+        StatusEnum Status { get; }
     }
 }
diff --git a/Bank/BankDataModels/Models/Client/IDebitingModel.cs b/Bank/BankDataModels/Models/Client/IDebitingModel.cs
index ec97412..1010918 100644
--- a/Bank/BankDataModels/Models/Client/IDebitingModel.cs
+++ b/Bank/BankDataModels/Models/Client/IDebitingModel.cs
@@ -1,4 +1,5 @@
-using System;
+using BankDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,14 +7,17 @@ using System.Threading.Tasks;
 
 namespace BankDataModels.Models.Client
 {
-    // Интерфейс, отвечающий за получение наличных по карте
-    public interface IDebitingModel : IId
-    {
+    //снятие денег с карты
+	public interface IDebitingModel : IId
+	{
         int CardId { get; }
-        // Сумма снятия с карты
-        double Sum { get; }
 
-        // Дата снятия денег
-        DateTime DateDebit { get; }
+        int Sum { get; }
+
+        DateTime DateOpen { get; }
+
+		DateTime? DateClose { get; }
+
+		StatusEnum Status { get; }
     }
 }
diff --git a/Bank/BankDataModels/Models/Client/IСardModel.cs b/Bank/BankDataModels/Models/Client/IСardModel.cs
new file mode 100644
index 0000000..977b36f
--- /dev/null
+++ b/Bank/BankDataModels/Models/Client/IСardModel.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDataModels.Models.Client
+{
+	//банковская карта
+	public interface ICardModel : IId
+	{
+		int ClientID { get; }
+
+		int AccountId { get; }
+		
+		string Number { get; }
+
+		string CVC { get; }
+
+		DateTime Period { get; }
+	}
+}
diff --git a/Bank/BankDataModels/Models/Client/IСlientModel.cs b/Bank/BankDataModels/Models/Client/IСlientModel.cs
new file mode 100644
index 0000000..e381a63
--- /dev/null
+++ b/Bank/BankDataModels/Models/Client/IСlientModel.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BankDataModels.Models.Client
+{
+	//клиент
+	public interface IClientModel : IId
+	{
+		string Password { get; }
+
+		string Name { get; }
+
+		string Surname { get; }
+
+		string Patronymic { get; }
+
+		string Email { get; }
+
+		string Telephone { get; }
+	}
+}
diff --git a/Bank/BankDataModels/Models/IMessageInfoModel.cs b/Bank/BankDataModels/Models/IMessageInfoModel.cs
index c6202f7..5abdba1 100644
--- a/Bank/BankDataModels/Models/IMessageInfoModel.cs
+++ b/Bank/BankDataModels/Models/IMessageInfoModel.cs
@@ -6,23 +6,22 @@ using System.Threading.Tasks;
 
 namespace BankDataModels.Models
 {
-    // Интерфейс, отвечающий за сообщения (на почту)
-    public interface IMessageInfoModel : IId
-    {
-        string MessageId { get; }
+	public interface IMessageInfoModel : IId
+	{
+		string MessageId { get; }
 
-        int? ClientId { get; }
+		int? ClientId { get; }
 
-        string SenderName { get; }
+		string SenderName { get; }
 
-        DateTime DateDelivery { get; }
+		DateTime DateDelivery { get; }
 
-        string Subject { get; }
+		string Subject { get; }
 
-        string Body { get; }
+		string Body { get; }
 
-        public bool IsRead { get; }
+		public bool IsRead { get; }
 
-        public string Answer { get; }
-    }
+		public string Answer { get; }
+	}
 }
diff --git a/Bank/BankDatabaseImplement/BankDatabase.cs b/Bank/BankDatabaseImplement/BankDatabase.cs
index 5b768d0..86b7eb0 100644
--- a/Bank/BankDatabaseImplement/BankDatabase.cs
+++ b/Bank/BankDatabaseImplement/BankDatabase.cs
@@ -1,4 +1,5 @@
-using BankDatabaseImplement.Models.CashierModels;
+using BankDatabaseImplement.Models;
+using BankDatabaseImplement.Models.CashierModels;
 using BankDatabaseImplement.Models.ClientModels;
 using Microsoft.EntityFrameworkCore;
 using System;
diff --git a/Bank/BankDatabaseImplement/Implements/CashierImplements/AccountStorage.cs b/Bank/BankDatabaseImplement/Implements/CashierImplements/AccountStorage.cs
index 11b0fae..438725f 100644
--- a/Bank/BankDatabaseImplement/Implements/CashierImplements/AccountStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/CashierImplements/AccountStorage.cs
@@ -1,146 +1,140 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.StoragesModels.Cashier;
-using BankContracts.ViewModels;
+using BankContracts.StoragesContracts.Cashier;
+using BankContracts.ViewModels.Cashier.ViewModels;
 using BankDatabaseImplement.Models.CashierModels;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Implements.CashierImplements
 {
-	// Реализация интерфейса хранилища для сущности "Счёт"
-	public class AccountStorage : IAccountStorage
-    {
-        public List<AccountViewModel> GetFullList()
-        {
-            using var context = new BankDatabase();
+    public class AccountStorage : IAccountStorage
+	{
+		public List<AccountViewModel> GetFullList()
+		{
+			using var context = new BankDatabase();
 
-            return context.Accounts
-                    .Include(x => x.Client)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
+			return context.Accounts
+					.Include(x => x.Client)
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
 
-        public List<AccountViewModel> GetFilteredList(AccountSearchModel model)
-        {
-            using var context = new BankDatabase();
+		public List<AccountViewModel> GetFilteredList(AccountSearchModel model)
+		{
+			using var context = new BankDatabase();
 
-            if (!string.IsNullOrEmpty(model.AccountNumber))
-            {
-                return context.Accounts
-                    .Include(x => x.Client)
-                    .Where(x => x.AccountNumber.Contains(model.AccountNumber))
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-            }
+			if (!string.IsNullOrEmpty(model.AccountNumber))
+			{
+				return context.Accounts
+					.Include(x => x.Client)
+					.Where(x => x.AccountNumber.Contains(model.AccountNumber))
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
 
-            if (model.CashierId.HasValue)
-            {
-                return context.Accounts
-                    .Include(x => x.Client)
-                    .Where(x => x.CashierId == model.CashierId)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-            }
+			if (model.CashierId.HasValue)
+			{
+				return context.Accounts
+					.Include(x => x.Client)
+					.Where(x => x.CashierId == model.CashierId)
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
 
-            if (model.ClientId.HasValue)
-            {
-                return context.Accounts
-                    .Include(x => x.Client)
-                    .Where(x => x.ClientId == model.ClientId)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-            }
+			if (model.ClientId.HasValue)
+			{
+				return context.Accounts
+					.Include(x => x.Client)
+					.Where(x => x.ClientId == model.ClientId)
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
 
-            return context.Accounts
-                    .Include(x => x.Client)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
+			return context.Accounts
+					.Include(x => x.Client)
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
 
-        public AccountViewModel? GetElement(AccountSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.AccountNumber) && !model.Id.HasValue)
-            {
-                return null;
-            }
+		public AccountViewModel? GetElement(AccountSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.AccountNumber) && !model.Id.HasValue)
+			{
+				return null;
+			}
 
-            using var context = new BankDatabase();
+			using var context = new BankDatabase();
 
-            return context.Accounts
-                    .Include(x => x.Client)
-                    .FirstOrDefault(x => (!string.IsNullOrEmpty(model.AccountNumber) && x.AccountNumber == model.AccountNumber) ||
-                                        (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
+			return context.Accounts
+					.Include(x => x.Client)
+					.FirstOrDefault(x => (!string.IsNullOrEmpty(model.AccountNumber) && x.AccountNumber == model.AccountNumber) ||
+										(model.Id.HasValue && x.Id == model.Id))
+					?.GetViewModel;
+		}
 
-        public AccountViewModel? Insert(AccountBindingModel model)
-        {
-            using var context = new BankDatabase();
+		public AccountViewModel? Insert(AccountBindingModel model)
+		{	
+			using var context = new BankDatabase();
 
-            var newAccount = Account.Create(context, model);
+			var newAccount = Account.Create(context, model);
 
-            if (newAccount == null)
-            {
-                return null;
-            }
+			if (newAccount == null)
+			{
+				return null;
+			}
 
-            context.Accounts.Add(newAccount);
-            context.SaveChanges();
+			context.Accounts.Add(newAccount);
+			context.SaveChanges();
 
-            return newAccount.GetViewModel;
-        }
+			return newAccount.GetViewModel;
+		}
 
-        public AccountViewModel? Update(AccountBindingModel model)
-        {
-            using var context = new BankDatabase();
-            using var transaction = context.Database.BeginTransaction();
+		public AccountViewModel? Update(AccountBindingModel model)
+		{
+			using var context = new BankDatabase();
+			using var transaction = context.Database.BeginTransaction();
 
-            try
-            {
-                var account = context.Accounts.FirstOrDefault(rec => rec.Id == model.Id);
+			try
+			{
+				var account = context.Accounts.FirstOrDefault(rec => rec.Id == model.Id);
 
-                if (account == null)
-                {
-                    return null;
-                }
+				if (account == null)
+				{
+					return null;
+				}
 
-                account.Update(model);
-                context.SaveChanges();
-                transaction.Commit();
+				account.Update(model);
+				context.SaveChanges();
+				transaction.Commit();
 
-                return context.Accounts
-                    .Include(x => x.Client)
-                    .FirstOrDefault(x => x.Id == model.Id)
-                    ?.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
+				return context.Accounts
+					.Include(x => x.Client)
+					.FirstOrDefault(x => x.Id == model.Id)
+					?.GetViewModel;
+			}
+			catch
+			{
+				transaction.Rollback();
+				throw;
+			}
+		}
 
-        public AccountViewModel? Delete(AccountBindingModel model)
-        {
-            using var context = new BankDatabase();
+		public AccountViewModel? Delete(AccountBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var element = context.Accounts
+				.Include(x => x.AccountNumber)
+				.FirstOrDefault(rec => rec.Id == model.Id);
 
-            var element = context.Accounts
-                .Include(x => x.AccountNumber)
-                .FirstOrDefault(rec => rec.Id == model.Id);
+			if (element != null)
+			{
+				context.Accounts.Remove(element);
+				context.SaveChanges();
 
-            if (element != null)
-            {
-                context.Accounts.Remove(element);
-                context.SaveChanges();
+				return element.GetViewModel;
+			}
 
-                return element.GetViewModel;
-            }
-
-            return null;
-        }
-    }
+			return null;
+		}
+	}
 }
diff --git a/Bank/BankDatabaseImplement/Implements/CashierImplements/CashWithdrawalStorage.cs b/Bank/BankDatabaseImplement/Implements/CashierImplements/CashWithdrawalStorage.cs
index 102e1a9..de97cad 100644
--- a/Bank/BankDatabaseImplement/Implements/CashierImplements/CashWithdrawalStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/CashierImplements/CashWithdrawalStorage.cs
@@ -1,125 +1,120 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.StoragesModels.Cashier;
+using BankContracts.StoragesContracts.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankDatabaseImplement.Models.CashierModels;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Implements.CashierImplements
 {
-	// Реализация интерфейса хранилища для сущности "Снятие наличных"
-	public class CashWithdrawalStorage : ICashWithdrawalStorage
-    {
-        public List<CashWithdrawalViewModel> GetFullList()
-        {
-            using var context = new BankDatabase();
+    public class CashWithdrawalStorage : ICashWithdrawalStorage
+	{
+		public List<CashWithdrawalViewModel> GetFullList()
+		{
+			using var context = new BankDatabase();
 
-            return context.CashWithdrawals
-                    .Include(x => x.Cashier)
-                    .Include(x => x.Debiting)
-                    .Include(x => x.Account)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
+			return context.CashWithdrawals
+					.Include(x => x.Cashier)
+					.Include(x => x.Debiting)
+					.Include(x => x.Account)
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
 
-        public List<CashWithdrawalViewModel> GetFilteredList(CashWithdrawalSearchModel model)
-        {
-            using var context = new BankDatabase();
+		public List<CashWithdrawalViewModel> GetFilteredList(CashWithdrawalSearchModel model)
+		{
+			using var context = new BankDatabase();
+			var result = context.CashWithdrawals.Include(x => x.Cashier)
+					.Include(x => x.Debiting)
+					.Include(x => x.Account)
+					.ToList();
 
-            var result = context.CashWithdrawals.Include(x => x.Cashier)
-                    .Include(x => x.Debiting)
-                    .Include(x => x.Account)
-                    .ToList();
-
-            if (model.AccountId.HasValue) result = result.Where(x => x.AccountId == model.AccountId).ToList();
+			if (model.AccountId.HasValue) result = result.Where(x => x.AccountId == model.AccountId).ToList();
 
             if (model.CashierId.HasValue) result = result.Where(x => x.CashierId == model.CashierId).ToList();
 
-            if (model.DateWithdrawal.HasValue) result = result.Where(x => x.DateWithdrawal >= model.DateWithdrawal).ToList();
+			if (model.DateFrom.HasValue) result = result.Where(x => x.DateOperation >= model.DateFrom).ToList();
+
+            if (model.DateTo.HasValue) result = result.Where(x => x.DateOperation <= model.DateTo).ToList();
 
             if (model.ClientId.HasValue) result = result.Where(x => x.Account.ClientId == model.ClientId).ToList();
 
             return result.Select(x => x.GetViewModel).ToList();
-        }
+		}
 
-        public CashWithdrawalViewModel? GetElement(CashWithdrawalSearchModel model)
-        {
-            using var context = new BankDatabase();
+		public CashWithdrawalViewModel? GetElement(CashWithdrawalSearchModel model)
+		{
+			using var context = new BankDatabase();
 
-            return context.CashWithdrawals
-                    .Include(x => x.Cashier)
-                    .Include(x => x.Debiting)
-                    .Include(x => x.Account)
-                    .FirstOrDefault(x => (!(model.AccountId < 0) && x.AccountId == model.AccountId) ||
-                                        (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
+			return context.CashWithdrawals
+					.Include(x => x.Cashier)
+					.Include(x => x.Debiting)
+					.Include(x => x.Account)
+					.FirstOrDefault(x => (!(model.AccountId < 0) && x.AccountId == model.AccountId) ||
+										(model.Id.HasValue && x.Id == model.Id))
+					?.GetViewModel;
+		}
 
-        public CashWithdrawalViewModel? Insert(CashWithdrawalBindingModel model)
-        {
-            using var context = new BankDatabase();
+		public CashWithdrawalViewModel? Insert(CashWithdrawalBindingModel model)
+		{
+			using var context = new BankDatabase();
 
-            var newCashWithdrawal = CashWithdrawal.Create(context, model);
+			var newCashWithdrawal = CashWithdrawal.Create(context, model);
 
-            if (newCashWithdrawal == null)
-            {
-                return null;
-            }
+			if (newCashWithdrawal == null)
+			{
+				return null;
+			}
 
-            context.CashWithdrawals.Add(newCashWithdrawal);
-            context.SaveChanges();
+			context.CashWithdrawals.Add(newCashWithdrawal);
+			context.SaveChanges();
 
-            return newCashWithdrawal.GetViewModel;
-        }
+			return newCashWithdrawal.GetViewModel;
+		}
 
-        public CashWithdrawalViewModel? Update(CashWithdrawalBindingModel model)
-        {
-            using var context = new BankDatabase();
-            using var transaction = context.Database.BeginTransaction();
+		public CashWithdrawalViewModel? Update(CashWithdrawalBindingModel model)
+		{
+			using var context = new BankDatabase();
+			using var transaction = context.Database.BeginTransaction();
 
-            try
-            {
-                var cashWithdrawal = context.CashWithdrawals.FirstOrDefault(rec => rec.Id == model.Id);
+			try
+			{
+				var cashWithdrawal = context.CashWithdrawals.FirstOrDefault(rec => rec.Id == model.Id);
 
-                if (cashWithdrawal == null)
-                {
-                    return null;
-                }
+				if (cashWithdrawal == null)
+				{
+					return null;
+				}
 
-                cashWithdrawal.Update(model);
-                context.SaveChanges();
-                transaction.Commit();
+				cashWithdrawal.Update(model);
+				context.SaveChanges();
+				transaction.Commit();
 
-                return cashWithdrawal.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
+				return cashWithdrawal.GetViewModel;
+			}
+			catch
+			{
+				transaction.Rollback();
+				throw;
+			}
+		}
 
-        public CashWithdrawalViewModel? Delete(CashWithdrawalBindingModel model)
-        {
-            using var context = new BankDatabase();
+		public CashWithdrawalViewModel? Delete(CashWithdrawalBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var element = context.CashWithdrawals
+				.Include(x => x.AccountId)
+				.FirstOrDefault(rec => rec.Id == model.Id);
 
-            var element = context.CashWithdrawals
-                .Include(x => x.AccountId)
-                .FirstOrDefault(rec => rec.Id == model.Id);
+			if (element != null)
+			{
+				context.CashWithdrawals.Remove(element);
+				context.SaveChanges();
 
-            if (element != null)
-            {
-                context.CashWithdrawals.Remove(element);
-                context.SaveChanges();
+				return element.GetViewModel;
+			}
 
-                return element.GetViewModel;
-            }
-
-            return null;
-        }
-    }
+			return null;
+		}
+	}
 }
diff --git a/Bank/BankDatabaseImplement/Implements/CashierImplements/CashierStorage.cs b/Bank/BankDatabaseImplement/Implements/CashierImplements/CashierStorage.cs
index 0ec9a4f..56cca08 100644
--- a/Bank/BankDatabaseImplement/Implements/CashierImplements/CashierStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/CashierImplements/CashierStorage.cs
@@ -1,106 +1,99 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.StoragesModels.Cashier;
+using BankContracts.StoragesContracts.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankDatabaseImplement.Models.CashierModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Implements.CashierImplements
 {
-	// Реализация интерфейса хранилища для сущности "Кассир"
-	public class CashierStorage : ICashierStorage
-    {
-        public List<CashierViewModel> GetFullList()
-        {
-            using var context = new BankDatabase();
+    public class CashierStorage : ICashierStorage
+	{
+		public List<CashierViewModel> GetFullList()
+		{
+			using var context = new BankDatabase();
 
-            return context.Cashiers
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
+			return context.Cashiers
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
 
-        public List<CashierViewModel> GetFilteredList(CashierSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Email))
-            {
-                return new();
-            }
+		public List<CashierViewModel> GetFilteredList(CashierSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.Email))
+			{
+				return new();
+			}
 
-            using var context = new BankDatabase();
+			using var context = new BankDatabase();
 
-            return context.Cashiers
-                    .Where(x => x.Email.Contains(model.Email))
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
+			return context.Cashiers
+					.Where(x => x.Email.Contains(model.Email))
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
 
-        public CashierViewModel? GetElement(CashierSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
-            {
-                return null;
-            }
+		public CashierViewModel? GetElement(CashierSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
+			{
+				return null;
+			}
 
-            using var context = new BankDatabase();
+			using var context = new BankDatabase();
 
-            return context.Cashiers
-                    .FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email) ||
-                                        (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
+			return context.Cashiers
+					.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email) ||
+										(model.Id.HasValue && x.Id == model.Id))
+					?.GetViewModel;
+		}
 
-        public CashierViewModel? Insert(CashierBindingModel model)
-        {
-            using var context = new BankDatabase();
+		public CashierViewModel? Insert(CashierBindingModel model)
+		{
+			using var context = new BankDatabase();
 
-            var newCashier = Cashier.Create(context, model);
+			var newCashier = Cashier.Create(context, model);
 
-            if (newCashier == null)
-            {
-                return null;
-            }
+			if (newCashier == null)
+			{
+				return null;
+			}
 
-            context.Cashiers.Add(newCashier);
-            context.SaveChanges();
+			context.Cashiers.Add(newCashier);
+			context.SaveChanges();
 
-            return newCashier.GetViewModel;
-        }
+			return newCashier.GetViewModel;
+		}
 
-        public CashierViewModel? Update(CashierBindingModel model)
-        {
-            using var context = new BankDatabase();
+		public CashierViewModel? Update(CashierBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var cashier = context.Cashiers.FirstOrDefault(x => x.Id == model.Id);
 
-            var cashier = context.Cashiers.FirstOrDefault(x => x.Id == model.Id);
+			if (cashier == null)
+			{
+				return null;
+			}
 
-            if (cashier == null)
-            {
-                return null;
-            }
+			cashier.Update(model);
+			context.SaveChanges();
 
-            cashier.Update(model);
-            context.SaveChanges();
+			return cashier.GetViewModel;
+		}
 
-            return cashier.GetViewModel;
-        }
+		public CashierViewModel? Delete(CashierBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var element = context.Cashiers.FirstOrDefault(rec => rec.Id == model.Id);
 
-        public CashierViewModel? Delete(CashierBindingModel model)
-        {
-            using var context = new BankDatabase();
+			if (element != null)
+			{
+				context.Cashiers.Remove(element);
+				context.SaveChanges();
 
-            var element = context.Cashiers.FirstOrDefault(rec => rec.Id == model.Id);
+				return element.GetViewModel;
+			}
 
-            if (element != null)
-            {
-                context.Cashiers.Remove(element);
-                context.SaveChanges();
-
-                return element.GetViewModel;
-            }
-
-            return null;
-        }
-    }
+			return null;
+		}
+	}
 }
diff --git a/Bank/BankDatabaseImplement/Implements/CashierImplements/MoneyTransferStorage.cs b/Bank/BankDatabaseImplement/Implements/CashierImplements/MoneyTransferStorage.cs
index 5e2c13e..b5b6f76 100644
--- a/Bank/BankDatabaseImplement/Implements/CashierImplements/MoneyTransferStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/CashierImplements/MoneyTransferStorage.cs
@@ -1,148 +1,142 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.SearchModels.Cashier;
-using BankContracts.StoragesModels.Cashier;
+using BankContracts.StoragesContracts.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankDatabaseImplement.Models.CashierModels;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Implements.CashierImplements
 {
-	// Реализация интерфейса хранилища для сущности "Перевод денег"
-	public class MoneyTransferStorage : IMoneyTransferStorage
-    {
-        public List<MoneyTransferViewModel> GetFullList()
-        {
+    public class MoneyTransferStorage : IMoneyTransferStorage
+	{
+		public List<MoneyTransferViewModel> GetFullList()
+		{
+			using var context = new BankDatabase();
+
+			return context.MoneyTransfers
+					.Include(x => x.AccountPayeer)
+					.Include(x => x.AccountSender)
+					.Include(x => x.Cashier)
+					.Select(x => x.GetViewModel)
+					.ToList();
+		}
+
+		public List<MoneyTransferViewModel> GetFilteredList(MoneyTransferSearchModel model)
+		{
             using var context = new BankDatabase();
-
-            return context.MoneyTransfers
-                    .Include(x => x.AccountPayeer)
-                    .Include(x => x.AccountSender)
-                    .Include(x => x.Cashier)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-        }
-
-        public List<MoneyTransferViewModel> GetFilteredList(MoneyTransferSearchModel model)
-        {
-            using var context = new BankDatabase();
-
             var result = context.MoneyTransfers.Include(x => x.Cashier)
                     .Include(x => x.AccountPayeer)
                     .Include(x => x.AccountSender)
                     .ToList();
 
-            if (model.AccountPayeeId.HasValue && model.AccountSenderId.HasValue && model.AccountPayeeId == model.AccountSenderId)
-            {
-                return result.Where(x => (x.AccountSenderId == model.AccountSenderId || x.AccountPayeeId == model.AccountPayeeId)
-                        && x.AccountSender != null)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-            }
+			if (model.AccountPayeeId.HasValue && model.AccountSenderId.HasValue && model.AccountPayeeId == model.AccountSenderId)
+			{
+				return result.Where(x => (x.AccountSenderId == model.AccountSenderId || x.AccountPayeeId == model.AccountPayeeId)
+						&& x.AccountSender != null)
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
 
-            if (model.AccountPayeeId.HasValue) result = result.Where(x => x.AccountPayeeId == model.AccountPayeeId).ToList();
+			if (model.AccountPayeeId.HasValue) result = result.Where(x => x.AccountPayeeId == model.AccountPayeeId).ToList();
 
             if (model.AccountSenderId.HasValue) result = result.Where(x => x.AccountSenderId == model.AccountSenderId).ToList();
 
             if (model.CashierId.HasValue) result = result.Where(x => x.CashierId == model.CashierId).ToList();
 
-            if (model.DateTransfer.HasValue) result = result.Where(x => x.DateTransfer >= model.DateTransfer).ToList();
+            if (model.DateFrom.HasValue) result = result.Where(x => x.DateOperation >= model.DateFrom).ToList();
 
-            if (model.ClientId.HasValue)
-            {
-                result = result.Where(x => x.AccountSender != null)
-                    .Where(x => (x.AccountPayeer.ClientId == model.ClientId || x.AccountSender.ClientId == model.ClientId))
-                    .ToList();
-            }
+            if (model.DateTo.HasValue) result = result.Where(x => x.DateOperation <= model.DateTo).ToList();
 
-            return result.Select(x => x.GetViewModel).ToList();
+			if (model.ClientId.HasValue)
+			{
+				result = result.Where(x => x.AccountSender != null)
+					.Where(x => (x.AccountPayeer.ClientId == model.ClientId || x.AccountSender.ClientId == model.ClientId))
+					.ToList();
+			}
+
+			return result.Select(x => x.GetViewModel).ToList();
         }
 
-        public MoneyTransferViewModel? GetElement(MoneyTransferSearchModel model)
-        {
-            if (model.AccountSenderId < 0 && !model.Id.HasValue)
-            {
-                return null;
-            }
+		public MoneyTransferViewModel? GetElement(MoneyTransferSearchModel model)
+		{
+			if (model.AccountSenderId < 0 && !model.Id.HasValue)
+			{
+				return null;
+			}
 
-            using var context = new BankDatabase();
+			using var context = new BankDatabase();
 
-            return context.MoneyTransfers
-                    .Include(x => x.AccountPayeer)
-                    .Include(x => x.AccountSender)
-                    .Include(x => x.Cashier)
-                    .FirstOrDefault(x => x.Id == model.Id)
-                    ?.GetViewModel;
-        }
+			return context.MoneyTransfers
+					.Include(x => x.AccountPayeer)
+					.Include(x => x.AccountSender)
+					.Include(x => x.Cashier)
+					.FirstOrDefault(x => x.Id == model.Id)
+					?.GetViewModel;
+		}
 
-        public MoneyTransferViewModel? Insert(MoneyTransferBindingModel model)
-        {
-            using var context = new BankDatabase();
+		public MoneyTransferViewModel? Insert(MoneyTransferBindingModel model)
+		{
+			using var context = new BankDatabase();
 
-            var newMoneyTransfer = MoneyTransfer.Create(context, model);
+			var newMoneyTransfer = MoneyTransfer.Create(context, model);
 
-            if (newMoneyTransfer == null)
-            {
-                return null;
-            }
+			if (newMoneyTransfer == null)
+			{
+				return null;
+			}
 
-            context.MoneyTransfers.Add(newMoneyTransfer);
-            context.SaveChanges();
+			context.MoneyTransfers.Add(newMoneyTransfer);
+			context.SaveChanges();
 
-            return newMoneyTransfer.GetViewModel;
-        }
+			return newMoneyTransfer.GetViewModel;
+		}
 
-        public MoneyTransferViewModel? Update(MoneyTransferBindingModel model)
-        {
-            using var context = new BankDatabase();
-            using var transaction = context.Database.BeginTransaction();
+		public MoneyTransferViewModel? Update(MoneyTransferBindingModel model)
+		{
+			using var context = new BankDatabase();
+			using var transaction = context.Database.BeginTransaction();
 
-            try
-            {
-                var moneyTransfer = context.MoneyTransfers.FirstOrDefault(rec => rec.Id == model.Id);
+			try
+			{
+				var moneyTransfer = context.MoneyTransfers.FirstOrDefault(rec => rec.Id == model.Id);
 
-                if (moneyTransfer == null)
-                {
-                    return null;
-                }
+				if (moneyTransfer == null)
+				{
+					return null;
+				}
 
-                moneyTransfer.Update(model);
-                context.SaveChanges();
-                transaction.Commit();
+				moneyTransfer.Update(model);
+				context.SaveChanges();
+				transaction.Commit();
 
-                return moneyTransfer.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
+				return moneyTransfer.GetViewModel;
+			}
+			catch
+			{
+				transaction.Rollback();
+				throw;
+			}
+		}
 
-        public MoneyTransferViewModel? Delete(MoneyTransferBindingModel model)
-        {
-            using var context = new BankDatabase();
+		public MoneyTransferViewModel? Delete(MoneyTransferBindingModel model)
+		{
+			using var context = new BankDatabase();
+			var element = context.MoneyTransfers
+				.Include(x => x.AccountPayeeId)
+				.Include(x => x.AccountSenderId)
+				.Include(x => x.Sum)
+				.Include(x => x.DateOperation)
+				.FirstOrDefault(rec => rec.Id == model.Id);
 
-            var element = context.MoneyTransfers
-                .Include(x => x.AccountPayeeId)
-                .Include(x => x.AccountSenderId)
-                .Include(x => x.Sum)
-                .Include(x => x.DateTransfer)
-                .FirstOrDefault(rec => rec.Id == model.Id);
+			if (element != null)
+			{
+				context.MoneyTransfers.Remove(element);
+				context.SaveChanges();
 
-            if (element != null)
-            {
-                context.MoneyTransfers.Remove(element);
-                context.SaveChanges();
+				return element.GetViewModel;
+			}
 
-                return element.GetViewModel;
-            }
-
-            return null;
-        }
-    }
+			return null;
+		}
+	}
 }
diff --git a/Bank/BankDatabaseImplement/Implements/ClientImplements/CardStorage.cs b/Bank/BankDatabaseImplement/Implements/ClientImplements/CardStorage.cs
index 800803d..6e9fdf9 100644
--- a/Bank/BankDatabaseImplement/Implements/ClientImplements/CardStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/ClientImplements/CardStorage.cs
@@ -1,46 +1,54 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Client;
 using BankContracts.ViewModels.Client.ViewModels;
 using BankDatabaseImplement.Models.ClientModels;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankDatabaseImplement.Implements.ClientImplements
+namespace BankDatabaseImplement.Implements
 {
-	// Реализация интерфейса хранилища для сущности "Банковская карта"
-	public class CardStorage : ICardStorage
+    public class CardStorage : ICardStorage
 	{
-		public CardViewModel? GetElement(CardSearchModel model)
-		{
-			if (string.IsNullOrEmpty(model.Number) && !model.Id.HasValue)
-			{
-				return null;
-			}
+        public CardViewModel? Delete(CardBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var element = context.Cards.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Cards.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
 
-			using var context = new BankDatabase();
+        public CardViewModel? GetElement(CardSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Number) && !model.Id.HasValue)
+            {
+                return null;
+            }
 
-			return context.Cards
-					.Include(x => x.Client)
-					.Include(x => x.Account)
+            using var context = new BankDatabase();
+
+            return context.Cards
+				    .Include(x => x.Client)
+                    .Include(x => x.Account)
 					.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Number) && x.Number == model.Number) ||
-										(model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-		}
+                                        (model.Id.HasValue && x.Id == model.Id))
+                    ?.GetViewModel;
+        }
 
-		public List<CardViewModel> GetFilteredList(CardSearchModel model)
-		{
-			using var context = new BankDatabase();
+        public List<CardViewModel> GetFilteredList(CardSearchModel model)
+        {
+            using var context = new BankDatabase();
 
-			if (!string.IsNullOrEmpty(model.Number))
-			{
+            if (!string.IsNullOrEmpty(model.Number))
+            {
 				return context.Cards
-					.Include(x => x.Client)
-					.Include(x => x.Account)
-					.Where(x => x.Number.Contains(model.Number))
+                    .Include(x => x.Client)
+                    .Include(x => x.Account)
+                    .Where(x => x.Number.Contains(model.Number))
 					.Select(x => x.GetViewModel)
 					.ToList();
 			}
@@ -49,8 +57,8 @@ namespace BankDatabaseImplement.Implements.ClientImplements
 			{
 				return context.Cards
 					.Include(x => x.Client)
-					.Include(x => x.Account)
-					.Where(x => x.ClientId == model.ClientID)
+                    .Include(x => x.Account)
+                    .Where(x => x.ClientID == model.ClientID)
 					.Select(x => x.GetViewModel)
 					.ToList();
 			}
@@ -59,87 +67,72 @@ namespace BankDatabaseImplement.Implements.ClientImplements
 			{
 				return context.Cards
 					.Include(x => x.Client)
-					.Include(x => x.Account)
-					.Where(x => x.AccountId == model.AccountId)
+                    .Include(x => x.Account)
+                    .Where(x => x.AccountId == model.AccountId)
 					.Select(x => x.GetViewModel)
 					.ToList();
 			}
 
 			return context.Cards
-					.Include(x => x.Client)
-					.Include(x => x.Account)
-					.Select(x => x.GetViewModel)
-					.ToList();
-		}
+				    .Include(x => x.Client)
+                    .Include(x => x.Account)
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
 
-		public List<CardViewModel> GetFullList()
-		{
-			using var context = new BankDatabase();
+        public List<CardViewModel> GetFullList()
+        {
+            using var context = new BankDatabase();
 
-			return context.Cards
-					.Include(x => x.Client)
-					.Include(x => x.Account)
-					.Select(x => x.GetViewModel)
-					.ToList();
-		}
+            return context.Cards
+				    .Include(x => x.Client)
+                    .Include(x => x.Account)
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+        }
 
-		public CardViewModel? Insert(CardBindingModel model)
-		{
-			using var context = new BankDatabase();
+        public CardViewModel? Insert(CardBindingModel model)
+        {
+            using var context = new BankDatabase();
 
-			var newCard = Card.Create(context, model);
+            var newCard = Card.Create(context, model);
 
-			if (newCard == null)
-			{
-				return null;
-			}
+            if (newCard == null)
+            {
+                return null;
+            }
 
-			context.Cards.Add(newCard);
-			context.SaveChanges();
+            context.Cards.Add(newCard);
+            context.SaveChanges();
 
-			return newCard.GetViewModel;
-		}
+            return newCard.GetViewModel;
+        }
 
-		public CardViewModel? Update(CardBindingModel model)
-		{
-			using var context = new BankDatabase();
-			using var transaction = context.Database.BeginTransaction();
+        public CardViewModel? Update(CardBindingModel model)
+        {
+            using var context = new BankDatabase();
+            using var transaction = context.Database.BeginTransaction();
 
-			try
-			{
-				var card = context.Cards.FirstOrDefault(rec => rec.Id == model.Id);
+            try
+            {
+                var card = context.Cards.FirstOrDefault(rec => rec.Id == model.Id);
 
-				if (card == null)
-				{
-					return null;
-				}
+                if (card == null)
+                {
+                    return null;
+                }
 
-				card.Update(model);
-				context.SaveChanges();
-				transaction.Commit();
+                card.Update(model);
+                context.SaveChanges();
+                transaction.Commit();
 
-				return card.GetViewModel;
-			}
-			catch
-			{
-				transaction.Rollback();
-				throw;
-			}
-		}
-
-		public CardViewModel? Delete(CardBindingModel model)
-		{
-			using var context = new BankDatabase();
-			var element = context.Cards.FirstOrDefault(rec => rec.Id == model.Id);
-
-			if (element != null)
-			{
-				context.Cards.Remove(element);
-				context.SaveChanges();
-				return element.GetViewModel;
-			}
-
-			return null;
-		}
-	}
+                return card.GetViewModel;
+            }
+            catch
+            {
+                transaction.Rollback();
+                throw;
+            }
+        }
+    }
 }
diff --git a/Bank/BankDatabaseImplement/Implements/ClientImplements/ClientStorage.cs b/Bank/BankDatabaseImplement/Implements/ClientImplements/ClientStorage.cs
index 64a7f92..4e8a9f9 100644
--- a/Bank/BankDatabaseImplement/Implements/ClientImplements/ClientStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/ClientImplements/ClientStorage.cs
@@ -1,19 +1,26 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Client;
 using BankContracts.ViewModels.Client.ViewModels;
 using BankDatabaseImplement.Models.ClientModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Implements.ClientImplements
 {
-	// Реализация интерфейса хранилища для сущности "Клиент"
-	public class ClientStorage : IClientStorage
-    {
+    public class ClientStorage : IClientStorage
+	{
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            using var context = new BankDatabase();
+            var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id);
+            if (element != null)
+            {
+                context.Clients.Remove(element);
+                context.SaveChanges();
+                return element.GetViewModel;
+            }
+            return null;
+        }
+
         public ClientViewModel? GetElement(ClientSearchModel model)
         {
             if (string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue)
@@ -23,14 +30,16 @@ namespace BankDatabaseImplement.Implements.ClientImplements
 
             using var context = new BankDatabase();
 
-            // Для поиска почты для отправки файла
-            if (model.Id.HasValue && string.IsNullOrEmpty(model.Password))
+            //сработает для поиска почты для отправки файла
+            if(model.Id.HasValue && string.IsNullOrEmpty(model.Password))
             {
                 return context.Clients.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
             }
 
-            return context.Clients.FirstOrDefault(x => (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email 
-            && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+            return context.Clients.FirstOrDefault(x =>
+            (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) ||
+            (model.Id.HasValue && x.Id == model.Id))
+                ?.GetViewModel;
         }
 
         public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
@@ -39,7 +48,6 @@ namespace BankDatabaseImplement.Implements.ClientImplements
             {
                 return new();
             }
-
             using var context = new BankDatabase();
             return context.Clients.Where(x => x.Name.Contains(model.Name)).Select(x => x.GetViewModel).ToList();
         }
@@ -47,21 +55,17 @@ namespace BankDatabaseImplement.Implements.ClientImplements
         public List<ClientViewModel> GetFullList()
         {
             using var context = new BankDatabase();
-
             return context.Clients.Select(x => x.GetViewModel).ToList();
         }
 
         public ClientViewModel? Insert(ClientBindingModel model)
         {
             var newComponent = Client.Create(model);
-            
             if (newComponent == null)
             {
                 return null;
             }
-
             using var context = new BankDatabase();
-            
             context.Clients.Add(newComponent);
             context.SaveChanges();
             return newComponent.GetViewModel;
@@ -70,33 +74,14 @@ namespace BankDatabaseImplement.Implements.ClientImplements
         public ClientViewModel? Update(ClientBindingModel model)
         {
             using var context = new BankDatabase();
-            
             var component = context.Clients.FirstOrDefault(x => x.Id == model.Id);
-            
             if (component == null)
             {
                 return null;
             }
-            
             component.Update(model);
             context.SaveChanges();
             return component.GetViewModel;
         }
-
-		public ClientViewModel? Delete(ClientBindingModel model)
-		{
-			using var context = new BankDatabase();
-			
-            var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id);
-			
-            if (element != null)
-			{
-				context.Clients.Remove(element);
-				context.SaveChanges();
-				return element.GetViewModel;
-			}
-
-			return null;
-		}
-	}
+    }
 }
diff --git a/Bank/BankDatabaseImplement/Implements/ClientImplements/CreditingStorage.cs b/Bank/BankDatabaseImplement/Implements/ClientImplements/CreditingStorage.cs
index aac594d..9fe99ce 100644
--- a/Bank/BankDatabaseImplement/Implements/ClientImplements/CreditingStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/ClientImplements/CreditingStorage.cs
@@ -1,55 +1,16 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using BankDatabaseImplement.Models.ClientModels;
+using BankDatabaseImplement.Models;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Implements.ClientImplements
 {
-	// Реализация интерфейса хранилища для сущности "Пополнение карты"
-	public class CreditingStorage : ICreditingStorage
+    public class CreditingStorage : ICreditingStorage
     {
-		public CreditingViewModel? GetElement(CreditingSearchModel model)
-		{
-			if (model.CardId < 0 && !model.Id.HasValue)
-			{
-				return null;
-			}
 
-			using var context = new BankDatabase();
-
-			return context.Creditings
-					.Include(x => x.Card)
-					.FirstOrDefault(x => x.Id == model.Id)
-					?.GetViewModel;
-		}
-
-		public List<CreditingViewModel> GetFilteredList(CreditingSearchModel model)
-		{
-			using var context = new BankDatabase();
-
-			var result = context.Creditings.Include(x => x.Card).ToList();
-
-			if (model.CardId.HasValue) result = result.Where(x => x.CardId == model.CardId).ToList();
-
-			if (model.ClientId.HasValue)
-			{
-				List<int> cards = context.Cards.Where(x => x.ClientId == model.ClientId).Select(x => x.Id).ToList();
-				result = result.Where(x => cards.Contains(x.CardId)).ToList();
-			}
-
-			if (model.DateCrediting.HasValue) result = result.Where(x => x.DateCredit >= model.DateCrediting).ToList();
-
-			return result.Select(x => x.GetViewModel).ToList();
-		}
-
-		public List<CreditingViewModel> GetFullList()
+        public List<CreditingViewModel> GetFullList()
         {
             using var context = new BankDatabase();
 
@@ -57,7 +18,45 @@ namespace BankDatabaseImplement.Implements.ClientImplements
                     .Include(x => x.Card)
                     .Select(x => x.GetViewModel)
                     .ToList();
-        } 
+        }
+
+        public List<CreditingViewModel> GetFilteredList(CreditingSearchModel model)
+        {
+            using var context = new BankDatabase();
+            var result = context.Creditings.Include(x => x.Card).ToList();
+
+            if (model.Status.HasValue) result = result.Where(x => x.Status == model.Status).ToList();
+
+            if (model.CardId.HasValue) result = result.Where(x => x.CardId == model.CardId).ToList();
+
+            if (model.UserId.HasValue)
+            {
+                List<int> cards = context.Cards.Where(x => x.ClientID == model.UserId).Select(x => x.Id).ToList();
+                result = result.Where(x => cards.Contains(x.CardId)).ToList();
+            }
+            
+            if (model.DateFrom.HasValue && model.DateTo.HasValue)
+            {
+				result = result.Where(x => x.DateOpen >= model.DateFrom && x.DateClose <= model.DateTo).ToList();	
+			}
+
+            return result.Select(x => x.GetViewModel).ToList();
+        }
+
+        public CreditingViewModel? GetElement(CreditingSearchModel model)
+        {
+            if (model.CardId < 0 && !model.Id.HasValue)
+            {
+                return null;
+            }
+
+            using var context = new BankDatabase();
+
+            return context.Creditings
+				    .Include(x => x.Card)
+					.FirstOrDefault(x => x.Id == model.Id)
+                    ?.GetViewModel;
+        }
 
         public CreditingViewModel? Insert(CreditingBindingModel model)
         {
@@ -79,7 +78,6 @@ namespace BankDatabaseImplement.Implements.ClientImplements
         public CreditingViewModel? Update(CreditingBindingModel model)
         {
             using var context = new BankDatabase();
-
             using var transaction = context.Database.BeginTransaction();
 
             try
@@ -96,10 +94,10 @@ namespace BankDatabaseImplement.Implements.ClientImplements
                 transaction.Commit();
 
                 return context.Creditings
-                    .Include(x => x.Card)
-                    .FirstOrDefault(x => x.Id == model.Id)
-                    ?.GetViewModel;
-            }
+					.Include(x => x.Card)
+					.FirstOrDefault(x => x.Id == model.Id)
+					?.GetViewModel;
+			}
             catch
             {
                 transaction.Rollback();
@@ -110,7 +108,6 @@ namespace BankDatabaseImplement.Implements.ClientImplements
         public CreditingViewModel? Delete(CreditingBindingModel model)
         {
             using var context = new BankDatabase();
-
             var element = context.Creditings
                 .Include(x => x.CardId)
                 .FirstOrDefault(rec => rec.Id == model.Id);
diff --git a/Bank/BankDatabaseImplement/Implements/ClientImplements/DebitingStorage.cs b/Bank/BankDatabaseImplement/Implements/ClientImplements/DebitingStorage.cs
index 54a8ee1..da2b920 100644
--- a/Bank/BankDatabaseImplement/Implements/ClientImplements/DebitingStorage.cs
+++ b/Bank/BankDatabaseImplement/Implements/ClientImplements/DebitingStorage.cs
@@ -1,56 +1,17 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.SearchModels.Client;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Client;
 using BankContracts.ViewModels.Client.ViewModels;
-using BankDatabaseImplement.Models.ClientModels;
+using BankDatabaseImplement.Models;
+using BankDataModels.Enums;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Implements.ClientImplements
 {
-	// Реализация интерфейса хранилища для сущности "Снятие с карты"
-	public class DebitingStorage : IDebitingStorage
+    public class DebitingStorage : IDebitingStorage
     {
-		public DebitingViewModel? GetElement(DebitingSearchModel model)
-		{
-			if (model.CardId < 0 && !model.Id.HasValue)
-			{
-				return null;
-			}
 
-			using var context = new BankDatabase();
-
-			return context.Debitings
-					.Include(x => x.Card)
-					.FirstOrDefault(x => (!(model.CardId < 0) && x.CardId == model.CardId) ||
-										(model.Id.HasValue && x.Id == model.Id))
-					?.GetViewModel;
-		}
-
-		public List<DebitingViewModel> GetFilteredList(DebitingSearchModel model)
-		{
-			using var context = new BankDatabase();
-
-			var result = context.Debitings.Include(x => x.Card).ToList();
-
-			// Для получения всех заявок на стнятие 
-
-			if (model.CardId.HasValue) result = result.Where(x => x.CardId == model.CardId).ToList();
-
-			if (model.ClientId.HasValue)
-			{
-				List<int> cards = context.Cards.Where(x => x.ClientId == model.ClientId).Select(x => x.Id).ToList();
-				result = result.Where(x => cards.Contains(x.CardId)).ToList();
-			}
-
-			return result.Select(x => x.GetViewModel).ToList();
-		}
-
-		public List<DebitingViewModel> GetFullList()
+        public List<DebitingViewModel> GetFullList()
         {
             using var context = new BankDatabase();
 
@@ -60,6 +21,46 @@ namespace BankDatabaseImplement.Implements.ClientImplements
                     .ToList();
         }
 
+        public List<DebitingViewModel> GetFilteredList(DebitingSearchModel model)
+        {
+            using var context = new BankDatabase();
+
+            var result = context.Debitings.Include(x => x.Card).ToList();
+                    
+            //для получения всех заявок на стнятие со статусом "Открыта"
+            if (model.Status.HasValue) result = result.Where(x => x.Status == model.Status).ToList();
+
+            if (model.CardId.HasValue) result = result.Where(x => x.CardId == model.CardId).ToList();
+
+            if (model.UserId.HasValue) { 
+                List<int> cards = context.Cards.Where(x => x.ClientID == model.UserId).Select(x => x.Id).ToList();
+                result = result.Where(x => cards.Contains(x.CardId)).ToList();
+            }
+
+			if (model.DateFrom.HasValue && model.DateTo.HasValue)
+			{
+				result = result.Where(x => x.DateOpen <= model.DateFrom && x.DateClose >= model.DateTo && x.Status != StatusEnum.Отклонено).ToList();
+            }
+
+            return result.Select(x => x.GetViewModel).ToList();
+        }
+
+        public DebitingViewModel? GetElement(DebitingSearchModel model)
+        {
+            if (model.CardId < 0 && !model.Id.HasValue)
+            {
+                return null;
+            }
+
+            using var context = new BankDatabase();
+
+            return context.Debitings
+				    .Include(x => x.Card)
+					.FirstOrDefault(x => (!(model.CardId < 0) && x.CardId == model.CardId) ||
+                                        (model.Id.HasValue && x.Id == model.Id))
+                    ?.GetViewModel;
+        }
+
         public DebitingViewModel? Insert(DebitingBindingModel model)
         {
             using var context = new BankDatabase();
@@ -86,15 +87,20 @@ namespace BankDatabaseImplement.Implements.ClientImplements
             {
                 var debiting = context.Debitings.FirstOrDefault(rec => rec.Id == model.Id);
 
+                if (debiting == null && debiting.Status == StatusEnum.Закрыта)
+                {
+                    return null;
+                }
+
                 debiting.Update(model);
                 context.SaveChanges();
                 transaction.Commit();
 
                 return context.Debitings
-                    .Include(x => x.Card)
-                    .FirstOrDefault(x => x.Id == model.Id)
-                    ?.GetViewModel;
-            }
+					.Include(x => x.Card)
+					.FirstOrDefault(x => x.Id == model.Id)
+					?.GetViewModel;
+			}
             catch
             {
                 transaction.Rollback();
diff --git a/Bank/BankDatabaseImplement/Migrations/20230516171124_NewTransferAndCrediting.Designer.cs b/Bank/BankDatabaseImplement/Migrations/20230516171124_NewTransferAndCrediting.Designer.cs
new file mode 100644
index 0000000..af0b33e
--- /dev/null
+++ b/Bank/BankDatabaseImplement/Migrations/20230516171124_NewTransferAndCrediting.Designer.cs
@@ -0,0 +1,449 @@
+// <auto-generated />
+using System;
+using BankDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BankDatabaseImplement.Migrations
+{
+    [DbContext(typeof(BankDatabase))]
+    [Migration("20230516171124_NewTransferAndCrediting")]
+    partial class NewTransferAndCrediting
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AccountNumber")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Balance")
+                        .HasColumnType("float");
+
+                    b.Property<int>("CashierId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("PasswordAccount")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CashierId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Accounts");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccountId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("CVC")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ClientID")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("Period")
+                        .HasColumnType("datetime2");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("ClientID");
+
+                    b.ToTable("Cards");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.CashWithdrawal", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccountId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("CashierId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateOperation")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("DebitingId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("CashierId");
+
+                    b.HasIndex("DebitingId");
+
+                    b.ToTable("CashWithdrawals");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Cashier", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Patronymic")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Telephone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Cashiers");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Patronymic")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Telephone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CardId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DateClose")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardId");
+
+                    b.ToTable("Creditings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Debiting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CardId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DateClose")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardId");
+
+                    b.ToTable("Debitings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.MoneyTransfer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccountPayeeId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("AccountPayeerId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("AccountSenderId")
+                        .IsRequired()
+                        .HasColumnType("int");
+
+                    b.Property<int>("CashierId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("CreditingId")
+                        .IsRequired()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateOperation")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountPayeerId");
+
+                    b.HasIndex("AccountSenderId");
+
+                    b.HasIndex("CashierId");
+
+                    b.ToTable("MoneyTransfers");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", null)
+                        .WithMany("Accounts")
+                        .HasForeignKey("CashierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", null)
+                        .WithMany("Cards")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Cards")
+                        .HasForeignKey("ClientID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.CashWithdrawal", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "Account")
+                        .WithMany("CashWithdrawals")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", "Cashier")
+                        .WithMany("CashWithdrawals")
+                        .HasForeignKey("CashierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Debiting", "Debiting")
+                        .WithMany()
+                        .HasForeignKey("DebitingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Account");
+
+                    b.Navigation("Cashier");
+
+                    b.Navigation("Debiting");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Card", "Card")
+                        .WithMany("Creditings")
+                        .HasForeignKey("CardId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Card");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Debiting", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Card", "Card")
+                        .WithMany("Debitings")
+                        .HasForeignKey("CardId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Card");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.MoneyTransfer", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "AccountPayeer")
+                        .WithMany()
+                        .HasForeignKey("AccountPayeerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "AccountSender")
+                        .WithMany()
+                        .HasForeignKey("AccountSenderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", "Cashier")
+                        .WithMany("MoneyTransfers")
+                        .HasForeignKey("CashierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AccountPayeer");
+
+                    b.Navigation("AccountSender");
+
+                    b.Navigation("Cashier");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
+                {
+                    b.Navigation("Cards");
+
+                    b.Navigation("CashWithdrawals");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.Navigation("Creditings");
+
+                    b.Navigation("Debitings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Cashier", b =>
+                {
+                    b.Navigation("Accounts");
+
+                    b.Navigation("CashWithdrawals");
+
+                    b.Navigation("MoneyTransfers");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Cards");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Bank/BankDatabaseImplement/Migrations/20230516171124_NewTransferAndCrediting.cs b/Bank/BankDatabaseImplement/Migrations/20230516171124_NewTransferAndCrediting.cs
index 6d137ed..6d75850 100644
--- a/Bank/BankDatabaseImplement/Migrations/20230516171124_NewTransferAndCrediting.cs
+++ b/Bank/BankDatabaseImplement/Migrations/20230516171124_NewTransferAndCrediting.cs
@@ -1,15 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankDatabaseImplement.Migrations
-{
-    using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
+namespace BankDatabaseImplement.Migrations
+{
     /// <inheritdoc />
     public partial class NewTransferAndCrediting : Migration
     {
@@ -17,307 +12,305 @@ namespace BankDatabaseImplement.Migrations
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.CreateTable(
-            name: "Cashiers",
-            columns: table => new
-            {
-                Id = table.Column<int>(type: "int", nullable: false)
-            .Annotation("SqlServer:Identity", "1, 1"),
-                Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Surname = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Patronymic = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                MobilePhone = table.Column<string>(type: "nvarchar(max)", nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_Cashiers", x => x.Id);
-            });
+                name: "Cashiers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Surname = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Patronymic = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Telephone = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Cashiers", x => x.Id);
+                });
 
             migrationBuilder.CreateTable(
-            name: "Clients",
-            columns: table => new
-            {
-                Id = table.Column<int>(type: "int", nullable: false)
-            .Annotation("SqlServer:Identity", "1, 1"),
-                Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Surname = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Patronymic = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                MobilePhone = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Password = table.Column<string>(type: "nvarchar(max)", nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_Clients", x => x.Id);
-            });
+                name: "Clients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Surname = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Patronymic = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Telephone = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Clients", x => x.Id);
+                });
 
             migrationBuilder.CreateTable(
-            name: "Accounts",
-            columns: table => new
-            {
-                Id = table.Column<int>(type: "int", nullable: false)
-            .Annotation("SqlServer:Identity", "1, 1"),
-                AccountNumber = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                CashierId = table.Column<int>(type: "int", nullable: false),
-                ClientId = table.Column<int>(type: "int", nullable: false),
-                PasswordAccount = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Balance = table.Column<double>(type: "float", nullable: false),
-                DateOpen = table.Column<DateTime>(type: "datetime2", nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_Accounts", x => x.Id);
-                table.ForeignKey(
-name: "FK_Accounts_Cashiers_CashierId",
-column: x => x.CashierId,
-principalTable: "Cashiers",
-principalColumn: "Id",
-onDelete: ReferentialAction.Cascade);
-                table.ForeignKey(
-name: "FK_Accounts_Clients_ClientId",
-column: x => x.ClientId,
-principalTable: "Clients",
-principalColumn: "Id",
-onDelete: ReferentialAction.Cascade);
-            });
+                name: "Accounts",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    AccountNumber = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    CashierId = table.Column<int>(type: "int", nullable: false),
+                    ClientId = table.Column<int>(type: "int", nullable: false),
+                    PasswordAccount = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Balance = table.Column<double>(type: "float", nullable: false),
+                    DateOpen = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Accounts", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Accounts_Cashiers_CashierId",
+                        column: x => x.CashierId,
+                        principalTable: "Cashiers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Accounts_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
 
             migrationBuilder.CreateTable(
-            name: "Cards",
-            columns: table => new
-            {
-                Id = table.Column<int>(type: "int", nullable: false)
-            .Annotation("SqlServer:Identity", "1, 1"),
-                ClientID = table.Column<int>(type: "int", nullable: false),
-                AccountId = table.Column<int>(type: "int", nullable: false),
-                Number = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                CVC = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                Period = table.Column<DateTime>(type: "datetime2", nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_Cards", x => x.Id);
-                table.ForeignKey(
-name: "FK_Cards_Accounts_AccountId",
-column: x => x.AccountId,
-principalTable: "Accounts",
-principalColumn: "Id",
-onDelete: ReferentialAction.Cascade);
-                table.ForeignKey(
-name: "FK_Cards_Clients_ClientID",
-column: x => x.ClientID,
-principalTable: "Clients",
-principalColumn: "Id",
-onDelete: ReferentialAction.NoAction);
-            });
+                name: "Cards",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    ClientID = table.Column<int>(type: "int", nullable: false),
+                    AccountId = table.Column<int>(type: "int", nullable: false),
+                    Number = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    CVC = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Period = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Cards", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Cards_Accounts_AccountId",
+                        column: x => x.AccountId,
+                        principalTable: "Accounts",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Cards_Clients_ClientID",
+                        column: x => x.ClientID,
+                        principalTable: "Clients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.NoAction);
+                });
 
             migrationBuilder.CreateTable(
-            name: "MoneyTransfers",
-            columns: table => new
-            {
-                Id = table.Column<int>(type: "int", nullable: false)
-            .Annotation("SqlServer:Identity", "1, 1"),
-                Sum = table.Column<int>(type: "int", nullable: false),
-                AccountSenderId = table.Column<int>(type: "int", nullable: false),
-                AccountPayeeId = table.Column<int>(type: "int", nullable: false),
-                DateOperation = table.Column<DateTime>(type: "datetime2", nullable:
-            false),
-                CreditingId = table.Column<int>(type: "int", nullable: false),
-                CashierId = table.Column<int>(type: "int", nullable: false),
-                AccountPayeerId = table.Column<int>(type: "int", nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_MoneyTransfers", x => x.Id);
-                table.ForeignKey(
-name: "FK_MoneyTransfers_Accounts_AccountPayeerId",
-column: x => x.AccountPayeerId,
-principalTable: "Accounts",
-principalColumn: "Id",
-onDelete: ReferentialAction.Cascade);
-                table.ForeignKey(
-name: "FK_MoneyTransfers_Accounts_AccountSenderId",
-column: x => x.AccountSenderId,
-principalTable: "Accounts",
-principalColumn: "Id",
-onDelete: ReferentialAction.NoAction);
-                table.ForeignKey(
-name: "FK_MoneyTransfers_Cashiers_CashierId",
-column: x => x.CashierId,
-principalTable: "Cashiers",
-principalColumn: "Id",
-onDelete: ReferentialAction.NoAction);
-            });
+                name: "MoneyTransfers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Sum = table.Column<int>(type: "int", nullable: false),
+                    AccountSenderId = table.Column<int>(type: "int", nullable: false),
+                    AccountPayeeId = table.Column<int>(type: "int", nullable: false),
+                    DateOperation = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreditingId = table.Column<int>(type: "int", nullable: false),
+                    CashierId = table.Column<int>(type: "int", nullable: false),
+                    AccountPayeerId = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MoneyTransfers", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_MoneyTransfers_Accounts_AccountPayeerId",
+                        column: x => x.AccountPayeerId,
+                        principalTable: "Accounts",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_MoneyTransfers_Accounts_AccountSenderId",
+                        column: x => x.AccountSenderId,
+                        principalTable: "Accounts",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.NoAction);
+                    table.ForeignKey(
+                        name: "FK_MoneyTransfers_Cashiers_CashierId",
+                        column: x => x.CashierId,
+                        principalTable: "Cashiers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.NoAction);
+                });
 
             migrationBuilder.CreateTable(
-            name: "Creditings",
-            columns: table => new
-            {
-                Id = table.Column<int>(type: "int", nullable: false)
-            .Annotation("SqlServer:Identity", "1, 1"),
-                CardId = table.Column<int>(type: "int", nullable: false),
-                Sum = table.Column<int>(type: "int", nullable: false),
-                DateOpen = table.Column<DateTime>(type: "datetime2", nullable: false),
-                DateClose = table.Column<DateTime>(type: "datetime2", nullable: true),
-                Status = table.Column<int>(type: "int", nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_Creditings", x => x.Id);
-                table.ForeignKey(
-name: "FK_Creditings_Cards_CardId",
-column: x => x.CardId,
-principalTable: "Cards",
-principalColumn: "Id",
-onDelete: ReferentialAction.Cascade);
-            });
+                name: "Creditings",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    CardId = table.Column<int>(type: "int", nullable: false),
+                    Sum = table.Column<int>(type: "int", nullable: false),
+                    DateOpen = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    DateClose = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    Status = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Creditings", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Creditings_Cards_CardId",
+                        column: x => x.CardId,
+                        principalTable: "Cards",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
 
             migrationBuilder.CreateTable(
-            name: "Debitings",
-            columns: table => new
-            {
-                Id = table.Column<int>(type: "int", nullable: false)
-            .Annotation("SqlServer:Identity", "1, 1"),
-                CardId = table.Column<int>(type: "int", nullable: false),
-                Sum = table.Column<int>(type: "int", nullable: false),
-                DateOpen = table.Column<DateTime>(type: "datetime2", nullable: false),
-                DateClose = table.Column<DateTime>(type: "datetime2", nullable: true),
-                Status = table.Column<int>(type: "int", nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_Debitings", x => x.Id);
-                table.ForeignKey(
-name: "FK_Debitings_Cards_CardId",
-column: x => x.CardId,
-principalTable: "Cards",
-principalColumn: "Id",
-onDelete: ReferentialAction.Cascade);
-            });
+                name: "Debitings",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    CardId = table.Column<int>(type: "int", nullable: false),
+                    Sum = table.Column<int>(type: "int", nullable: false),
+                    DateOpen = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    DateClose = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    Status = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Debitings", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Debitings_Cards_CardId",
+                        column: x => x.CardId,
+                        principalTable: "Cards",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
 
             migrationBuilder.CreateTable(
-            name: "CashWithdrawals",
-            columns: table => new
-            {
-                Id = table.Column<int>(type: "int", nullable: false)
-            .Annotation("SqlServer:Identity", "1, 1"),
-                DebitingId = table.Column<int>(type: "int", nullable: false),
-                AccountId = table.Column<int>(type: "int", nullable: false),
-                CashierId = table.Column<int>(type: "int", nullable: false),
-                Sum = table.Column<int>(type: "int", nullable: false),
-                DateOperation = table.Column<DateTime>(type: "datetime2", nullable: false)
-            },
-            constraints: table =>
-            {
-                table.PrimaryKey("PK_CashWithdrawals", x => x.Id);
-                table.ForeignKey(
-name: "FK_CashWithdrawals_Accounts_AccountId",
-column: x => x.AccountId,
-principalTable: "Accounts",
-principalColumn: "Id",
-onDelete: ReferentialAction.Cascade);
-                table.ForeignKey(
-name: "FK_CashWithdrawals_Cashiers_CashierId",
-column: x => x.CashierId,
-principalTable: "Cashiers",
-principalColumn: "Id",
-onDelete: ReferentialAction.NoAction);
-                table.ForeignKey(
-name: "FK_CashWithdrawals_Debitings_DebitingId",
-column: x => x.DebitingId,
-principalTable: "Debitings",
-principalColumn: "Id",
-onDelete: ReferentialAction.NoAction);
-            });
+                name: "CashWithdrawals",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DebitingId = table.Column<int>(type: "int", nullable: false),
+                    AccountId = table.Column<int>(type: "int", nullable: false),
+                    CashierId = table.Column<int>(type: "int", nullable: false),
+                    Sum = table.Column<int>(type: "int", nullable: false),
+                    DateOperation = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CashWithdrawals", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_CashWithdrawals_Accounts_AccountId",
+                        column: x => x.AccountId,
+                        principalTable: "Accounts",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_CashWithdrawals_Cashiers_CashierId",
+                        column: x => x.CashierId,
+                        principalTable: "Cashiers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.NoAction);
+                    table.ForeignKey(
+                        name: "FK_CashWithdrawals_Debitings_DebitingId",
+                        column: x => x.DebitingId,
+                        principalTable: "Debitings",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.NoAction);
+                });
 
             migrationBuilder.CreateIndex(
-            name: "IX_Accounts_CashierId",
-            table: "Accounts",
-            column: "CashierId");
+                name: "IX_Accounts_CashierId",
+                table: "Accounts",
+                column: "CashierId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_Accounts_ClientId",
-            table: "Accounts",
-            column: "ClientId");
+                name: "IX_Accounts_ClientId",
+                table: "Accounts",
+                column: "ClientId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_Cards_AccountId",
-            table: "Cards",
-            column: "AccountId");
+                name: "IX_Cards_AccountId",
+                table: "Cards",
+                column: "AccountId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_Cards_ClientID",
-            table: "Cards",
-            column: "ClientID");
+                name: "IX_Cards_ClientID",
+                table: "Cards",
+                column: "ClientID");
 
             migrationBuilder.CreateIndex(
-            name: "IX_CashWithdrawals_AccountId",
-            table: "CashWithdrawals",
-            column: "AccountId");
+                name: "IX_CashWithdrawals_AccountId",
+                table: "CashWithdrawals",
+                column: "AccountId");
 
             migrationBuilder.CreateIndex(
-            name:
-            "IX_CashWithdrawals_CashierId",
-            table: "CashWithdrawals",
-            column: "CashierId");
+                name: "IX_CashWithdrawals_CashierId",
+                table: "CashWithdrawals",
+                column: "CashierId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_CashWithdrawals_DebitingId",
-            table: "CashWithdrawals",
-            column: "DebitingId");
+                name: "IX_CashWithdrawals_DebitingId",
+                table: "CashWithdrawals",
+                column: "DebitingId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_Creditings_CardId",
-            table: "Creditings",
-            column: "CardId");
+                name: "IX_Creditings_CardId",
+                table: "Creditings",
+                column: "CardId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_Debitings_CardId",
-            table: "Debitings",
-            column: "CardId");
+                name: "IX_Debitings_CardId",
+                table: "Debitings",
+                column: "CardId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_MoneyTransfers_AccountPayeerId",
-            table: "MoneyTransfers",
-            column: "AccountPayeerId");
+                name: "IX_MoneyTransfers_AccountPayeerId",
+                table: "MoneyTransfers",
+                column: "AccountPayeerId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_MoneyTransfers_AccountSenderId",
-            table: "MoneyTransfers",
-            column: "AccountSenderId");
+                name: "IX_MoneyTransfers_AccountSenderId",
+                table: "MoneyTransfers",
+                column: "AccountSenderId");
 
             migrationBuilder.CreateIndex(
-            name: "IX_MoneyTransfers_CashierId",
-            table: "MoneyTransfers",
-            column: "CashierId");
+                name: "IX_MoneyTransfers_CashierId",
+                table: "MoneyTransfers",
+                column: "CashierId");
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
-            name: "CashWithdrawals");
+                name: "CashWithdrawals");
 
             migrationBuilder.DropTable(
-            name: "Creditings");
+                name: "Creditings");
 
             migrationBuilder.DropTable(
-            name: "MoneyTransfers");
+                name: "MoneyTransfers");
 
             migrationBuilder.DropTable(
-            name: "Debitings");
+                name: "Debitings");
 
             migrationBuilder.DropTable(
-            name: "Cards");
+                name: "Cards");
 
             migrationBuilder.DropTable(
-            name: "Accounts");
+                name: "Accounts");
 
             migrationBuilder.DropTable(
-            name: "Cashiers");
+                name: "Cashiers");
 
             migrationBuilder.DropTable(
-            name: "Clients");
+                name: "Clients");
         }
     }
 }
diff --git a/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.Designer.cs b/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.Designer.cs
new file mode 100644
index 0000000..6970869
--- /dev/null
+++ b/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.Designer.cs
@@ -0,0 +1,462 @@
+// <auto-generated />
+using System;
+using BankDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BankDatabaseImplement.Migrations
+{
+    [DbContext(typeof(BankDatabase))]
+    [Migration("20230516172054_SmallFix")]
+    partial class SmallFix
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AccountNumber")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Balance")
+                        .HasColumnType("float");
+
+                    b.Property<int>("CashierId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("PasswordAccount")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CashierId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Accounts");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccountId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("CVC")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ClientID")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("Period")
+                        .HasColumnType("datetime2");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("ClientID");
+
+                    b.ToTable("Cards");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.CashWithdrawal", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccountId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("CashierId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateOperation")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("DebitingId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("CashierId");
+
+                    b.HasIndex("DebitingId");
+
+                    b.ToTable("CashWithdrawals");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Cashier", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Patronymic")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Telephone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Cashiers");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Patronymic")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Telephone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CardId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DateClose")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardId");
+
+                    b.ToTable("Creditings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Debiting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CardId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DateClose")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardId");
+
+                    b.ToTable("Debitings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.MoneyTransfer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccountPayeeId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("AccountPayeerId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("AccountSenderId")
+                        .IsRequired()
+                        .HasColumnType("int");
+
+                    b.Property<int>("CashierId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("CreditingId")
+                        .IsRequired()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateOperation")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountPayeerId");
+
+                    b.HasIndex("AccountSenderId");
+
+                    b.HasIndex("CashierId");
+
+                    b.HasIndex("CreditingId");
+
+                    b.ToTable("MoneyTransfers");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", null)
+                        .WithMany("Accounts")
+                        .HasForeignKey("CashierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", null)
+                        .WithMany("Cards")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Cards")
+                        .HasForeignKey("ClientID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.CashWithdrawal", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "Account")
+                        .WithMany("CashWithdrawals")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", "Cashier")
+                        .WithMany("CashWithdrawals")
+                        .HasForeignKey("CashierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Debiting", "Debiting")
+                        .WithMany()
+                        .HasForeignKey("DebitingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Account");
+
+                    b.Navigation("Cashier");
+
+                    b.Navigation("Debiting");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Card", "Card")
+                        .WithMany("Creditings")
+                        .HasForeignKey("CardId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Card");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Debiting", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Card", "Card")
+                        .WithMany("Debitings")
+                        .HasForeignKey("CardId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Card");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.MoneyTransfer", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "AccountPayeer")
+                        .WithMany()
+                        .HasForeignKey("AccountPayeerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "AccountSender")
+                        .WithMany()
+                        .HasForeignKey("AccountSenderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", "Cashier")
+                        .WithMany("MoneyTransfers")
+                        .HasForeignKey("CashierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Crediting", null)
+                        .WithMany("MoneyTransfers")
+                        .HasForeignKey("CreditingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("AccountPayeer");
+
+                    b.Navigation("AccountSender");
+
+                    b.Navigation("Cashier");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
+                {
+                    b.Navigation("Cards");
+
+                    b.Navigation("CashWithdrawals");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.Navigation("Creditings");
+
+                    b.Navigation("Debitings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Cashier", b =>
+                {
+                    b.Navigation("Accounts");
+
+                    b.Navigation("CashWithdrawals");
+
+                    b.Navigation("MoneyTransfers");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Cards");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
+                {
+                    b.Navigation("MoneyTransfers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.cs b/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.cs
new file mode 100644
index 0000000..7df0a5c
--- /dev/null
+++ b/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.cs
@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BankDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class SmallFix : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_MoneyTransfers_CreditingId",
+                table: "MoneyTransfers",
+                column: "CreditingId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MoneyTransfers_Creditings_CreditingId",
+                table: "MoneyTransfers",
+                column: "CreditingId",
+                principalTable: "Creditings",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.NoAction);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_MoneyTransfers_Creditings_CreditingId",
+                table: "MoneyTransfers");
+
+            migrationBuilder.DropIndex(
+                name: "IX_MoneyTransfers_CreditingId",
+                table: "MoneyTransfers");
+        }
+    }
+}
diff --git a/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.cs.cs b/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.cs.cs
deleted file mode 100644
index 7d4e8a7..0000000
--- a/Bank/BankDatabaseImplement/Migrations/20230516172054_SmallFix.cs.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class SmallFix : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateIndex(
-            name: "IX_MoneyTransfers_CreditingId",
-            table: "MoneyTransfers",
-            column: "CreditingId");
-
-            migrationBuilder.AddForeignKey(
-            name: "FK_MoneyTransfers_Creditings_CreditingId",
-            table: "MoneyTransfers",
-            column: "CreditingId",
-            principalTable: "Creditings",
-            principalColumn: "Id",
-            onDelete: ReferentialAction.NoAction);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-            name: "FK_MoneyTransfers_Creditings_CreditingId",
-            table: "MoneyTransfers");
-
-            migrationBuilder.DropIndex(
-            name: "IX_MoneyTransfers_CreditingId",
-            table: "MoneyTransfers");
-        }
-    }
-}
-
diff --git a/Bank/BankDatabaseImplement/Migrations/20240528115815_Initial.Designer.cs b/Bank/BankDatabaseImplement/Migrations/20230516175437_NewSmallFix.Designer.cs
similarity index 72%
rename from Bank/BankDatabaseImplement/Migrations/20240528115815_Initial.Designer.cs
rename to Bank/BankDatabaseImplement/Migrations/20230516175437_NewSmallFix.Designer.cs
index 8d3642f..b4e13d1 100644
--- a/Bank/BankDatabaseImplement/Migrations/20240528115815_Initial.Designer.cs
+++ b/Bank/BankDatabaseImplement/Migrations/20230516175437_NewSmallFix.Designer.cs
@@ -12,20 +12,20 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace BankDatabaseImplement.Migrations
 {
     [DbContext(typeof(BankDatabase))]
-    [Migration("20240528115815_Initial")]
-    partial class Initial
+    [Migration("20230516175437_NewSmallFix")]
+    partial class NewSmallFix
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.18")
+                .HasAnnotation("ProductVersion", "7.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Account", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -49,8 +49,9 @@ namespace BankDatabaseImplement.Migrations
                     b.Property<DateTime>("DateOpen")
                         .HasColumnType("datetime2");
 
-                    b.Property<int>("StatusAccount")
-                        .HasColumnType("int");
+                    b.Property<string>("PasswordAccount")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
 
@@ -61,7 +62,41 @@ namespace BankDatabaseImplement.Migrations
                     b.ToTable("Accounts");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.CashWithdrawal", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccountId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("CVC")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ClientID")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("Period")
+                        .HasColumnType("datetime2");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("ClientID");
+
+                    b.ToTable("Cards");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.CashWithdrawal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -75,14 +110,14 @@ namespace BankDatabaseImplement.Migrations
                     b.Property<int>("CashierId")
                         .HasColumnType("int");
 
-                    b.Property<DateTime>("DateWithdrawal")
+                    b.Property<DateTime>("DateOperation")
                         .HasColumnType("datetime2");
 
                     b.Property<int>("DebitingId")
                         .HasColumnType("int");
 
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
 
                     b.HasKey("Id");
 
@@ -95,7 +130,7 @@ namespace BankDatabaseImplement.Migrations
                     b.ToTable("CashWithdrawals");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Cashier", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Cashier", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -107,10 +142,6 @@ namespace BankDatabaseImplement.Migrations
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("MobilePhone")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
@@ -127,12 +158,113 @@ namespace BankDatabaseImplement.Migrations
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("Telephone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
                     b.HasKey("Id");
 
                     b.ToTable("Cashiers");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.MoneyTransfer", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Patronymic")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Telephone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CardId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DateClose")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardId");
+
+                    b.ToTable("Creditings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Debiting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CardId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DateClose")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardId");
+
+                    b.ToTable("Debitings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.MoneyTransfer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -155,11 +287,11 @@ namespace BankDatabaseImplement.Migrations
                     b.Property<int?>("CreditingId")
                         .HasColumnType("int");
 
-                    b.Property<DateTime>("DateTransfer")
+                    b.Property<DateTime>("DateOperation")
                         .HasColumnType("datetime2");
 
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
 
                     b.HasKey("Id");
 
@@ -174,143 +306,15 @@ namespace BankDatabaseImplement.Migrations
                     b.ToTable("MoneyTransfers");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Card", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("AccountId")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Balance")
-                        .HasColumnType("float");
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ClientSurname")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Number")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("Period")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("StatusCard")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Cards");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("MobilePhone")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Patronymic")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Surname")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Crediting", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CardId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCredit")
-                        .HasColumnType("datetime2");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CardId");
-
-                    b.ToTable("Creditings");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Debiting", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CardId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDebit")
-                        .HasColumnType("datetime2");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CardId");
-
-                    b.ToTable("Debitings");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Account", b =>
-                {
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Cashier", null)
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", null)
                         .WithMany("Accounts")
                         .HasForeignKey("CashierId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Client", "Client")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Client", "Client")
                         .WithMany()
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -319,21 +323,38 @@ namespace BankDatabaseImplement.Migrations
                     b.Navigation("Client");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.CashWithdrawal", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
                 {
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Account", "Account")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", null)
+                        .WithMany("Cards")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Cards")
+                        .HasForeignKey("ClientID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.CashWithdrawal", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "Account")
                         .WithMany("CashWithdrawals")
                         .HasForeignKey("AccountId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Cashier", "Cashier")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", "Cashier")
                         .WithMany("CashWithdrawals")
                         .HasForeignKey("CashierId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Debiting", "Debiting")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Debiting", "Debiting")
                         .WithMany()
                         .HasForeignKey("DebitingId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -346,25 +367,47 @@ namespace BankDatabaseImplement.Migrations
                     b.Navigation("Debiting");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.MoneyTransfer", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
                 {
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Account", "AccountPayeer")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Card", "Card")
+                        .WithMany("Creditings")
+                        .HasForeignKey("CardId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Card");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Debiting", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Card", "Card")
+                        .WithMany("Debitings")
+                        .HasForeignKey("CardId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Card");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.MoneyTransfer", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "AccountPayeer")
                         .WithMany()
                         .HasForeignKey("AccountPayeerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Account", "AccountSender")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "AccountSender")
                         .WithMany()
                         .HasForeignKey("AccountSenderId");
 
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Cashier", "Cashier")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", "Cashier")
                         .WithMany("MoneyTransfers")
                         .HasForeignKey("CashierId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Crediting", null)
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Crediting", null)
                         .WithMany("MoneyTransfers")
                         .HasForeignKey("CreditingId");
 
@@ -375,55 +418,21 @@ namespace BankDatabaseImplement.Migrations
                     b.Navigation("Cashier");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Card", b =>
-                {
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Account", "Account")
-                        .WithMany("Cards")
-                        .HasForeignKey("AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Client", "Client")
-                        .WithMany("Cards")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Account");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Crediting", b =>
-                {
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Card", "Card")
-                        .WithMany("creditings")
-                        .HasForeignKey("CardId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Card");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Debiting", b =>
-                {
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Card", "Card")
-                        .WithMany("debitings")
-                        .HasForeignKey("CardId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Card");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Account", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
                 {
                     b.Navigation("Cards");
 
                     b.Navigation("CashWithdrawals");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Cashier", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.Navigation("Creditings");
+
+                    b.Navigation("Debitings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Cashier", b =>
                 {
                     b.Navigation("Accounts");
 
@@ -432,19 +441,12 @@ namespace BankDatabaseImplement.Migrations
                     b.Navigation("MoneyTransfers");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Card", b =>
-                {
-                    b.Navigation("creditings");
-
-                    b.Navigation("debitings");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Client", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Client", b =>
                 {
                     b.Navigation("Cards");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Crediting", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
                 {
                     b.Navigation("MoneyTransfers");
                 });
diff --git a/Bank/BankDatabaseImplement/Migrations/20230516175437_NewSmallFix.cs b/Bank/BankDatabaseImplement/Migrations/20230516175437_NewSmallFix.cs
index 377cc5a..f792371 100644
--- a/Bank/BankDatabaseImplement/Migrations/20230516175437_NewSmallFix.cs
+++ b/Bank/BankDatabaseImplement/Migrations/20230516175437_NewSmallFix.cs
@@ -1,9 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+#nullable disable
 
 namespace BankDatabaseImplement.Migrations
 {
@@ -14,90 +11,90 @@ namespace BankDatabaseImplement.Migrations
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropForeignKey(
-            name: "FK_MoneyTransfers_Accounts_AccountSenderId",
-            table: "MoneyTransfers");
+                name: "FK_MoneyTransfers_Accounts_AccountSenderId",
+                table: "MoneyTransfers");
 
             migrationBuilder.DropForeignKey(
-            name: "FK_MoneyTransfers_Creditings_CreditingId",
-            table: "MoneyTransfers");
+                name: "FK_MoneyTransfers_Creditings_CreditingId",
+                table: "MoneyTransfers");
 
             migrationBuilder.AlterColumn<int>(
-            name: "CreditingId",
-            table: "MoneyTransfers",
-            type: "int",
-            nullable: true,
-            oldClrType: typeof(int),
-            oldType: "int");
+                name: "CreditingId",
+                table: "MoneyTransfers",
+                type: "int",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int");
 
             migrationBuilder.AlterColumn<int>(
-            name: "AccountSenderId",
-            table: "MoneyTransfers",
-            type: "int",
-            nullable: true,
-            oldClrType: typeof(int),
-            oldType: "int");
+                name: "AccountSenderId",
+                table: "MoneyTransfers",
+                type: "int",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int");
 
             migrationBuilder.AddForeignKey(
-            name: "FK_MoneyTransfers_Accounts_AccountSenderId",
-            table: "MoneyTransfers",
-            column: "AccountSenderId",
-            principalTable: "Accounts",
-            principalColumn: "Id");
+                name: "FK_MoneyTransfers_Accounts_AccountSenderId",
+                table: "MoneyTransfers",
+                column: "AccountSenderId",
+                principalTable: "Accounts",
+                principalColumn: "Id");
 
             migrationBuilder.AddForeignKey(
-            name: "FK_MoneyTransfers_Creditings_CreditingId",
-            table: "MoneyTransfers",
-            column: "CreditingId",
-            principalTable: "Creditings",
-            principalColumn: "Id");
+                name: "FK_MoneyTransfers_Creditings_CreditingId",
+                table: "MoneyTransfers",
+                column: "CreditingId",
+                principalTable: "Creditings",
+                principalColumn: "Id");
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropForeignKey(
-            name: "FK_MoneyTransfers_Accounts_AccountSenderId",
-            table: "MoneyTransfers");
+                name: "FK_MoneyTransfers_Accounts_AccountSenderId",
+                table: "MoneyTransfers");
 
             migrationBuilder.DropForeignKey(
-            name: "FK_MoneyTransfers_Creditings_CreditingId",
-            table: "MoneyTransfers");
+                name: "FK_MoneyTransfers_Creditings_CreditingId",
+                table: "MoneyTransfers");
 
             migrationBuilder.AlterColumn<int>(
-            name: "CreditingId",
-            table: "MoneyTransfers",
-            type: "int",
-            nullable: false,
-            defaultValue: 0,
-            oldClrType: typeof(int),
-            oldType: "int",
-            oldNullable: true);
+                name: "CreditingId",
+                table: "MoneyTransfers",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldNullable: true);
 
             migrationBuilder.AlterColumn<int>(
-            name: "AccountSenderId",
-            table: "MoneyTransfers",
-            type: "int",
-            nullable: false,
-            defaultValue: 0,
-            oldClrType: typeof(int),
-            oldType: "int",
-            oldNullable: true);
+                name: "AccountSenderId",
+                table: "MoneyTransfers",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldNullable: true);
 
             migrationBuilder.AddForeignKey(
-            name: "FK_MoneyTransfers_Accounts_AccountSenderId",
-            table: "MoneyTransfers",
-            column: "AccountSenderId",
-            principalTable: "Accounts",
-            principalColumn: "Id",
-            onDelete: ReferentialAction.Cascade);
+                name: "FK_MoneyTransfers_Accounts_AccountSenderId",
+                table: "MoneyTransfers",
+                column: "AccountSenderId",
+                principalTable: "Accounts",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
 
             migrationBuilder.AddForeignKey(
-            name: "FK_MoneyTransfers_Creditings_CreditingId",
-            table: "MoneyTransfers",
-            column: "CreditingId",
-            principalTable: "Creditings",
-            principalColumn: "Id",
-            onDelete: ReferentialAction.Cascade);
+                name: "FK_MoneyTransfers_Creditings_CreditingId",
+                table: "MoneyTransfers",
+                column: "CreditingId",
+                principalTable: "Creditings",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
         }
     }
 }
diff --git a/Bank/BankDatabaseImplement/Migrations/20240528115815_Initial.cs b/Bank/BankDatabaseImplement/Migrations/20240528115815_Initial.cs
deleted file mode 100644
index 14c0195..0000000
--- a/Bank/BankDatabaseImplement/Migrations/20240528115815_Initial.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace BankDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class Initial : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Cashiers",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Surname = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Patronymic = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    MobilePhone = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Cashiers", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Clients",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Surname = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Patronymic = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    MobilePhone = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Clients", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Accounts",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    AccountNumber = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    CashierId = table.Column<int>(type: "int", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: false),
-                    Balance = table.Column<double>(type: "float", nullable: false),
-                    DateOpen = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    StatusAccount = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Accounts", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Accounts_Cashiers_CashierId",
-                        column: x => x.CashierId,
-                        principalTable: "Cashiers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Accounts_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Cards",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClientId = table.Column<int>(type: "int", nullable: false),
-                    AccountId = table.Column<int>(type: "int", nullable: false),
-                    Number = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Balance = table.Column<double>(type: "float", nullable: false),
-                    Period = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    StatusCard = table.Column<int>(type: "int", nullable: false),
-                    ClientSurname = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Cards", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Cards_Accounts_AccountId",
-                        column: x => x.AccountId,
-                        principalTable: "Accounts",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Cards_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.NoAction);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Creditings",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    CardId = table.Column<int>(type: "int", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    DateCredit = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Creditings", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Creditings_Cards_CardId",
-                        column: x => x.CardId,
-                        principalTable: "Cards",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Debitings",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    CardId = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    DateDebit = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Debitings", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Debitings_Cards_CardId",
-                        column: x => x.CardId,
-                        principalTable: "Cards",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "MoneyTransfers",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    AccountSenderId = table.Column<int>(type: "int", nullable: true),
-                    AccountPayeeId = table.Column<int>(type: "int", nullable: false),
-                    DateTransfer = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreditingId = table.Column<int>(type: "int", nullable: true),
-                    CashierId = table.Column<int>(type: "int", nullable: false),
-                    AccountPayeerId = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MoneyTransfers", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_MoneyTransfers_Accounts_AccountPayeerId",
-                        column: x => x.AccountPayeerId,
-                        principalTable: "Accounts",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_MoneyTransfers_Accounts_AccountSenderId",
-                        column: x => x.AccountSenderId,
-                        principalTable: "Accounts",
-                        principalColumn: "Id");
-                    table.ForeignKey(
-                        name: "FK_MoneyTransfers_Cashiers_CashierId",
-                        column: x => x.CashierId,
-                        principalTable: "Cashiers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.NoAction);
-                    table.ForeignKey(
-                        name: "FK_MoneyTransfers_Creditings_CreditingId",
-                        column: x => x.CreditingId,
-                        principalTable: "Creditings",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateTable(
-                name: "CashWithdrawals",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    DebitingId = table.Column<int>(type: "int", nullable: false),
-                    AccountId = table.Column<int>(type: "int", nullable: false),
-                    CashierId = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    DateWithdrawal = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CashWithdrawals", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_CashWithdrawals_Accounts_AccountId",
-                        column: x => x.AccountId,
-                        principalTable: "Accounts",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.NoAction);
-                    table.ForeignKey(
-                        name: "FK_CashWithdrawals_Cashiers_CashierId",
-                        column: x => x.CashierId,
-                        principalTable: "Cashiers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_CashWithdrawals_Debitings_DebitingId",
-                        column: x => x.DebitingId,
-                        principalTable: "Debitings",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.NoAction);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Accounts_CashierId",
-                table: "Accounts",
-                column: "CashierId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Accounts_ClientId",
-                table: "Accounts",
-                column: "ClientId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Cards_AccountId",
-                table: "Cards",
-                column: "AccountId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Cards_ClientId",
-                table: "Cards",
-                column: "ClientId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CashWithdrawals_AccountId",
-                table: "CashWithdrawals",
-                column: "AccountId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CashWithdrawals_CashierId",
-                table: "CashWithdrawals",
-                column: "CashierId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CashWithdrawals_DebitingId",
-                table: "CashWithdrawals",
-                column: "DebitingId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Creditings_CardId",
-                table: "Creditings",
-                column: "CardId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Debitings_CardId",
-                table: "Debitings",
-                column: "CardId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MoneyTransfers_AccountPayeerId",
-                table: "MoneyTransfers",
-                column: "AccountPayeerId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MoneyTransfers_AccountSenderId",
-                table: "MoneyTransfers",
-                column: "AccountSenderId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MoneyTransfers_CashierId",
-                table: "MoneyTransfers",
-                column: "CashierId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MoneyTransfers_CreditingId",
-                table: "MoneyTransfers",
-                column: "CreditingId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "CashWithdrawals");
-
-            migrationBuilder.DropTable(
-                name: "MoneyTransfers");
-
-            migrationBuilder.DropTable(
-                name: "Debitings");
-
-            migrationBuilder.DropTable(
-                name: "Creditings");
-
-            migrationBuilder.DropTable(
-                name: "Cards");
-
-            migrationBuilder.DropTable(
-                name: "Accounts");
-
-            migrationBuilder.DropTable(
-                name: "Cashiers");
-
-            migrationBuilder.DropTable(
-                name: "Clients");
-        }
-    }
-}
diff --git a/Bank/BankDatabaseImplement/Migrations/BankDatabaseModelSnapshot.cs b/Bank/BankDatabaseImplement/Migrations/BankDatabaseModelSnapshot.cs
index 6e22f58..8eb5bf6 100644
--- a/Bank/BankDatabaseImplement/Migrations/BankDatabaseModelSnapshot.cs
+++ b/Bank/BankDatabaseImplement/Migrations/BankDatabaseModelSnapshot.cs
@@ -17,12 +17,12 @@ namespace BankDatabaseImplement.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.18")
+                .HasAnnotation("ProductVersion", "7.0.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Account", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -46,8 +46,9 @@ namespace BankDatabaseImplement.Migrations
                     b.Property<DateTime>("DateOpen")
                         .HasColumnType("datetime2");
 
-                    b.Property<int>("StatusAccount")
-                        .HasColumnType("int");
+                    b.Property<string>("PasswordAccount")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
 
@@ -58,7 +59,41 @@ namespace BankDatabaseImplement.Migrations
                     b.ToTable("Accounts");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.CashWithdrawal", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccountId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("CVC")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ClientID")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("Period")
+                        .HasColumnType("datetime2");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("ClientID");
+
+                    b.ToTable("Cards");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.CashWithdrawal", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -72,14 +107,14 @@ namespace BankDatabaseImplement.Migrations
                     b.Property<int>("CashierId")
                         .HasColumnType("int");
 
-                    b.Property<DateTime>("DateWithdrawal")
+                    b.Property<DateTime>("DateOperation")
                         .HasColumnType("datetime2");
 
                     b.Property<int>("DebitingId")
                         .HasColumnType("int");
 
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
 
                     b.HasKey("Id");
 
@@ -92,7 +127,7 @@ namespace BankDatabaseImplement.Migrations
                     b.ToTable("CashWithdrawals");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Cashier", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Cashier", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -104,10 +139,6 @@ namespace BankDatabaseImplement.Migrations
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<string>("MobilePhone")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
@@ -124,12 +155,113 @@ namespace BankDatabaseImplement.Migrations
                         .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("Telephone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
                     b.HasKey("Id");
 
                     b.ToTable("Cashiers");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.MoneyTransfer", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Patronymic")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Telephone")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CardId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DateClose")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardId");
+
+                    b.ToTable("Creditings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Debiting", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CardId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("DateClose")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateOpen")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardId");
+
+                    b.ToTable("Debitings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.MoneyTransfer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -152,11 +284,11 @@ namespace BankDatabaseImplement.Migrations
                     b.Property<int?>("CreditingId")
                         .HasColumnType("int");
 
-                    b.Property<DateTime>("DateTransfer")
+                    b.Property<DateTime>("DateOperation")
                         .HasColumnType("datetime2");
 
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
+                    b.Property<int>("Sum")
+                        .HasColumnType("int");
 
                     b.HasKey("Id");
 
@@ -171,143 +303,15 @@ namespace BankDatabaseImplement.Migrations
                     b.ToTable("MoneyTransfers");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Card", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("AccountId")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Balance")
-                        .HasColumnType("float");
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ClientSurname")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Number")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("Period")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("StatusCard")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccountId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Cards");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("MobilePhone")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Patronymic")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Surname")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Crediting", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CardId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCredit")
-                        .HasColumnType("datetime2");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CardId");
-
-                    b.ToTable("Creditings");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Debiting", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CardId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDebit")
-                        .HasColumnType("datetime2");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CardId");
-
-                    b.ToTable("Debitings");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Account", b =>
-                {
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Cashier", null)
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", null)
                         .WithMany("Accounts")
                         .HasForeignKey("CashierId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Client", "Client")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Client", "Client")
                         .WithMany()
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -316,21 +320,38 @@ namespace BankDatabaseImplement.Migrations
                     b.Navigation("Client");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.CashWithdrawal", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
                 {
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Account", "Account")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", null)
+                        .WithMany("Cards")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Cards")
+                        .HasForeignKey("ClientID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.CashWithdrawal", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "Account")
                         .WithMany("CashWithdrawals")
                         .HasForeignKey("AccountId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Cashier", "Cashier")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", "Cashier")
                         .WithMany("CashWithdrawals")
                         .HasForeignKey("CashierId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Debiting", "Debiting")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Debiting", "Debiting")
                         .WithMany()
                         .HasForeignKey("DebitingId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -343,25 +364,47 @@ namespace BankDatabaseImplement.Migrations
                     b.Navigation("Debiting");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.MoneyTransfer", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
                 {
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Account", "AccountPayeer")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Card", "Card")
+                        .WithMany("Creditings")
+                        .HasForeignKey("CardId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Card");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Debiting", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Card", "Card")
+                        .WithMany("Debitings")
+                        .HasForeignKey("CardId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Card");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.MoneyTransfer", b =>
+                {
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "AccountPayeer")
                         .WithMany()
                         .HasForeignKey("AccountPayeerId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Account", "AccountSender")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Account", "AccountSender")
                         .WithMany()
                         .HasForeignKey("AccountSenderId");
 
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Cashier", "Cashier")
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Cashier", "Cashier")
                         .WithMany("MoneyTransfers")
                         .HasForeignKey("CashierId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Crediting", null)
+                    b.HasOne("BankYouBankruptDatabaseImplement.Models.Crediting", null)
                         .WithMany("MoneyTransfers")
                         .HasForeignKey("CreditingId");
 
@@ -372,55 +415,21 @@ namespace BankDatabaseImplement.Migrations
                     b.Navigation("Cashier");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Card", b =>
-                {
-                    b.HasOne("BankDatabaseImplement.Models.CashierModels.Account", "Account")
-                        .WithMany("Cards")
-                        .HasForeignKey("AccountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Client", "Client")
-                        .WithMany("Cards")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Account");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Crediting", b =>
-                {
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Card", "Card")
-                        .WithMany("creditings")
-                        .HasForeignKey("CardId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Card");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Debiting", b =>
-                {
-                    b.HasOne("BankDatabaseImplement.Models.ClientModels.Card", "Card")
-                        .WithMany("debitings")
-                        .HasForeignKey("CardId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Card");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Account", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Account", b =>
                 {
                     b.Navigation("Cards");
 
                     b.Navigation("CashWithdrawals");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.CashierModels.Cashier", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Card", b =>
+                {
+                    b.Navigation("Creditings");
+
+                    b.Navigation("Debitings");
+                });
+
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Cashier", b =>
                 {
                     b.Navigation("Accounts");
 
@@ -429,19 +438,12 @@ namespace BankDatabaseImplement.Migrations
                     b.Navigation("MoneyTransfers");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Card", b =>
-                {
-                    b.Navigation("creditings");
-
-                    b.Navigation("debitings");
-                });
-
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Client", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Client", b =>
                 {
                     b.Navigation("Cards");
                 });
 
-            modelBuilder.Entity("BankDatabaseImplement.Models.ClientModels.Crediting", b =>
+            modelBuilder.Entity("BankYouBankruptDatabaseImplement.Models.Crediting", b =>
                 {
                     b.Navigation("MoneyTransfers");
                 });
diff --git a/Bank/BankDatabaseImplement/Models/CashierModels/Account.cs b/Bank/BankDatabaseImplement/Models/CashierModels/Account.cs
index aac97ea..0670356 100644
--- a/Bank/BankDatabaseImplement/Models/CashierModels/Account.cs
+++ b/Bank/BankDatabaseImplement/Models/CashierModels/Account.cs
@@ -1,92 +1,85 @@
 using BankContracts.BindingModels.Cashier;
-using BankContracts.ViewModels;
+using BankContracts.ViewModels.Cashier.ViewModels;
 using BankDatabaseImplement.Models.ClientModels;
-using BankDataModels.Enums;
 using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Models.CashierModels
 {
-	// Класс, реализующий интерфейс модели счёта
-	public class Account : IAccountModel
+    public class Account : IAccountModel
     {
-        public int Id { get; set; }
+		public int Id { get; set; }
 
         [Required]
         public string AccountNumber { get; set; } = string.Empty;
 
-        [Required]
-        public int CashierId { get; set; }
+		[Required]
+		public int CashierId { get; set; }
 
-        [Required]
-        public int ClientId { get; set; }
+		[Required]
+		public int ClientId { get; set; }
 
-        // Для передачи ФИО клиента
-        public virtual Client Client { get; set; }
+		//для передачи ФИО клиента
+		public virtual Client Client { get; set; }
 
-        [Required]
-        public double Balance { get; set; }
+		[Required]
+		public string PasswordAccount { get; set; } = string.Empty;
 
-        [Required]
-        public DateTime DateOpen { get; set; } = DateTime.Now;
+		[Required]
+		public double Balance { get; set; }
 
-        [Required]
-        public StatusAccount StatusAccount { get; set; } = StatusAccount.Открыт;
+		[Required]
+		public DateTime DateOpen { get; set; } = DateTime.Now;
 
-        // Для реализации связи один-ко-многим со Снятием наличных
-        [ForeignKey("AccountId")]
-        public virtual List<CashWithdrawal> CashWithdrawals { get; set; } = new();
+		//для реализации связи один ко многим со Снятием наличных
+		[ForeignKey("AccountId")]
+		public virtual List<CashWithdrawal> CashWithdrawals { get; set; } = new();
 
-        // Для реализации связи один-ко-многим с Переводом денег
-        [NotMapped]
-        [ForeignKey("AccountSenderId")]
-        public virtual List<MoneyTransfer> MoneyTransferSenders { get; set; } = new();
+		//для реализации связи один ко многим с Переводом денег
+		[NotMapped]
+		[ForeignKey("AccountSenderId")]
+		public virtual List<MoneyTransfer> MoneyTransferSenders { get; set; } = new();
 
-        [NotMapped]
-        [ForeignKey("AccountPayeeId")]
-        public virtual List<MoneyTransfer> MoneyTransferPayees { get; set; } = new();
+		[NotMapped]
+		[ForeignKey("AccountPayeeId")]
+		public virtual List<MoneyTransfer> MoneyTransferPayees { get; set; } = new();
 
-        // Для реализации связи один-ко-многим с Картами
-        [ForeignKey("AccountId")]
-        public virtual List<Card> Cards { get; set; } = new();
+		//для реализации связи один ко многим с Картами
+		[ForeignKey("AccountId")]
+		public virtual List<Card> Cards { get; set; } = new();
 
-        public static Account Create(BankDatabase context, AccountBindingModel model)
-        {
-            return new Account()
-            {
-                Id = model.Id,
-                ClientId = model.ClientId,
-                Client = context.Clients.First(x => x.Id == model.ClientId),
-                Balance = model.Balance,
-                DateOpen = model.DateOpen,
-                CashierId = model.CashierId,
-                AccountNumber = model.AccountNumber,
-                StatusAccount = model.StatusAccount
-            };
-        }
+		public static Account Create(BankDatabase context, AccountBindingModel model)
+		{
+			return new Account()
+			{
+				Id = model.Id,
+				ClientId = model.ClientId,
+				Client = context.Clients.First(x => x.Id == model.ClientId),
+				PasswordAccount = model.PasswordAccount,
+				Balance = model.Balance,
+				DateOpen = model.DateOpen,
+				CashierId = model.CashierId,
+				AccountNumber = model.AccountNumber
+			};
+		}
 
-        public void Update(AccountBindingModel model)
-        {
-            Balance = model.Balance;
-        }
+		public void Update(AccountBindingModel model)
+		{
+			Balance = model.Balance;
+		}
 
-        public AccountViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CashierId = CashierId,
-            ClientId = ClientId,
-            Name = Client.Name,
-            Patronymic = Client.Patronymic,
-            AccountNumber = AccountNumber,
-            Balance = Balance,
-            DateOpen = DateOpen,
-            StatusAccount = StatusAccount
-        };
-    }
+		public AccountViewModel GetViewModel => new()
+		{
+			Id = Id,
+			CashierId = CashierId,
+			ClientId = ClientId,
+			Name = Client.Name,
+			Patronymic = Client.Patronymic,
+			AccountNumber = AccountNumber,
+			Balance = Balance,
+			PasswordAccount = PasswordAccount,
+			DateOpen = DateOpen
+		};
+	}
 }
diff --git a/Bank/BankDatabaseImplement/Models/CashierModels/CashWithdrawal.cs b/Bank/BankDatabaseImplement/Models/CashierModels/CashWithdrawal.cs
index d0961d9..a2c0233 100644
--- a/Bank/BankDatabaseImplement/Models/CashierModels/CashWithdrawal.cs
+++ b/Bank/BankDatabaseImplement/Models/CashierModels/CashWithdrawal.cs
@@ -1,75 +1,81 @@
-using BankContracts.BindingModels.Cashier;
-using BankContracts.StoragesModels;
+using BankContracts.BindingModels;
+using BankContracts.BindingModels.Cashier;
+using BankContracts.ViewModels;
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankDatabaseImplement.Models.ClientModels;
+using BankDataModels.Models;
 using BankDataModels.Models.Cashier;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Models.CashierModels
 {
-	// Класс, реализующий интерфейс модели снятие наличных
-	public class CashWithdrawal : ICashWithdrawalModel
+    public class CashWithdrawal : ICashWithdrawalModel
     {
-        public int Id { get; set; }
+		public int Id { get; set; }
 
-        [Required]
-        public int DebitingId { get; set; }
+		[Required]
+		public int DebitingId { get; set; }
 
-        // Для передачи номера заявки
-        public virtual Debiting Debiting { get; set; }
+		//для передачи номера заявки
+		public virtual Debiting Debiting { get; set; }
 
-        [Required]
-        public int AccountId { get; set; }
+		[Required]
+		public int AccountId { get; set; }
 
-        // Для передачи номера счета
-        public virtual Account Account { get; set; }
+		//для передачи названия изделия
+		public virtual Account Account { get; set; }
 
-        [Required]
-        public int CashierId { get; set; }
+		[Required]
+		public int CashierId { get; set; }
 
-        // Для передачи данных о кассире
-        public virtual Cashier Cashier { get; set; }
+		//для передачи фамилии кассира
+		public virtual Cashier Cashier { get; set; }
 
-        [Required]
-        public double Sum { get; set; }
+		[Required]
+		public int Sum { get; set; }
 
-        [Required]
-        public DateTime DateWithdrawal { get; set; }
+		[Required]
+		public DateTime DateOperation { get; set; }
 
-        public static CashWithdrawal Create(BankDatabase context, CashWithdrawalBindingModel model)
-        {
-            return new CashWithdrawal()
-            {
-                Id = model.Id,
-                AccountId = model.AccountId,
-                Account = context.Accounts.First(x => x.Id == model.AccountId),
-                DebitingId = model.DebitingId,
-                Debiting = context.Debitings.First(x => x.Id == model.DebitingId),
-                CashierId = model.CashierId,
-                Cashier = context.Cashiers.First(x => x.Id == model.CashierId),
-                Sum = model.Sum,
-                DateWithdrawal = model.DateWithdrawal
-            };
-        }
+		public static CashWithdrawal Create(BankDatabase context, CashWithdrawalBindingModel model)
+		{
+			return new CashWithdrawal()
+			{
+				Id = model.Id,
+				AccountId = model.AccountId,
+				Account = context.Accounts.First(x => x.Id == model.AccountId),
+				DebitingId = model.DebitingId,
+				Debiting = context.Debitings.First(x => x.Id == model.DebitingId),
+				CashierId = model.CashierId,
+				Cashier = context.Cashiers.First(x => x.Id == model.CashierId),
+				Sum = model.Sum,
+				DateOperation = model.DateOperation
+			};
+		}
 
-        public void Update(CashWithdrawalBindingModel model)
-        {
-            DateWithdrawal = model.DateWithdrawal;
-        }
+		public void Update(CashWithdrawalBindingModel model)
+		{
+			DateOperation = model.DateOperation;
+		}
 
-        public CashWithdrawalViewModel GetViewModel => new()
-        {
-            Id = Id,
-            AccountId = AccountId,
-            CashierId = CashierId,
-            DebitingId = DebitingId,
-            Sum = Sum,
-            DateWithdrawal = DateWithdrawal
-        };
-    }
+		public CashWithdrawalViewModel GetViewModel => new()
+		{
+			Id = Id,
+			AccountId = AccountId,
+			CashierId = CashierId,
+			DebitingId = DebitingId,
+			AccountNumber = Account.AccountNumber,
+			SurmaneCashier = Cashier.Surname,
+			DebbitingNumber = Debiting.Id,
+			DebitingStatus = Debiting.Status,
+			Sum = Sum,
+			DateOperation = DateOperation
+		};
+	}
 }
diff --git a/Bank/BankDatabaseImplement/Models/CashierModels/Cashier.cs b/Bank/BankDatabaseImplement/Models/CashierModels/Cashier.cs
index 5cfc609..2d6a5be 100644
--- a/Bank/BankDatabaseImplement/Models/CashierModels/Cashier.cs
+++ b/Bank/BankDatabaseImplement/Models/CashierModels/Cashier.cs
@@ -1,85 +1,80 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankContracts.BindingModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
-using BankContracts.BindingModels.Cashier;
+using BankDatabaseImplement.Models.CashierModels;
 using BankDataModels.Models.Cashier;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace BankDatabaseImplement.Models.CashierModels
 {
-	// Класс, реализующий интерфейс модели кассира
-	public class Cashier : ICashierModel
+    public class Cashier : ICashierModel
     {
-        public int Id { get; set; }
+		public int Id { get; set; }
 
-        [Required]
-        public string Password { get; set; } = string.Empty;
+		[Required]
+		public string Password { get; set; } = string.Empty;
 
-        [Required]
-        public string Name { get; set; } = string.Empty;
+		[Required]
+		public string Name { get; set; } = string.Empty;
 
-        [Required]
-        public string Surname { get; set; } = string.Empty;
+		[Required]
+		public string Surname { get; set; } = string.Empty;
 
-        [Required]
-        public string Patronymic { get; set; } = string.Empty;
+		[Required]
+		public string Patronymic { get; set; } = string.Empty;
 
-        [Required]
-        public string Email { get; set; } = string.Empty;
+		[Required]
+		public string Email { get; set; } = string.Empty;
 
-        [Required]
-        public string MobilePhone { get; set; } = string.Empty;
+		[Required]
+		public string Telephone { get; set; } = string.Empty;
 
-        //для реализации связи один ко многим со Счётом
-        [ForeignKey("CashierId")]
-        public virtual List<Account> Accounts { get; set; } = new();
+		//для реализации связи один ко многим со Счётом
+		[ForeignKey("CashierId")]
+		public virtual List<Account> Accounts { get; set; } = new();
 
-        //для реализации связи один ко многим с заявками на снятие наличных со счёта
-        [ForeignKey("CashierId")]
-        public virtual List<CashWithdrawal> CashWithdrawals { get; set; } = new();
+		//для реализации связи один ко многим с заявками на снятие наличных со счёта
+		[ForeignKey("CashierId")]
+		public virtual List<CashWithdrawal> CashWithdrawals { get; set; } = new();
 
-        //для реализации связи один ко многим с заявками на переводы денег
-        [ForeignKey("CashierId")]
-        public virtual List<MoneyTransfer> MoneyTransfers { get; set; } = new();
+		//для реализации связи один ко многим с заявками на переводы денег
+		[ForeignKey("CashierId")]
+		public virtual List<MoneyTransfer> MoneyTransfers { get; set; } = new();
 
-        public static Cashier Create(BankDatabase context, CashierBindingModel model)
-        {
-            return new Cashier()
-            {
-                Id = model.Id,
-                Name = model.Name,
-                Surname = model.Surname,
-                Patronymic = model.Patronymic,
-                Email = model.Email,
-                MobilePhone = model.MobilePhone,
-                Password = model.Password
-            };
-        }
+		public static Cashier Create(BankDatabase context, CashierBindingModel model)
+		{
+			return new Cashier()
+			{
+				Id = model.Id,
+				Name = model.Name,
+				Surname = model.Surname,
+				Patronymic = model.Patronymic,
+				Email = model.Email,
+				Telephone = model.Telephone,
+				Password = model.Password
+			};
+		}
 
-        public void Update(CashierBindingModel model)
-        {
-            Id = model.Id;
-            Name = model.Name;
-            Surname = model.Surname;
-            Patronymic = model.Patronymic;
-            Email = model.Email;
-            MobilePhone = model.MobilePhone;
-            Password = model.Password;
-        }
+		public void Update(CashierBindingModel model)
+		{
+			Id = model.Id;
+			Name = model.Name;
+			Surname = model.Surname;
+			Patronymic = model.Patronymic;
+			Email = model.Email;
+			Telephone = model.Telephone;
+			Password = model.Password;
+		}
 
-        public CashierViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Name = Name,
-            Surname = Surname,
-            Patronymic = Patronymic,
-            Email = Email,
-            MobilePhone = MobilePhone,
-            Password = Password
-        };
-    }
+		public CashierViewModel GetViewModel => new()
+		{
+			Id = Id,
+			Name = Name,
+			Surname = Surname,
+			Patronymic = Patronymic,
+			Email = Email,
+			Telephone = Telephone,
+			Password = Password
+		};
+	}
 }
diff --git a/Bank/BankDatabaseImplement/Models/CashierModels/MoneyTransfer.cs b/Bank/BankDatabaseImplement/Models/CashierModels/MoneyTransfer.cs
index 27b3692..63fabc2 100644
--- a/Bank/BankDatabaseImplement/Models/CashierModels/MoneyTransfer.cs
+++ b/Bank/BankDatabaseImplement/Models/CashierModels/MoneyTransfer.cs
@@ -1,74 +1,70 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankDataModels.Models.Cashier;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Models.CashierModels
 {
-	// Класс, реализующий интерфейс модели перевода денег
-	public class MoneyTransfer : IMoneyTransferModel
-    {
-        public int Id { get; set; }
+    public class MoneyTransfer : IMoneyTransferModel
+	{
+		public int Id { get; set; }
 
-        [Required]
-        public double Sum { get; set; }
+		[Required]
+		public int Sum { get; set; }
 
-        public int? AccountSenderId { get; set; }
+		public int? AccountSenderId { get; set; }
 
-        [Required]
-        public int AccountPayeeId { get; set; }
+		[Required]
+		public int AccountPayeeId { get; set; }
 
-        [Required]
-        public DateTime DateTransfer { get; set; }
+		[Required]
+		public DateTime DateOperation { get; set; }
 
-        public int? CreditingId { get; set; }
+		public int? CreditingId { get; set; }
 
-        public int CashierId { get; set; }
+		public int CashierId { get; set; }
 
-        public virtual Cashier Cashier { get; set; }
+		public virtual Cashier Cashier { get; set; }
 
-        public virtual Account AccountSender { get; set; }
+		public virtual Account AccountSender { get; set; }
 
-        public virtual Account AccountPayeer { get; set; }
+		public virtual Account AccountPayeer { get; set; }
 
-        public static MoneyTransfer Create(BankDatabase context, MoneyTransferBindingModel model)
-        {
-            return new MoneyTransfer()
-            {
-                Id = model.Id,
-                Sum = model.Sum,
-                Cashier = context.Cashiers.First(x => x.Id == model.CashierId),
-                AccountSender = model.AccountSenderId == null ? null : context.Accounts.First(x => x.Id == model.AccountSenderId),
-                AccountPayeer = context.Accounts.First(x => x.Id == model.AccountPayeeId),
-                AccountSenderId = model.AccountSenderId,
-                AccountPayeeId = model.AccountPayeeId,
-                DateTransfer = model.DateTransfer,
-                CreditingId = model.CreditingId,
-                CashierId = model.CashierId
-            };
-        }
+		public static MoneyTransfer Create(BankDatabase context, MoneyTransferBindingModel model)
+		{
+			return new MoneyTransfer()
+			{
+				Id = model.Id,
+				Sum = model.Sum,
+				Cashier = context.Cashiers.First(x => x.Id == model.CashierId),
+				AccountSender = model.AccountSenderId == null ? null : context.Accounts.First(x => x.Id == model.AccountSenderId),
+				AccountPayeer = context.Accounts.First(x => x.Id == model.AccountPayeeId),
+				AccountSenderId = model.AccountSenderId,
+				AccountPayeeId = model.AccountPayeeId,
+				DateOperation = model.DateOperation,
+				CreditingId = model.CreditingId,
+				CashierId = model.CashierId
+			};
+		}
 
-        public void Update(MoneyTransferBindingModel model)
-        {
-            Id = model.Id;
-            DateTransfer = model.DateTransfer;
-        }
+		public void Update(MoneyTransferBindingModel model)
+		{
+			Id = model.Id;
+			DateOperation = model.DateOperation;
+		}
 
-        public MoneyTransferViewModel GetViewModel => new()
-        {
-            Id = Id,
-            AccountPayeeId = AccountPayeeId,
-            AccountSenderId = AccountSenderId,
-            DateTransfer = DateTransfer,
-            Sum = Sum,
-            CreditingId = CreditingId,
-            CashierId = CashierId,
-            CashierSurname = Cashier.Surname
-        };
-    }
+		public MoneyTransferViewModel GetViewModel => new()
+		{
+			Id = Id,
+			AccountPayeeId = AccountPayeeId,
+			AccountSenderId = AccountSenderId,
+			AccountPayeeNumber = AccountPayeer.AccountNumber,
+			AccountSenderNumber = AccountSenderId == null ? null : AccountSender.AccountNumber,
+			DateOperation = DateOperation,
+			Sum = Sum,
+			CreditingId = CreditingId,
+			CashierId = CashierId,
+			CashierSurname = Cashier.Surname
+		};
+	}
 }
diff --git a/Bank/BankDatabaseImplement/Models/ClientModels/Card.cs b/Bank/BankDatabaseImplement/Models/ClientModels/Card.cs
index 684f1fd..eb26fe7 100644
--- a/Bank/BankDatabaseImplement/Models/ClientModels/Card.cs
+++ b/Bank/BankDatabaseImplement/Models/ClientModels/Card.cs
@@ -1,26 +1,18 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
 using BankDatabaseImplement.Models.CashierModels;
-using BankDataModels.Enums;
 using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BankDatabaseImplement.Models.ClientModels
 {
-	// Класс, реализующий интерфейс модели банковской карты
-	public class Card : ICardModel
+    public class Card : ICardModel
     {
         public int Id { get; set; }
 
         [Required]
-        public int ClientId { get; set; }
+        public int ClientID { get; set; }
 
         public virtual Client Client { get; set; }
 
@@ -33,35 +25,27 @@ namespace BankDatabaseImplement.Models.ClientModels
         public string Number { get; set; } = string.Empty;
 
         [Required]
-        public double Balance { get; set; }
+        public string CVC { get; set; } = string.Empty;
 
-        [Required]
+		[Required]
         public DateTime Period { get; set; } = DateTime.Now;
 
-        [Required]
-        public StatusCard StatusCard { get; set; } = StatusCard.Открыта;
+        [ForeignKey("CardId")]
+        public virtual List<Crediting> Creditings { get; set; } = new();
 
-        [Required]
-        public string? ClientSurname { get; set; }
-
-		// Для реализации связи один-ко-многим с пополнением карты
-		[ForeignKey("CardId")]
-        public virtual List<Crediting> creditings { get; set; } = new();
-
-		// Для реализации связи один-ко-многим со снятием наличных с карты
-		[ForeignKey("CardId")]
-        public virtual List<Debiting> debitings { get; set; } = new();
+        [ForeignKey("CardId")]
+        public virtual List<Debiting> Debitings { get; set; } = new();
 
         public CardViewModel GetViewModel => new()
         {
             Id = Id,
-            AccountId = AccountId,
-            ClientId = ClientId,
+			AccountId = AccountId,
+			ClientID = ClientID,
+            ClientSurname = Client.Surname,
             Number = Number,
-            Balance = Balance,
+            Sum = Account.Balance,
             Period = Period,
-            StatusCard = StatusCard,
-            ClientSurname = ClientSurname
+            CVC = CVC
         };
 
         public static Card Create(BankDatabase context, CardBindingModel model)
@@ -71,12 +55,11 @@ namespace BankDatabaseImplement.Models.ClientModels
                 Id = model.Id,
                 AccountId = model.AccountId,
                 Account = context.Accounts.First(x => x.Id == model.AccountId),
-                ClientId = model.ClientId,
-                Client = context.Clients.First(x => x.Id == model.ClientId),
+                ClientID = model.ClientID,
+                Client = context.Clients.First(x => x.Id == model.ClientID),
                 Number = model.Number,
-                Balance = model.Balance,
                 Period = model.Period,
-                StatusCard = model.StatusCard,
+                CVC = model.CVC
             };
         }
 
@@ -86,3 +69,4 @@ namespace BankDatabaseImplement.Models.ClientModels
         }
     }
 }
+
diff --git a/Bank/BankDatabaseImplement/Models/ClientModels/Client.cs b/Bank/BankDatabaseImplement/Models/ClientModels/Client.cs
index 07f7706..0a1a121 100644
--- a/Bank/BankDatabaseImplement/Models/ClientModels/Client.cs
+++ b/Bank/BankDatabaseImplement/Models/ClientModels/Client.cs
@@ -1,18 +1,12 @@
-using BankContracts.BindingModels.Client;
-using BankContracts.ViewModels.Client.ViewModels;
-using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BankDataModels.Models.Client;
+using BankContracts.ViewModels.Client.ViewModels;
+using BankContracts.BindingModels.Client;
 
 namespace BankDatabaseImplement.Models.ClientModels
 {
-	// Класс, реализующий интерфейс модели клиента
-	public class Client : IClientModel
+    public class Client : IClientModel
     {
         public int Id { get; set; }
 
@@ -25,17 +19,16 @@ namespace BankDatabaseImplement.Models.ClientModels
         [Required]
         public string Patronymic { get; set; } = string.Empty;
 
+        [Required]
+        public string Telephone { get; set; } = string.Empty;
+
         [Required]
         public string Email { get; set; } = string.Empty;
 
         [Required]
         public string Password { get; set; } = string.Empty;
 
-        [Required]
-        public string MobilePhone { get; set; } = string.Empty;
-
-		// Для реализации связи один-ко-многим с банковскими картами
-		[ForeignKey("ClientId")]
+        [ForeignKey("ClientID")]
         public virtual List<Card> Cards { get; set; } = new();
 
         public ClientViewModel GetViewModel => new()
@@ -44,9 +37,9 @@ namespace BankDatabaseImplement.Models.ClientModels
             Name = Name,
             Surname = Surname,
             Patronymic = Patronymic,
+            Telephone = Telephone,
             Email = Email,
-            Password = Password,
-            MobilePhone = MobilePhone
+            Password = Password
         };
 
         public static Client Create(ClientBindingModel model)
@@ -57,9 +50,9 @@ namespace BankDatabaseImplement.Models.ClientModels
                 Name = model.Name,
                 Surname = model.Surname,
                 Patronymic = model.Patronymic,
+                Telephone = model.Telephone,
                 Email = model.Email,
-                Password = model.Password,
-                MobilePhone = model.MobilePhone,
+                Password = model.Password
             };
         }
 
@@ -68,9 +61,10 @@ namespace BankDatabaseImplement.Models.ClientModels
             Name = model.Name;
             Surname = model.Surname;
             Patronymic = model.Patronymic;
+            Telephone = model.Telephone;
             Email = model.Email;
             Password = model.Password;
-            MobilePhone = model.MobilePhone;
         }
     }
 }
+
diff --git a/Bank/BankDatabaseImplement/Models/ClientModels/Crediting.cs b/Bank/BankDatabaseImplement/Models/ClientModels/Crediting.cs
index 9eec619..5479681 100644
--- a/Bank/BankDatabaseImplement/Models/ClientModels/Crediting.cs
+++ b/Bank/BankDatabaseImplement/Models/ClientModels/Crediting.cs
@@ -1,20 +1,17 @@
-using BankContracts.ViewModels.Client.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using BankContracts.BindingModels.Client;
-using BankDataModels.Models.Client;
+using BankContracts.BindingModels.Client;
+using BankContracts.ViewModels.Client.ViewModels;
 using BankDatabaseImplement.Models.CashierModels;
+using BankDatabaseImplement.Models.ClientModels;
+using BankDataModels.Enums;
+using BankDataModels.Models.Client;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace BankDatabaseImplement.Models.ClientModels
+namespace BankDatabaseImplement.Models
 {
-	// Класс, реализующий интерфейс модели пополнения карты
-	public class Crediting : ICreditingModel
+    public class Crediting : ICreditingModel
     {
+
         public int Id { get; set; }
 
         [Required]
@@ -22,25 +19,30 @@ namespace BankDatabaseImplement.Models.ClientModels
 
         public virtual Card Card { get; set; }
 
-        public int ClientId { get; set; }
+        [Required]
+        public int Sum { get; set; }
 
         [Required]
-        public double Sum { get; set; }
+        public DateTime DateOpen { get; set; } = DateTime.Now;
+
+        public DateTime? DateClose { get; set; }
 
         [Required]
-        public DateTime DateCredit { get; set; } = DateTime.Now;
+        public StatusEnum Status { get; set; }
 
-        // Для реализации связи один-ко-многим с переводом денег
-        [ForeignKey("CreditingId")]
-        public virtual List<MoneyTransfer> MoneyTransfers { get; set; } = new();
+		//для реализации связи один ко многим с переводом денег
+		[ForeignKey("CreditingId")]
+		public virtual List<MoneyTransfer> MoneyTransfers { get; set; } = new();
 
-        public CreditingViewModel GetViewModel => new()
+		public CreditingViewModel GetViewModel => new()
         {
             Id = Id,
             CardId = CardId,
             CardNumber = Card.Number,
             Sum = Sum,
-            DateCredit = DateCredit,
+            DateOpen = DateOpen,
+            DateClose = DateClose,
+            Status = Status
         };
 
         public static Crediting Create(BankDatabase context, CreditingBindingModel model)
@@ -51,13 +53,15 @@ namespace BankDatabaseImplement.Models.ClientModels
                 CardId = model.CardId,
                 Card = context.Cards.First(x => x.Id == model.CardId),
                 Sum = model.Sum,
-                DateCredit = model.DateCredit,
+                DateOpen = model.DateOpen,
+                Status = model.Status
             };
         }
 
         public void Update(CreditingBindingModel model)
         {
-            DateCredit = model.DateCredit;
+            DateClose = model.DateClose;
+            Status = model.Status;
         }
     }
 }
diff --git a/Bank/BankDatabaseImplement/Models/ClientModels/Debiting.cs b/Bank/BankDatabaseImplement/Models/ClientModels/Debiting.cs
index f796f55..fe36a92 100644
--- a/Bank/BankDatabaseImplement/Models/ClientModels/Debiting.cs
+++ b/Bank/BankDatabaseImplement/Models/ClientModels/Debiting.cs
@@ -1,17 +1,13 @@
 using BankContracts.BindingModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
+using BankDatabaseImplement.Models.ClientModels;
+using BankDataModels.Enums;
 using BankDataModels.Models.Client;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BankDatabaseImplement.Models.ClientModels
+namespace BankDatabaseImplement.Models
 {
-	// Класс, реализующий интерфейс модели снятие с карты
-	public class Debiting : IDebitingModel
+    public class Debiting : IDebitingModel
     {
         public int Id { get; set; }
 
@@ -21,19 +17,25 @@ namespace BankDatabaseImplement.Models.ClientModels
         public virtual Card Card { get; set; }
 
         [Required]
-        public double Sum { get; set; }
+        public int Sum { get; set; }
 
         [Required]
-        public DateTime DateDebit { get; set; } = DateTime.Now;
+        public DateTime DateOpen { get; set; } = DateTime.Now;
 
-        public DebitingViewModel GetViewModel => new()
+		public DateTime? DateClose { get; set; }
+
+		[Required]
+		public StatusEnum Status { get; set; }
+
+		public DebitingViewModel GetViewModel => new()
         {
             Id = Id,
             CardId = CardId,
             CardNumber = Card.Number,
             Sum = Sum,
-            DateDebit = DateDebit,
-            
+            DateOpen = DateOpen,
+            DateClose = DateClose,
+            Status = Status
         };
 
         public static Debiting Create(BankDatabase context, DebitingBindingModel model)
@@ -44,13 +46,16 @@ namespace BankDatabaseImplement.Models.ClientModels
                 CardId = model.CardId,
                 Card = context.Cards.First(x => x.Id == model.CardId),
                 Sum = model.Sum,
-                DateDebit = model.DateDebit,
-            };
+				DateOpen = model.DateOpen,
+				Status = model.Status
+			};
         }
-        // вот тут надо ли обновлять эту операцию..., если судить чисто логически, то не надо ОБДУМАТЬ!!!!!!!! По идее лишним не будет, а может и будет
+
         public void Update(DebitingBindingModel model)
         {
-            DateDebit = model.DateDebit;
+            DateClose = model.DateClose;
+
+            Status = model.Status;
         }
     }
 }
diff --git a/Bank/BankRestAPI/Controllers/AccountController.cs b/Bank/BankRestAPI/Controllers/AccountController.cs
index 74b590c..9f77c7e 100644
--- a/Bank/BankRestAPI/Controllers/AccountController.cs
+++ b/Bank/BankRestAPI/Controllers/AccountController.cs
@@ -3,51 +3,68 @@ using BankContracts.BusinessLogicsContracts.Cashier;
 using BankContracts.BusinessLogicsContracts.Client;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.SearchModels.Client;
-using BankContracts.ViewModels;
+using BankContracts.ViewModels.Cashier.Diagram;
 using BankContracts.ViewModels.Cashier.ViewModels;
 using BankContracts.ViewModels.Client.ViewModels;
+using BankDataModels.Enums;
 using Microsoft.AspNetCore.Mvc;
 
-namespace BankRestAPI.Controllers
+namespace BankRestApi.Controllers
 {
-	// Route будет строиться по наванию контроллера и по названию метода (два Post-метода)
-	[Route("api/[controller]/[action]")]
-	[ApiController]
-	public class AccountController : Controller
-	{
-		private readonly ILogger _logger;
+    //указание у контроллера, что Route будет строиться не только по наванию контроллера, но и по названию метода (так как у нас два Post-метода)
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class AccountController : Controller
+    {
+        private readonly ILogger _logger;
 
-		private readonly IAccountLogic _accountLogic;
+        private readonly IAccountLogic _accountLogic;
 
 		private readonly IDebitingLogic _debitingLogic;
 
 		private readonly ICreditingLogic _creditingLogic;
 
-		private readonly ICashWithdrawalLogic _cashwithdrawalLogic;
+		private readonly ICashWithdrawalLogic _cashLogic;
 
 		private readonly IMoneyTransferLogic _moneyTransferLogic;
 
-		// Конструктор
-		public AccountController(ILogger<AccountController> logger, IAccountLogic accountLogic, IDebitingLogic debitingLogic, ICreditingLogic creditingLogic, ICashWithdrawalLogic cashWithdrawalLogic, IMoneyTransferLogic moneyTransferLogic)
-		{
-			_logger = logger;
-			_accountLogic = accountLogic;
-			_debitingLogic = debitingLogic;
+		public AccountController(IAccountLogic accountLogic, IDebitingLogic debitingLogic, ICashWithdrawalLogic cashLogic, 
+			ICreditingLogic creditingLogic, IMoneyTransferLogic moneyTransferLogic, ILogger<AccountController> logger)
+        {
+            _logger = logger;
+            _accountLogic = accountLogic;
+            _debitingLogic = debitingLogic;
+			_cashLogic = cashLogic;
 			_creditingLogic = creditingLogic;
-			_cashwithdrawalLogic = cashWithdrawalLogic;
 			_moneyTransferLogic = moneyTransferLogic;
-		}
+        }
 
+        [HttpGet]
+        public AccountViewModel? Login(string accountNumber, string passwordAccount)
+        {
+            try
+            {
+                //попытка найти запись по переданным номеру и паролю счёта
+                return _accountLogic.ReadElement(new AccountSearchModel
+                {
+                    AccountNumber = accountNumber,
+                    PasswordAccount = passwordAccount
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка входа в систему");
+                throw;
+            }
+        }
+
+		//получаем все имеющиеся счета
 		[HttpGet]
-		public AccountViewModel? Login(string accountNumber, string passwordAccount)
+		public List<AccountViewModel>? GetAllAccounts()
 		{
 			try
 			{
-				// Попытка найти счёт (запись) по переданным номеру и паролю счёта
-				return _accountLogic.ReadElement(new AccountSearchModel
-				{
-					AccountNumber = accountNumber,
-				});
+				return _accountLogic.ReadList(null);
 			}
 			catch (Exception ex)
 			{
@@ -56,12 +73,12 @@ namespace BankRestAPI.Controllers
 			}
 		}
 
+		//получаем все имеющиеся счета
 		[HttpGet]
 		public AccountViewModel? GetAccount(int accountId)
 		{
 			try
 			{
-				// Попробуем получить счёт
 				return _accountLogic.ReadElement(new AccountSearchModel
 				{
 					Id = accountId
@@ -74,57 +91,42 @@ namespace BankRestAPI.Controllers
 			}
 		}
 
-		[HttpGet]
-		public List<AccountViewModel>? GetAllAccounts()
-		{
-			try
-			{
-				// Попробуем получить все имеющиеся счета
-				return _accountLogic.ReadList(null);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка входа в систему");
-				throw;
-			}
-		}
-
 		[HttpPost]
-		public void RegisterAccount(AccountBindingModel model)
-		{
-			try
-			{
-				// Создание счёта
-				_accountLogic.Create(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка регистрации счёта в банке");
-				throw;
-			}
-		}
+        public void Register(AccountBindingModel model)
+        {
+            try
+            {
+                //создание счёта
+                _accountLogic.Create(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка регистрации");
+                throw;
+            }
+        }
 
-		[HttpPost]
-		public void UpdateData(AccountBindingModel model)
-		{
-			try
-			{
-				// Изменение данных о счёте
-				_accountLogic.Update(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка обновления данных");
-				throw;
-			}
-		}
+        [HttpPost]
+        public void UpdateData(AccountBindingModel model)
+        {
+            try
+            {
+                //изменение счёта
+                _accountLogic.Update(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка обновления данных");
+                throw;
+            }
+        }
 
+        //найти все счета, которые создал конкретный кассир
 		[HttpGet]
 		public List<AccountViewModel>? SearchAccounts(int cashierId)
 		{
 			try
 			{
-				// Поиск всех счетов которые сделал конкретный кассир
 				return _accountLogic.ReadList(new AccountSearchModel
 				{
 					CashierId = cashierId
@@ -132,17 +134,18 @@ namespace BankRestAPI.Controllers
 			}
 			catch (Exception ex)
 			{
-				_logger.LogError(ex, "ОШбика входа в систему");
+				_logger.LogError(ex, "Ошибка входа в систему");
 				throw;
 			}
 		}
 
+        //найти все счета клиента
 		[HttpGet]
-		public List<AccountViewModel>? SearchAccountsOfClient(int clientId)
+		public List<AccountViewModel>? SearchAccountsOfCLient(int clientId)
 		{
 			try
 			{
-				// Попытка найти запись по перданным номеру и паролю счета
+				//попытка найти запись по переданным номеру и паролю счёта
 				return _accountLogic.ReadList(new AccountSearchModel
 				{
 					ClientId = clientId
@@ -150,17 +153,49 @@ namespace BankRestAPI.Controllers
 			}
 			catch (Exception ex)
 			{
-				_logger.LogError(ex, "ОШибка входа в систему");
+				_logger.LogError(ex, "Ошибка входа в систему");
 				throw;
 			}
 		}
 
-		[HttpGet]
-		public List<CashWithdrawalViewModel>? FindAllCashWithdrawal()
+        [HttpGet]
+        public List<CashWithdrawalViewModel>? FindAllCashWithdrawal()
+        {
+            try
+            {
+                return _cashLogic.ReadList(null);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка входа в систему");
+                throw;
+            }
+        }
+
+        [HttpGet]
+        public List<MoneyTransferViewModel>? FindAllMoneyTransfer()
+        {
+            try
+            {
+                return _moneyTransferLogic.ReadList(null);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка входа в систему");
+                throw;
+            }
+        }
+
+        //найти все открытые заявки на снятие средств
+        [HttpGet]
+		public List<DebitingViewModel>? FindOpenDebiting()
 		{
 			try
 			{
-				return _cashwithdrawalLogic.ReadList(null);
+				return _debitingLogic.ReadList(new DebitingSearchModel
+				{
+					Status = StatusEnum.Открыта
+				});
 			}
 			catch (Exception ex)
 			{
@@ -169,12 +204,16 @@ namespace BankRestAPI.Controllers
 			}
 		}
 
+		//найти все открытые заявки на снятие средств
 		[HttpGet]
-		public List<MoneyTransferViewModel>? FindAllMoneyTransfer()
+		public List<CreditingViewModel>? FindOpenCrediting()
 		{
 			try
 			{
-				return _moneyTransferLogic.ReadList(null);
+				return _creditingLogic.ReadList(new CreditingSearchModel
+				{
+					Status = StatusEnum.Открыта
+				});
 			}
 			catch (Exception ex)
 			{
@@ -183,17 +222,75 @@ namespace BankRestAPI.Controllers
 			}
 		}
 
+		//подтверждение заявки на снятие средств со счёта
+		[HttpPost]
+		public void CloseDebiting(CashWithdrawalBindingModel CashWithdrawal)
+		{
+			try
+			{
+				bool flag =_accountLogic.ChangeBalance(new AccountSearchModel
+				{
+					Id = CashWithdrawal.AccountId
+				}, CashWithdrawal.Sum * -1);
+
+				_cashLogic.Create(CashWithdrawal, flag);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
+
+		//подтверждение заявки на перевод либо пополнение балланса
+		[HttpPost]
+		public void CloseCrediting(MoneyTransferBindingModel moneyTransfer)
+		{
+			try
+			{
+				_moneyTransferLogic.Create(moneyTransfer);
+
+				bool flag = true;
+
+				//если есть отправитель, т. е. операция на перевод денег со счёта на счёт
+				if (moneyTransfer.AccountSenderId.HasValue)
+				{
+					flag = _accountLogic.ChangeBalance(new AccountSearchModel
+					{
+						Id = moneyTransfer.AccountSenderId
+					}, moneyTransfer.Sum * -1);
+				}
+
+				if (flag)
+				{
+					_accountLogic.ChangeBalance(new AccountSearchModel
+					{
+						Id = moneyTransfer.AccountPayeeId
+					}, moneyTransfer.Sum);
+				}
+				else
+				{
+					throw new Exception("Недостаточно средств");
+				}
+
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
+
+		//поиск заявки на зачисление по id
 		[HttpGet]
 		public CreditingViewModel FindCrediting(int id)
 		{
 			try
 			{
-				// Поиск заявки на зачисление по id
 				return _creditingLogic.ReadElement(new CreditingSearchModel
 				{
 					Id = id
 				});
-
 			}
 			catch (Exception ex)
 			{
@@ -202,12 +299,12 @@ namespace BankRestAPI.Controllers
 			}
 		}
 
+		//поиск заявки на снятие по id
 		[HttpGet]
 		public DebitingViewModel FindDebiting(int id)
 		{
 			try
 			{
-				// Поиск заявки на снятие по id
 				return _debitingLogic.ReadElement(new DebitingSearchModel
 				{
 					Id = id
@@ -220,6 +317,18 @@ namespace BankRestAPI.Controllers
 			}
 		}
 
-
-	}
+        [HttpGet]
+        public List<CashierDiagramElementsViewModel> getAccountMonthResult(int cardId)
+        {
+            try
+            {
+                return _accountLogic.GetMonthInfo(cardId);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения пользователей");
+                throw;
+            }
+        }
+    }
 }
diff --git a/Bank/BankRestAPI/Controllers/CardController.cs b/Bank/BankRestAPI/Controllers/CardController.cs
index af51420..80a75bf 100644
--- a/Bank/BankRestAPI/Controllers/CardController.cs
+++ b/Bank/BankRestAPI/Controllers/CardController.cs
@@ -2,109 +2,102 @@
 using BankContracts.BusinessLogicsContracts.Cashier;
 using BankContracts.BusinessLogicsContracts.Client;
 using BankContracts.SearchModels.Client;
+using BankContracts.ViewModels.Client.Diagram;
 using BankContracts.ViewModels.Client.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using System.Net;
 
-namespace BankRestAPI.Controllers
+namespace BankRestApi.Controllers
 {
-	// Route будет строиться по наванию контроллера и по названию метода (два Post-метода)
-	[Route("api/[controller]/[action]")]
-	[ApiController]
-	public class CardController : Controller
-	{
-		private readonly ILogger _logger;
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class CardController : Controller
+    {
+        private readonly ILogger _logger;
 
-		private readonly ICardLogic _cardLogic;
+        private readonly ICardLogic _cardLogic;
 
-		private readonly IDebitingLogic _debitingLogic;
+        private readonly IDebitingLogic _debitingLogic;
 
-		private readonly ICreditingLogic _creditingLogic;
+        private readonly ICreditingLogic _creditingLogic;
 
-		private readonly IAccountLogic _accountLogic;
+        private readonly IAccountLogic _accountLogic;
 
-		// Конструктор
-		public CardController(ILogger<ClientController> logger, ICardLogic cardLogic, IDebitingLogic debitingLogic, ICreditingLogic creditingLogic, IAccountLogic accountLogic)
-		{
-			_logger = logger;
-			_cardLogic = cardLogic;
-			_debitingLogic = debitingLogic;
-			_creditingLogic = creditingLogic;
-			_accountLogic = accountLogic;
-		}
+        public CardController(ICardLogic cardLogic, IDebitingLogic debitingLogic, ICreditingLogic creditingLogic, IAccountLogic accountLogic, ILogger<ClientController> logger)
+        {
+            _logger = logger;
+            _cardLogic = cardLogic;
+            _debitingLogic = debitingLogic;
+            _creditingLogic = creditingLogic;
+            _accountLogic = accountLogic;
+        }
 
-		[HttpGet]
-		public List<CardViewModel>? GetAllCards()
-		{
-			try
-			{
-				return _cardLogic.ReadList(null);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения карт");
-				throw;
-			}
-		}
+        [HttpGet]
+        public List<CardViewModel>? GetAllCards()
+        {
+            try
+            {
+                return _cardLogic.ReadList(null);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения карт");
+                throw;
+            }
 
-		[HttpGet]
-		public List<CardViewModel>? GetClientsCardsList(int id)
-		{
-			try
-			{
-				return _cardLogic.ReadList(new CardSearchModel()
-				{
-					ClientID = id
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения карт");
-				throw;
-			}
-		}
+        }
 
-		[HttpPost]
-		public void CreateCard(CardBindingModel model)
-		{
-			try
-			{
-				_cardLogic.Create(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка создания банковской карты");
-				Response.StatusCode = (int)HttpStatusCode.NotAcceptable;
-			}
-		}
+        [HttpGet]
+        public List<CardViewModel>? GetUsersCardsList(int id)
+        {
+            try
+            {
+                return _cardLogic.ReadList(new CardSearchModel { ClientID = id });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения карт");
+                throw;
+            }
 
-		[HttpPost]
-		public void CreateDebitingRequest(DebitingBindingModel model)
-		{
-			try
-			{
-				_debitingLogic.Create(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка создания запроса на снятие наличных");
-				Response.StatusCode = (int)(HttpStatusCode.NotAcceptable);
-			}
-		}
+        }
 
-		[HttpPost]
-		public void CreateCreditingOperation(CreditingBindingModel model)
-		{
-			try
-			{
-				_creditingLogic.Create(model);
+        [HttpPost]
+        public void CreateCard(CardBindingModel model) {
+            try
+            {
+                _cardLogic.Create(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка создания карты");
+                Response.StatusCode = (int)HttpStatusCode.NotAcceptable;
+            }
+        }
+
+        [HttpPost]
+        public void CreateDebitingRequest(DebitingBindingModel model) {
+            try
+            {
+                _debitingLogic.Create(model);
 			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка создания операции на пополнение");
-				Response.StatusCode = (int)HttpStatusCode.NotAcceptable;
-			}
-		}
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка создания запроса на снятие наличных");
+                Response.StatusCode = (int)HttpStatusCode.NotAcceptable;
+            }
+        }
+
+        [HttpPost]
+        public void CreateCreditingOperation(CreditingBindingModel model) {
+            try {
+                _creditingLogic.Create(model);
+            }
+            catch (Exception ex) {
+                _logger.LogError(ex, "Ошибка создания операции на пополнение");
+                Response.StatusCode = (int)HttpStatusCode.NotAcceptable;
+            }
+        }
 
 		[HttpGet]
 		public CardViewModel? FindCard(int id)
@@ -122,5 +115,19 @@ namespace BankRestAPI.Controllers
 				throw;
 			}
 		}
-	}
+
+        [HttpGet]
+        public List<ClientDiagramElementsViewModel> getCardMonthResult(int cardId)
+        {
+            try
+            {
+                return _cardLogic.GetMonthInfo(cardId);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения пользователей");
+                throw;
+            }
+        }
+    }
 }
diff --git a/Bank/BankRestAPI/Controllers/CashierController.cs b/Bank/BankRestAPI/Controllers/CashierController.cs
index 9c22d49..f63fad0 100644
--- a/Bank/BankRestAPI/Controllers/CashierController.cs
+++ b/Bank/BankRestAPI/Controllers/CashierController.cs
@@ -1,54 +1,51 @@
 using BankContracts.BindingModels.Cashier;
 using BankContracts.BusinessLogicsContracts.Cashier;
-using BankContracts.BusinessLogicsContracts.Client;
 using BankContracts.SearchModels.Cashier;
 using BankContracts.ViewModels.Cashier.ViewModels;
-using BankContracts.ViewModels.Client.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 
-namespace BankRestAPI.Controllers
+namespace BankRestApi.Controllers
 {
-	// Route будет строиться по наванию контроллера и по названию метода (два Post-метода)
-	[Route("api/[controller]/[action]")]
-	[ApiController]
-	public class CashierController : Controller
-	{
-		private readonly ILogger _logger;
+    //указание у контроллера, что Route будет строиться не только по наванию контроллера, но и по названию метода (так как у нас два Post-метода)
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class CashierController : Controller
+    {
+        private readonly ILogger _logger;
 
-		private readonly ICashierLogic _cashierLogic;
+        private readonly ICashierLogic _cashierLogic;
 
-		// Конструктор
-		public CashierController(ICashierLogic cashierLogic, ILogger<AccountController> logger)
-		{
-			_logger = logger;
-			_cashierLogic = cashierLogic;
-		}
+        public CashierController(ICashierLogic cashierLogic, ILogger<AccountController> logger)
+        {
+            _logger = logger;
+            _cashierLogic = cashierLogic;
+        }
 
-		[HttpGet]
-		public CashierViewModel? Login(string login, string password)
-		{
-			try
-			{
-				// Попытка найти кассира (запись) по переданным логину и паролю
-				return _cashierLogic.ReadElement(new CashierSearchModel
-				{
-					Email = login,
-					Password = password
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка входа в систему");
-				throw;
-			}
-		}
+        [HttpGet]
+        public CashierViewModel? Login(string login, string password)
+        {
+            try
+            {
+                //попытка найти запись по переданным логину и паролю
+                return _cashierLogic.ReadElement(new CashierSearchModel
+                {
+                    Email = login,
+                    Password = password
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка входа в систему");
+                throw;
+            }
+        }
 
 		[HttpGet]
 		public CashierViewModel? GetCashier(int id)
 		{
 			try
 			{
-				// Попытка найти кассира
+				//попытка найти запись по переданным логину и паролю
 				return _cashierLogic.ReadElement(new CashierSearchModel
 				{
 					Id = id
@@ -62,33 +59,33 @@ namespace BankRestAPI.Controllers
 		}
 
 		[HttpPost]
-		public void Register(CashierBindingModel model)
-		{
-			try
-			{
-				// Cоздание кассира
-				_cashierLogic.Create(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка регистрации");
-				throw;
-			}
-		}
+        public void Register(CashierBindingModel model)
+        {
+            try
+            {
+                //создание клиента
+                _cashierLogic.Create(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка регистрации");
+                throw;
+            }
+        }
 
-		[HttpPost]
-		public void UpdateData(CashierBindingModel model)
-		{
-			try
-			{
-				// Изменение данных о кассире
-				_cashierLogic.Update(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка обновления данных");
-				throw;
-			}
-		}
-	}
+        [HttpPost]
+        public void UpdateData(CashierBindingModel model)
+        {
+            try
+            {
+                //изменение клиента
+                _cashierLogic.Update(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка обновления данных");
+                throw;
+            }
+        }
+    }
 }
diff --git a/Bank/BankRestAPI/Controllers/ClientController.cs b/Bank/BankRestAPI/Controllers/ClientController.cs
index 01ec587..1fab236 100644
--- a/Bank/BankRestAPI/Controllers/ClientController.cs
+++ b/Bank/BankRestAPI/Controllers/ClientController.cs
@@ -4,143 +4,137 @@ using BankContracts.SearchModels.Client;
 using BankContracts.ViewModels.Client.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 
-namespace BankRestAPI.Controllers
+namespace BankRestApi.Controllers
 {
-	// Route будет строиться по наванию контроллера и по названию метода (два Post-метода)
-	[Route("api/[controller]/[action]")]
-	[ApiController]
-	public class ClientController : Controller
-	{
-		private readonly ILogger _logger;
+    //указание у контроллера, что Route будет строиться не только по наванию контроллера, но и по названию метода (так как у нас два Post-метода)
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class ClientController : Controller
+    {
+        private readonly ILogger _logger;
 
-		private readonly IClientLogic _clientLogic;
+        private readonly IClientLogic _clientLogic;
 
-		private readonly IDebitingLogic _debitingLogic;
+        private readonly IDebitingLogic _debitingLogic;
+        private readonly ICreditingLogic _creditingLogic;
 
-		private readonly ICreditingLogic _creditingLogic;
+        public ClientController(ILogger<ClientController> logger, 
+            IClientLogic clientLogic, IDebitingLogic debitingLogic, ICreditingLogic creditingLogic)
+        {
+            _logger = logger;
+            _clientLogic = clientLogic;
+            _debitingLogic = debitingLogic;
+            _creditingLogic = creditingLogic;
+        }
 
-		// Конструктор 
-		public ClientController(ILogger<ClientController> logger, IClientLogic clientLogic, IDebitingLogic debitingLogic, ICreditingLogic creditingLogic)
-		{
-			_logger = logger;
-			_clientLogic = clientLogic;
-			_debitingLogic = debitingLogic;
-			_creditingLogic = creditingLogic;
-		}
+        [HttpGet]
+        public ClientViewModel? Login(string login, string password)
+        {
+            try
+            {
+                //попытка найти запись по переданным логину и паролю
+                return _clientLogic.ReadElement(new ClientSearchModel
+                {
+                    Email = login,
+                    Password = password
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка входа в систему");
+                throw;
+            }
+        }
 
-		[HttpGet]
-		public ClientViewModel? Login(string login, string password)
-		{
-			try
-			{
-				// Попытка найти клиента (запись) по переданным логину и паролю
-				return _clientLogic.ReadElement(new ClientSearchModel
-				{
-					Email = login,
-					Password = password
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка входа в систему");
-				throw;
-			}
-		}
+        [HttpGet]
+        public List<ClientViewModel>? GetAllClients() {
+            try
+            {
+                return _clientLogic.ReadList(null);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения пользователей");
+                throw;
+            }
+        }
 
-		[HttpGet]
-		public List<ClientViewModel>? GetAllClients()
-		{
-			try
-			{
-				return _clientLogic.ReadList(null);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения пользователя");
-				throw;
-			}
-		}
+        [HttpGet]
+        public ClientViewModel? GetClient(int clientId)
+        {
+            try
+            {
+                return _clientLogic.ReadElement(new ClientSearchModel { Id = clientId });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения пользователя");
+                throw;
+            }
+        }
 
-		[HttpGet]
-		public ClientViewModel? GetClient(int clientId)
-		{
-			try
-			{
-				// Попытка найти клиента
-				return _clientLogic.ReadElement(new ClientSearchModel
-				{
-					Id = clientId
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения пользователя");
-				throw;
-			}
-		}
+        [HttpPost]
+        public void Register(ClientBindingModel model)
+        {
+            try
+            {
+                //создание клиента
+                _clientLogic.Create(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка регистрации");
+                throw;
+            }
+        }
 
-		[HttpPost]
-		public void Register(ClientBindingModel model)
-		{
-			try
-			{
-				// Создание клиента
-				_clientLogic.Create(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка регистрации");
-				throw;
-			}
-		}
+        [HttpPost]
+        public void UpdateData(ClientBindingModel model)
+        {
+            try
+            {
+                //изменение клиента
+                _clientLogic.Update(model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка обновления данных");
+                throw;
+            }
+        }
 
-		[HttpPost]
-		public void UpdateData(ClientBindingModel model)
-		{
-			try
-			{
-				// Изменение данных о клиенте
-				_clientLogic.Update(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка обновления данных");
-				throw;
-			}
-		}
+        [HttpGet]
+        public List<DebitingViewModel>? getUsersDebitings(int userId) {
+            try
+            {
+                return _debitingLogic.ReadList(new DebitingSearchModel()
+                {
+                    UserId = userId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения пользователей");
+                throw;
+            }
+        }
 
-		[HttpGet]
-		public List<DebitingViewModel>? getClientsDebitings(int clientId)
-		{
-			try
-			{
-				return _debitingLogic.ReadList(new DebitingSearchModel()
-				{
-					ClientId = clientId
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения пользователей");
-				throw;
-			}
-		}
+        [HttpGet]
+        public List<CreditingViewModel>? getUsersCreditings(int userId)
+        {
+            try
+            {
+                return _creditingLogic.ReadList(new CreditingSearchModel()
+                {
+                    UserId = userId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения пользователей");
+                throw;
+            }
+        }
 
-		[HttpGet]
-		public List<CreditingViewModel>? getClientsCreditings(int clientId)
-		{
-			try
-			{
-				return _creditingLogic.ReadList(new CreditingSearchModel()
-				{
-					ClientId = clientId
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения пользователей");
-				throw;
-			}
-		}
-	}
+    }
 }
diff --git a/Bank/BankRestAPI/Controllers/ReportController.cs b/Bank/BankRestAPI/Controllers/ReportController.cs
index 4fefabb..9015947 100644
--- a/Bank/BankRestAPI/Controllers/ReportController.cs
+++ b/Bank/BankRestAPI/Controllers/ReportController.cs
@@ -6,239 +6,248 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace BankRestAPI.Controllers
 {
+    //указание у контроллера, что Route будет строиться не только по наванию контроллера, но и по названию метода (так как у нас два Post-метода)
     [Route("api/[controller]/[action]")]
-    [ApiController]
-    public class ReportController : Controller
+	[ApiController]
+	public class ReportController : Controller
 	{
-        private readonly ILogger _logger;
+		private readonly ILogger _logger;
 
-        private readonly IReportClientLogic _reportClientLogic;
+		private readonly IReportClientLogic _reportClientLogic;
 
-        private readonly IReportCashierLogic _reportCashierLogic;
+		private readonly IReportCashierLogic _reportCashierLogic;
 
-        //хранят данные для отображения отчёта на вебе
-        private ReportClientViewModelForHTML _reportClientViewModelForHTML;
+		//хранят данные для отображения отчёта на вебе
+		private ReportClientViewModelForHTML _reportClientViewModelForHTML;
 
-        private ReportCashierViewModelForHTML _reportCashierViewModelForHTML;
+		private ReportCashierViewModelForHTML _reportCashierViewModelForHTML;
 
-        public ReportController(ILogger<ReportController> logger, IReportClientLogic reportClientLogic, IReportCashierLogic reportCashierLogic)
-        {
-            _logger = logger;
-            _reportClientLogic = reportClientLogic;
-            _reportCashierLogic = reportCashierLogic;
-        }
+		public ReportController(ILogger<ReportController> logger, IReportClientLogic reportClientLogic, IReportCashierLogic reportCashierLogic)
+		{
+			_logger = logger;
+			_reportClientLogic = reportClientLogic;
+			_reportCashierLogic = reportCashierLogic;
+		}
 
+		#region Работа с pdf
 
-        //метод генерации отчёта за период по картам клиента
-        [HttpPost]
-        public ReportClientViewModelForHTML CreateClientReport(ReportSupportBindingModel model)
-        {
-            try
-            {
-                var result = _reportClientLogic.SaveClientReportToPdfFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт_по_картам.pdf",
-                    DateFrom = model.DateFrom,
-                    DateTo = model.DateTo,
-                    Role = MailsEnum.Клиент,
-                    Email = model.Email
-                });
+		//метод генерации отчёта за период по картам клиента
+		[HttpPost]
+		public ReportClientViewModelForHTML CreateClientReport(ReportSupportBindingModel model)
+		{
+			try
+			{
+				var result = _reportClientLogic.SaveClientReportToPdfFile(new ReportBindingModel
+				{
+					FileName = "Отчёт_по_картам.pdf",
+					DateFrom = model.DateFrom,
+					DateTo = model.DateTo,
+					Role = MailsEnum.Клиент,
+					Email = model.Email
+				});
 
-                return result;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+				return result;
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
 
-        //метод генерации отчёта по всем счетм клиентов
-        [HttpPost]
-        public ReportCashierViewModelForHTML CreateCashierReport(ReportSupportBindingModel model)
-        {
-            try
-            {
-                var result = _reportCashierLogic.SaveAccountsToPdfFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт_по_счетам.pdf",
-                    ClientId = model.ClientId,
-                    DateFrom = model.DateFrom,
-                    DateTo = model.DateTo,
+		//метод генерации отчёта по всем счетм клиентов
+		[HttpPost]
+		public ReportCashierViewModelForHTML CreateCashierReport(ReportSupportBindingModel model)
+		{
+			try
+			{
+				var result  = _reportCashierLogic.SaveAccountsToPdfFile(new ReportBindingModel
+				{
+					FileName = "Отчёт_по_счетам.pdf",
+					ClientId = model.ClientId,
+					DateFrom = model.DateFrom,
+					DateTo = model.DateTo,
                     Role = MailsEnum.Кассир,
-                    Email = model.Email
+					Email = model.Email
                 });
 
-                return result;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+				return result;
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
 
+		#endregion
 
-        //отчёт клиента Excel по переводу денег
-        [HttpPost]
-        public void CreateExcelClient(ReportSupportBindingModel model)
-        {
-            try
-            {
-                _reportClientLogic.SaveToExcelFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт по переводам.xlsx",
-                    CardList = model.CardList,
-                    Email = model.Email
-                }, OfficeOperationEnum.Между_cчетами);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+		#region Работа с Excel
 
-        //отчёт клиента Excel по переводу денег
-        [HttpPost]
-        public void CreateExcelCrediting(ReportSupportBindingModel model)
-        {
-            try
-            {
-                _reportClientLogic.SaveToExcelFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт по пополнениям.xlsx",
-                    CardList = model.CardList,
-                    Email = model.Email
-                }, OfficeOperationEnum.Пополнение_карт);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+		//отчёт клиента Excel по переводу денег
+		[HttpPost]
+		public void CreateExcelClient(ReportSupportBindingModel model)
+		{
+			try
+			{
+				_reportClientLogic.SaveToExcelFile(new ReportBindingModel
+				{
+					FileName = "Отчёт по переводам.xlsx",
+					CardList = model.CardList,
+					Email = model.Email
+				}, OfficeOperationEnum.Между_cчетами);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
 
-        //отчёт клиента Excel по выдаче денег
-        [HttpPost]
-        public void CreateExcelDebiting(ReportSupportBindingModel model)
-        {
-            try
-            {
-                _reportClientLogic.SaveToExcelFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт по снятиям.xlsx",
-                    CardList = model.CardList,
-                    Email = model.Email
-                }, OfficeOperationEnum.Cнятие_с_карты);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+		//отчёт клиента Excel по переводу денег
+		[HttpPost]
+		public void CreateExcelCrediting(ReportSupportBindingModel model)
+		{
+			try
+			{
+				_reportClientLogic.SaveToExcelFile(new ReportBindingModel
+				{
+					FileName = "Отчёт по пополнениям.xlsx",
+					CardList = model.CardList,
+					Email = model.Email
+				}, OfficeOperationEnum.Пополнение_карт);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
 
-        //отчёт клиента Excel по переводу денег
-        [HttpPost]
-        public void CreateExcelCashier(ReportSupportBindingModel model)
-        {
-            try
-            {
-                _reportCashierLogic.SaveAccountsToExcelFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт по зявкам на снятие.xlsx",
-                    AccountId = model.AccountId,
-                    Email = model.Email
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+		//отчёт клиента Excel по выдаче денег
+		[HttpPost]
+		public void CreateExcelDebiting(ReportSupportBindingModel model)
+		{
+			try
+			{
+				_reportClientLogic.SaveToExcelFile(new ReportBindingModel
+				{
+					FileName = "Отчёт по снятиям.xlsx",
+					CardList = model.CardList,
+					Email = model.Email
+				}, OfficeOperationEnum.Cнятие_с_карты);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
 
+		//отчёт клиента Excel по переводу денег
+		[HttpPost]
+		public void CreateExcelCashier(ReportSupportBindingModel model)
+		{
+			try
+			{
+				_reportCashierLogic.SaveAccountsToExcelFile(new ReportBindingModel
+				{
+					FileName = "Отчёт по зявкам на снятие.xlsx",
+					AccountId = model.AccountId,
+					Email = model.Email
+				});
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
 
-        //отчёт клиента Word по переводу денег
-        [HttpPost]
-        public void CreateWordClient(ReportSupportBindingModel model)
-        {
-            try
-            {
-                _reportClientLogic.SaveToWordFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт по переводам.docx",
-                    CardList = model.CardList,
-                    Email = model.Email
-                }, OfficeOperationEnum.Между_cчетами);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+		#endregion
 
-        //отчёт клиента Word по переводу денег
-        [HttpPost]
-        public void CreateWordCrediting(ReportSupportBindingModel model)
-        {
-            try
-            {
-                _reportClientLogic.SaveToWordFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт по пополнениям.docx",
-                    CardList = model.CardList,
-                    Email = model.Email
-                }, OfficeOperationEnum.Пополнение_карт);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+		#region Работа с word
 
-        //отчёт клиента Word по выдаче денег
-        [HttpPost]
-        public void CreateWordDebiting(ReportSupportBindingModel model)
-        {
-            try
-            {
-                _reportClientLogic.SaveToWordFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт по снятиям.docx",
-                    CardList = model.CardList,
-                    Email = model.Email
-                }, OfficeOperationEnum.Cнятие_с_карты);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+		//отчёт клиента Word по переводу денег
+		[HttpPost]
+		public void CreateWordClient(ReportSupportBindingModel model)
+		{
+			try
+			{
+				_reportClientLogic.SaveToWordFile(new ReportBindingModel
+				{
+					FileName = "Отчёт по переводам.docx",
+					CardList = model.CardList,
+					Email = model.Email
+				}, OfficeOperationEnum.Между_cчетами);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
 
-        //отчёт клиента Word по переводу денег
-        [HttpPost]
-        public void CreateWordCashier(ReportSupportBindingModel model)
-        {
-            try
-            {
-                _reportCashierLogic.SaveAccountsToWordFile(new ReportBindingModel
-                {
-                    FileName = "Отчёт по зявкам на снятие.docx",
-                    AccountId = model.AccountId,
-                    Email = model.Email
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка входа в систему");
-                throw;
-            }
-        }
+		//отчёт клиента Word по переводу денег
+		[HttpPost]
+		public void CreateWordCrediting(ReportSupportBindingModel model)
+		{
+			try
+			{
+				_reportClientLogic.SaveToWordFile(new ReportBindingModel
+				{
+					FileName = "Отчёт по пополнениям.docx",
+					CardList = model.CardList,
+					Email = model.Email
+				}, OfficeOperationEnum.Пополнение_карт);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
 
-    }
+		//отчёт клиента Word по выдаче денег
+		[HttpPost]
+		public void CreateWordDebiting(ReportSupportBindingModel model)
+		{
+			try
+			{
+				_reportClientLogic.SaveToWordFile(new ReportBindingModel
+				{
+					FileName = "Отчёт по снятиям.docx",
+					CardList = model.CardList,
+					Email = model.Email
+				}, OfficeOperationEnum.Cнятие_с_карты);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
+
+		//отчёт клиента Word по переводу денег
+		[HttpPost]
+		public void CreateWordCashier(ReportSupportBindingModel model)
+		{
+			try
+			{
+				_reportCashierLogic.SaveAccountsToWordFile(new ReportBindingModel
+				{
+					FileName = "Отчёт по зявкам на снятие.docx",
+					AccountId = model.AccountId,
+					Email = model.Email
+				});
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
+
+		#endregion
+	}
 }
diff --git a/Bank/BankRestAPI/Program.cs b/Bank/BankRestAPI/Program.cs
index bb318f1..d87d600 100644
--- a/Bank/BankRestAPI/Program.cs
+++ b/Bank/BankRestAPI/Program.cs
@@ -1,8 +1,6 @@
-
-
-using BankBusinessLogic.BusinessLogic.Cashier;
-using BankBusinessLogic.BusinessLogic.Client;
-using BankBusinessLogic.BusinessLogic.Reports;
+using BankBusinessLogic.BusinessLogics.Cashier;
+using BankBusinessLogic.BusinessLogics.Client;
+using BankBusinessLogic.BusinessLogics.Reports;
 using BankBusinessLogic.MailWorker;
 using BankBusinessLogic.OfficePackage;
 using BankBusinessLogic.OfficePackage.Implements;
@@ -10,18 +8,20 @@ using BankContracts.BindingModels.Messages;
 using BankContracts.BusinessLogicsContracts.Cashier;
 using BankContracts.BusinessLogicsContracts.Client;
 using BankContracts.BusinessLogicsContracts.Reports;
-using BankContracts.StoragesModels.Cashier;
-using BankContracts.StoragesModels.Client;
+using BankContracts.StoragesContracts.Cashier;
+using BankContracts.StoragesContracts.Client;
+using BankDatabaseImplement.Implements;
 using BankDatabaseImplement.Implements.CashierImplements;
 using BankDatabaseImplement.Implements.ClientImplements;
+using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateBuilder(args);
 
-
 builder.Logging.SetMinimumLevel(LogLevel.Trace);
 builder.Logging.AddLog4Net("log4net.config");
 
 // Add services to the container.
+
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<ICashierStorage, CashierStorage>();
 builder.Services.AddTransient<IAccountStorage, AccountStorage>();
@@ -51,12 +51,18 @@ builder.Services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
 builder.Services.AddTransient<AbstractSaveToWord, SaveToWord>();
 
 builder.Services.AddControllers();
+
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+
+builder.Services.AddSwaggerGen(c =>
+{
+    c.SwaggerDoc("v1", new OpenApiInfo { Title = "BankRestAPI", Version = "v1" });
+});
 
 var app = builder.Build();
 
+//Mails Service
 var mailSender = app.Services.GetService<MailKitWorker>();
 
 mailSender?.MailConfig(new MailConfigBindingModel
@@ -70,8 +76,9 @@ mailSender?.MailConfig(new MailConfigBindingModel
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-	app.UseSwagger();
-	app.UseSwaggerUI();
+    app.UseSwagger();
+
+    app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "BankRestAPI v1"));
 }
 
 app.UseHttpsRedirection();
@@ -80,4 +87,4 @@ app.UseAuthorization();
 
 app.MapControllers();
 
-app.Run();
+app.Run();
\ No newline at end of file
diff --git a/Bank/BankRestAPI/appsettings.json b/Bank/BankRestAPI/appsettings.json
index 10f68b8..c166fec 100644
--- a/Bank/BankRestAPI/appsettings.json
+++ b/Bank/BankRestAPI/appsettings.json
@@ -5,5 +5,12 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+
+  "SmtpClientHost": "smtp.gmail.com",
+  "SmtpClientPort": "587",
+  "PopHost": "pop.gmail.com",
+  "PopPort": "995",
+  "MailLogin": "furniturecoup73@gmail.com",
+  "MailPassword": "hwba frfa mmbo bpji"
 }