Small fixes.
This commit is contained in:
parent
4c40714bf0
commit
e535ffa3e1
@ -449,10 +449,11 @@ namespace BankYouBankruptCashierApp.Controllers
|
|||||||
CashierSurname = x.CashierSurname,
|
CashierSurname = x.CashierSurname,
|
||||||
Sum = x.Sum,
|
Sum = x.Sum,
|
||||||
AccountPayeeNumber = x.AccountPayeeNumber,
|
AccountPayeeNumber = x.AccountPayeeNumber,
|
||||||
AccountSenderNumber = x.AccountSenderNumber,
|
AccountSenderNumber = x.AccountSenderNumber != null ? x.AccountSenderNumber : "---",
|
||||||
DateOperation = x.DateOperation,
|
DateOperation = x.DateOperation,
|
||||||
typeOperation = x.AccountSenderId.HasValue ? TypeOperationEnum.Перевод : TypeOperationEnum.Пополнение
|
typeOperation = x.AccountSenderId.HasValue ? TypeOperationEnum.Перевод : TypeOperationEnum.Пополнение
|
||||||
});
|
});
|
||||||
|
|
||||||
return View(cashWithdrawals.Concat(moneyTransfers).OrderBy(x => x.DateOperation).ToList());
|
return View(cashWithdrawals.Concat(moneyTransfers).OrderBy(x => x.DateOperation).ToList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
@model List<ReportCashierAccountsViewModel>?
|
@model List<ReportCashierAccountsViewModel>?
|
||||||
|
|
||||||
@{
|
@{
|
||||||
ViewData["Title"] = "Отчет по аккаунтам";
|
ViewData["Title"] = "Отчет по счетам";
|
||||||
}
|
}
|
||||||
|
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
@ -37,10 +37,10 @@
|
|||||||
Кассир
|
Кассир
|
||||||
</th>
|
</th>
|
||||||
<th>
|
<th>
|
||||||
1 Счет
|
Счет отправителя
|
||||||
</th>
|
</th>
|
||||||
<th>
|
<th>
|
||||||
2 Счет
|
Счет получателя
|
||||||
</th>
|
</th>
|
||||||
<th>
|
<th>
|
||||||
Сумма операции
|
Сумма операции
|
||||||
|
@ -13,9 +13,9 @@ namespace BankYouBankruptContracts.ViewModels
|
|||||||
|
|
||||||
public int Sum { get; set; }
|
public int Sum { get; set; }
|
||||||
|
|
||||||
public string AccountSenderNumber { get; set; } = string.Empty;
|
public string AccountSenderNumber { get; set; } = "---";
|
||||||
|
|
||||||
public string AccountPayeeNumber { get; set; } = string.Empty;
|
public string AccountPayeeNumber { get; set; } = "---";
|
||||||
|
|
||||||
public DateTime DateOperation { get; set; } = DateTime.Now;
|
public DateTime DateOperation { get; set; } = DateTime.Now;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user