From f33118876343d22ac59bb6762f7dc7f08182faca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Tue, 7 Feb 2023 10:31:50 +0000
Subject: [PATCH] [EC-429] Provider details screen updated with Type,
 BillingPhone and Organization details (#2666)

---
 src/Admin/Models/ProviderEditModel.cs         |  4 +++
 src/Admin/Views/Providers/Edit.cshtml         |  8 +++++
 .../Views/Providers/Organizations.cshtml      | 29 +++++++++++++++++--
 .../Views/Providers/_ViewInformation.cshtml   |  8 +++--
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/Admin/Models/ProviderEditModel.cs b/src/Admin/Models/ProviderEditModel.cs
index 92b2f89e98..2052bf6cfd 100644
--- a/src/Admin/Models/ProviderEditModel.cs
+++ b/src/Admin/Models/ProviderEditModel.cs
@@ -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;
     }
 }
diff --git a/src/Admin/Views/Providers/Edit.cshtml b/src/Admin/Views/Providers/Edit.cshtml
index f9acfb8a43..cdf8c2eccb 100644
--- a/src/Admin/Views/Providers/Edit.cshtml
+++ b/src/Admin/Views/Providers/Edit.cshtml
@@ -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">
diff --git a/src/Admin/Views/Providers/Organizations.cshtml b/src/Admin/Views/Providers/Organizations.cshtml
index 67e327ca04..fb097844c6 100644
--- a/src/Admin/Views/Providers/Organizations.cshtml
+++ b/src/Admin/Views/Providers/Organizations.cshtml
@@ -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>
                         }
diff --git a/src/Admin/Views/Providers/_ViewInformation.cshtml b/src/Admin/Views/Providers/_ViewInformation.cshtml
index 9a3170743d..ff4a2e8106 100644
--- a/src/Admin/Views/Providers/_ViewInformation.cshtml
+++ b/src/Admin/Views/Providers/_ViewInformation.cshtml
@@ -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>