Compare commits

..

No commits in common. "783d623015937ddc8bdc6b6251c8b468f89e14bd" and "35268379e41fac27649ece9ced7183521a73de75" have entirely different histories.

6 changed files with 9 additions and 11 deletions

View File

@ -8,7 +8,6 @@ using BankDataModels.Models;
using MailKit; using MailKit;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata;
using MigraDoc.DocumentObjectModel.Tables;
using OperatorApp.Models; using OperatorApp.Models;
using System.Diagnostics; using System.Diagnostics;
@ -237,7 +236,7 @@ namespace OperatorApp.Controllers
return View(); return View();
} }
[HttpPost] [HttpPost]
public void CreateTransfer(int amount, int payment) public void CreateTransfer(string amount, int payment)
{ {
if (HomeController.Operator == null) if (HomeController.Operator == null)
{ {
@ -376,9 +375,8 @@ namespace OperatorApp.Controllers
var currency = _currencyLogic.ReadElement(new CurrencySearchModel { Id = currencyId }); var currency = _currencyLogic.ReadElement(new CurrencySearchModel { Id = currencyId });
if (currency != null) updCurrencies.Add(currencyId, currency); if (currency != null) updCurrencies.Add(currencyId, currency);
} }
Dictionary<int, IDealModel> DealPayments = paymentModel.DealPayments; _paymentLogic.Update(new PaymentBindingModel { Id = paymentModel.Id, PaymentDate = paymentModel.PaymentDate, CurrencyPayments = updCurrencies });
_paymentLogic.Update(new PaymentBindingModel { Id = paymentModel.Id, PaymentDate = paymentModel.PaymentDate, CurrencyPayments = updCurrencies, DealPayments = DealPayments }); Response.WriteAsync($"<script language=\"javascript\">alert('Success!');window.location.replace('/Home/Enter');</script>");
Response.WriteAsync($"<script language=\"javascript\">alert('Success!');window.location.replace('/');</script>");
Redirect("/"); Redirect("/");
} }
} }

View File

@ -7,7 +7,7 @@
<form method="post"> <form method="post">
<div class="row"> <div class="row">
<div class="col-4">ID клиента:</div> <div class="col-4">ID клиента:</div>
<div class="col-8"><input required type="number" name="clientid" id="clientid" required/></div> <div class="col-8"><input type="text" name="clientid" id="clientid" required/></div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-8"></div> <div class="col-8"></div>

View File

@ -8,7 +8,7 @@
<div class="row"> <div class="row">
<div class="col-4">Сделки:</div> <div class="col-4">Сделки:</div>
<div class="col-8"> <div class="col-8">
<select required id="deals" name="deals" class="form-control" multiple asp-items="@(new SelectList(@ViewBag.Deals,"Id", "DealDate"))"></select> <select id="deals" name="deals" class="form-control" multiple asp-items="@(new SelectList(@ViewBag.Deals,"Id", "DealDate"))"></select>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

View File

@ -8,12 +8,12 @@
<div class="row"> <div class="row">
<div class="col-4">Выплата:</div> <div class="col-4">Выплата:</div>
<div class="col-8"> <div class="col-8">
<select required id="payment" name="payment" class="form-control" asp-items="@(new SelectList(@ViewBag.Payments,"Id", "Id"))"></select> <select id="payment" name="payment" class="form-control" asp-items="@(new SelectList(@ViewBag.Payments,"Id", "Id"))"></select>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-4">Сумма:</div> <div class="col-4">Сумма:</div>
<div class="col-8"><input required type="number" min="1" name="amount" id="amount" /></div> <div class="col-8"><input type="text" name="amount" id="amount" /></div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-8"></div> <div class="col-8"></div>

View File

@ -8,7 +8,7 @@
<div class="row"> <div class="row">
<div class="col-4">Выплаты:</div> <div class="col-4">Выплаты:</div>
<div class="col-8"> <div class="col-8">
<select required id="payments" name="payments" class="form-control" multiple asp-items="@(new SelectList(@ViewBag.Payments,"Id", "Id"))"></select> <select id="payments" name="payments" class="form-control" multiple asp-items="@(new SelectList(@ViewBag.Payments,"Id", "Id"))"></select>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

View File

@ -31,7 +31,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-4">email:</div> <div class="col-4">email:</div>
<div class="col-8"><input type="email" name="email" id="email" /></div> <div class="col-8"><input type="text" name="email" id="email" /></div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-4">Имя файла (необязательно):</div> <div class="col-4">Имя файла (необязательно):</div>