nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 16:12:49 -05:00
Code Activity

[EC-429] Provider details screen updated with Type, BillingPhone and Organization details (#2666)

Browse Source
This commit is contained in:
Rui Tomé
2023-02-07 10:31:50 +00:00
committed by GitHub
parent 7290776871
commit f331188763
4 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Admin/Models/ProviderEditModel.cs
View File

@ -14,10 +14,13 @@ public class ProviderEditModel : ProviderViewModel
Name = provider.Name;
BusinessName = provider.BusinessName;
BillingEmail = provider.BillingEmail;
BillingPhone = provider.BillingPhone;
}
[Display(Name = "Billing Email")]
public string BillingEmail { get; set; }
[Display(Name = "Billing Phone Number")]
public string BillingPhone { get; set; }
[Display(Name = "Business Name")]
public string BusinessName { get; set; }
public string Name { get; set; }
@ -28,6 +31,7 @@ public class ProviderEditModel : ProviderViewModel
existingProvider.Name = Name;
existingProvider.BusinessName = BusinessName;
existingProvider.BillingEmail = BillingEmail?.ToLowerInvariant()?.Trim();
existingProvider.BillingPhone = BillingPhone?.ToLowerInvariant()?.Trim();
return existingProvider;
}
}

8
src/Admin/Views/Providers/Edit.cshtml
View File

@ -36,6 +36,14 @@
</div>
</div>
</div>
<div class="row">
<div class="col-sm">
<div class="form-group">
<label asp-for="BillingPhone"></label>
<input type="tel" class="form-control" asp-for="BillingPhone">
</div>
</div>
</div>
</form>
@await Html.PartialAsync("Organizations", Model)
<div class="d-flex mt-4">

29
src/Admin/Views/Providers/Organizations.cshtml
View File

@ -6,7 +6,14 @@
<table class="table table-striped table-hover">
<thead>
<tr>
<th>Name</th>
<th style="width: 50%;">Name</th>
<th style="width: 50%;">Status</th>
<th>
<div class="float-right text-nowrap">
<a asp-controller="Organizations" asp-action="Create" asp-route-providerId="@Model.Provider.Id" class="btn btn-sm btn-primary">New Organization</a>
<a asp-controller="Providers" asp-action="AddExistingOrganization" asp-route-id="@Model.Provider.Id" class="btn btn-sm btn-outline-primary">Add Existing Organization</a>
</div>
</th>
</tr>
</thead>
<tbody>
@ -22,8 +29,24 @@
{
<tr>
<td class="align-middle">
<a asp-controller="Organizations" asp-action="Edit"
asp-route-id="@org.OrganizationId">@org.OrganizationName</a>
<a asp-controller="Organizations" asp-action="Edit" asp-route-id="@org.OrganizationId">@org.OrganizationName</a>
</td>
<td>
@org.Status
</td>
<td>
<div class="float-right">
@if (org.Status == OrganizationStatusType.Pending)
{
<a asp-controller="Organizations" asp-action="ResendInvite" asp-route-id="@org.Id" class="float-right">
<i class="fa fa-envelope-o fa-lg" title="Resend Setup Invite"></i>
</a>
}
else
{
<i class="fa fa-envelope-o fa-lg text-secondary"></i>
}
</div>
</td>
</tr>
}

8
src/Admin/Views/Providers/_ViewInformation.cshtml
View File

@ -1,4 +1,5 @@
@model ProviderViewModel
@using Bit.SharedWeb.Utilities
@model ProviderViewModel
<dl class="row">
<dt class="col-sm-4 col-lg-3">Id</dt>
<dd class="col-sm-8 col-lg-9"><code>@Model.Provider.Id</code></dd>
@ -7,7 +8,10 @@
<dd class="col-sm-8 col-lg-9">@Model.Provider.Status</dd>
<dt class="col-sm-4 col-lg-3">Users</dt>
<dd class="col-sm-8 col-lg-9">@Model.UserCount</dd>
<dd class="col-sm-8 col-lg-9">@(Model.Provider.Type == ProviderType.Reseller ? "N/A" : Model.UserCount)</dd>
<dt class="col-sm-4 col-lg-3">Provider Type</dt>
<dd class="col-sm-8 col-lg-9">@(Model.Provider.Type.GetDisplayAttribute()?.GetName())</dd>
<dt class="col-sm-4 col-lg-3">Created</dt>
<dd class="col-sm-8 col-lg-9">@Model.Provider.CreationDate.ToString()</dd>