Identity reloaded
This commit is contained in:
parent
8f8ee6383f
commit
135003a913
33 changed files with 195 additions and 180 deletions
|
|
@ -54,7 +54,7 @@
|
|||
<dt> @Html.DisplayNameFor(m => m.Location)
|
||||
</dt>
|
||||
<dd>@if (Model.Location == null) {
|
||||
<p>Pas de lieu convenu ...</p>
|
||||
<p>Pas de lieu convenu ...</p>
|
||||
} else {
|
||||
<label for="Location">Location</label>
|
||||
@Html.DisplayFor(m => m.Location)
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
</dd>
|
||||
<dt>Notification
|
||||
</dt>
|
||||
<dd>@if (ViewBag.GooglePayload !=null)
|
||||
<dd>@if (ViewBag.GooglePayload !=null)
|
||||
{
|
||||
@if (ViewBag.GooglePayload.success>0) {
|
||||
<h4>GCM Notifications sent</h4>
|
||||
|
|
@ -85,10 +85,10 @@
|
|||
</dt>
|
||||
<dd>@await Component.InvokeAsync("Bill", Model)
|
||||
</dd>
|
||||
|
||||
<dt>@Html.DisplayNameFor(m=>m.Regularisation)</dt>
|
||||
|
||||
<dt>@Html.DisplayNameFor(m=>m.Regularization)</dt>
|
||||
<dd> @await Component.InvokeAsync("PayPalButton", Model)
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
<div class="form-group">
|
||||
<label asp-for="ActivityCode" class="col-md-2 control-label"></label>
|
||||
<div class="col-md-10">
|
||||
<select asp-for="ActivityCode" class ="form-control" asp-items="@ViewBag.ActivityCodeItems" ></select>
|
||||
<select asp-for="ActivityCode" class ="form-control" asp-items="@ViewBag.ActivityCodeItems" ></select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="ClientId" class="col-md-2 control-label"></label>
|
||||
<div class="col-md-10">
|
||||
|
|
@ -57,12 +57,12 @@
|
|||
<div class="col-md-10">
|
||||
<select asp-for="PerformerId" class ="form-control" asp-items="@ViewBag.PerformerIdItems"></select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="Previsional" class="col-md-2 control-label"></label>
|
||||
<label asp-for="Provisional" class="col-md-2 control-label"></label>
|
||||
<div class="col-md-10">
|
||||
<input asp-for="Previsional" class="form-control" />
|
||||
<span asp-validation-for="Previsional" class="text-danger" ></span>
|
||||
<input asp-for="Provisional" class="form-control" />
|
||||
<span asp-validation-for="Provisional" class="text-danger" ></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
|
|
|
|||
|
|
@ -48,10 +48,10 @@
|
|||
@Html.DisplayFor(model => model.OwnerId)
|
||||
</dd>
|
||||
<dt>
|
||||
@Html.DisplayNameFor(model => model.Previsional)
|
||||
@Html.DisplayNameFor(model => model.Provisional)
|
||||
</dt>
|
||||
<dd>
|
||||
@Html.DisplayFor(model => model.Previsional)
|
||||
@Html.DisplayFor(model => model.Provisional)
|
||||
</dd>
|
||||
<dt>
|
||||
@Html.DisplayNameFor(model => model.DateModified)
|
||||
|
|
|
|||
|
|
@ -53,10 +53,10 @@
|
|||
@Html.DisplayFor(model => model.OwnerId)
|
||||
</dd>
|
||||
<dt>
|
||||
@Html.DisplayNameFor(model => model.Previsional)
|
||||
@Html.DisplayNameFor(model => model.Provisional)
|
||||
</dt>
|
||||
<dd>
|
||||
@Html.DisplayFor(model => model.Previsional)
|
||||
@Html.DisplayFor(model => model.Provisional)
|
||||
</dd>
|
||||
<dt>
|
||||
@Html.DisplayNameFor(model => model.DateModified)
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="Previsional" class="col-md-2 control-label">Prévisionel</label>
|
||||
<label asp-for="Provisional" class="col-md-2 control-label">Prévisionel</label>
|
||||
<div class="col-md-10">
|
||||
<input asp-for="Previsional" class="form-control" />
|
||||
<span asp-validation-for="Previsional" class="text-danger" ></span>
|
||||
<input asp-for="Provisional" class="form-control" />
|
||||
<span asp-validation-for="Provisional" class="text-danger" ></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
@Html.DisplayNameFor(model => model.OwnerId)
|
||||
</th>
|
||||
<th>
|
||||
@Html.DisplayNameFor(model => model.Previsional)
|
||||
@Html.DisplayNameFor(model => model.Provisional)
|
||||
</th>
|
||||
<th>
|
||||
@Html.DisplayNameFor(model => model.DateModified)
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
@Html.DisplayFor(modelItem => item.OwnerId)
|
||||
</td>
|
||||
<td>
|
||||
@Html.DisplayFor(modelItem => item.Previsional)
|
||||
@Html.DisplayFor(modelItem => item.Provisional)
|
||||
</td>
|
||||
<td>
|
||||
@Html.DisplayFor(modelItem => item.DateModified)
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
@model NominativeServiceCommand
|
||||
|
||||
@if (Model!=null && Model.PaymentId!=null) {
|
||||
|
||||
@if (Model.Regularisation.Executor.Id == User.GetUserId()) {
|
||||
|
||||
@if (Model.Regularization.Executor.Id == User.GetUserId()) {
|
||||
<text>
|
||||
Votre paiment
|
||||
</text>
|
||||
} else {
|
||||
<text>
|
||||
Le paiment de @Html.DisplayFor(m=>m.Regularisation.Executor.UserName)
|
||||
Le paiment de @Html.DisplayFor(m=>m.Regularization.Executor.UserName)
|
||||
</text>
|
||||
}
|
||||
<text> :
|
||||
<text> :
|
||||
|
||||
</text>
|
||||
<label>@Model.GetIsAcquitted()
|
||||
<input type="checkbox" checked="@Model.GetIsAcquitted()" disabled/>
|
||||
<a asp-controller="Manage" asp-action="PaymentInfo" asp-route-id="@Model.Regularisation.CreationToken">@Model.Regularisation.CreationToken</a>
|
||||
<input type="checkbox" checked="@Model.GetIsAcquitted()" disabled/>
|
||||
<a asp-controller="Manage" asp-action="PaymentInfo" asp-route-id="@Model.Regularization.CreationToken">@Model.Regularization.CreationToken</a>
|
||||
</label>
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@if (!Model.GetIsAcquitted()) {
|
||||
<div id="paypalzone"></div>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@
|
|||
</dt>
|
||||
<dd>@await Component.InvokeAsync("Bill", Model)
|
||||
</dd>
|
||||
<dt>@Html.DisplayNameFor(m=>m.Regularisation)</dt>
|
||||
<dd>
|
||||
<dt>@Html.DisplayNameFor(m=>m.Regularization)</dt>
|
||||
<dd>
|
||||
@await Component.InvokeAsync("PayPalButton", Model)
|
||||
</dd>
|
||||
</dl>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue