diff --git a/src/Admin/AdminConsole/Views/Organizations/_ViewInformation.cshtml b/src/Admin/AdminConsole/Views/Organizations/_ViewInformation.cshtml
index b017e7ccb..db2e2c601 100644
--- a/src/Admin/AdminConsole/Views/Organizations/_ViewInformation.cshtml
+++ b/src/Admin/AdminConsole/Views/Organizations/_ViewInformation.cshtml
@@ -1,73 +1,73 @@
@model OrganizationViewModel
- Id
- @Model.Organization.Id
+ @Model.Organization.Id
- Plan
- - @Model.Organization.Plan
+ - @Model.Organization.Plan
- Expires
- - @(Model.Organization.ExpirationDate?.ToString() ?? "-")
+ - @(Model.Organization.ExpirationDate?.ToString() ?? "-")
- Users
- -
+
-
@Model.OccupiedSeatCount / @(Model.Organization.Seats?.ToString() ?? "-")
- (@Model.UserInvitedCount /
- @Model.UserAcceptedCount /
- @Model.UserConfirmedCount)
+ (@Model.UserInvitedCount /
+ @Model.UserAcceptedCount /
+ @Model.UserConfirmedCount)
- Owners
- - @(string.IsNullOrWhiteSpace(Model.Owners) ? "None" : Model.Owners)
+ - @(string.IsNullOrWhiteSpace(Model.Owners) ? "None" : Model.Owners)
- Admins
- - @(string.IsNullOrWhiteSpace(Model.Admins) ? "None" : Model.Admins)
+ - @(string.IsNullOrWhiteSpace(Model.Admins) ? "None" : Model.Admins)
- Using 2FA
- - @(Model.Organization.TwoFactorIsEnabled() ? "Yes" : "No")
+ - @(Model.Organization.TwoFactorIsEnabled() ? "Yes" : "No")
- Groups
- - @Model.GroupCount
+ - @Model.GroupCount
- Policies
- - @Model.PolicyCount
+ - @Model.PolicyCount
- Public/Private Keys
- - @(Model.HasPublicPrivateKeys ? "Yes" : "No")
+ - @(Model.HasPublicPrivateKeys ? "Yes" : "No")
- Created
- - @Model.Organization.CreationDate.ToString()
+ - @Model.Organization.CreationDate.ToString()
- Modified
- - @Model.Organization.RevisionDate.ToString()
+ - @Model.Organization.RevisionDate.ToString()
Password Manager
- Items
- - @Model.CipherCount
+ - @Model.CipherCount
- Collections
- - @Model.CollectionCount
+ - @Model.CollectionCount
- Administrators manage all collections
- - @(Model.Organization.AllowAdminAccessToAllCollectionItems ? "On" : "Off")
+ - @(Model.Organization.AllowAdminAccessToAllCollectionItems ? "On" : "Off")
- Limit collection creation to administrators
- - @(Model.Organization.LimitCollectionCreationDeletion ? "On" : "Off")
+ - @(Model.Organization.LimitCollectionCreationDeletion ? "On" : "Off")
Secrets Manager
- Secrets
- - @(Model.UseSecretsManager ? Model.SecretsCount: "N/A")
+ - @(Model.UseSecretsManager ? Model.SecretsCount: "N/A")
- Projects
- - @(Model.UseSecretsManager ? Model.ProjectsCount: "N/A")
+ - @(Model.UseSecretsManager ? Model.ProjectsCount: "N/A")
- Machine Accounts
- - @(Model.UseSecretsManager ? Model.ServiceAccountsCount: "N/A")
+ - @(Model.UseSecretsManager ? Model.ServiceAccountsCount: "N/A")
- Secrets Manager Seats
- - @(Model.UseSecretsManager ? Model.OccupiedSmSeatsCount: "N/A" )
+ - @(Model.UseSecretsManager ? Model.OccupiedSmSeatsCount: "N/A" )
diff --git a/src/Admin/Views/Shared/_BillingInformation.cshtml b/src/Admin/Views/Shared/_BillingInformation.cshtml
index bdae3c421..0307562e4 100644
--- a/src/Admin/Views/Shared/_BillingInformation.cshtml
+++ b/src/Admin/Views/Shared/_BillingInformation.cshtml
@@ -11,8 +11,8 @@
}
- - Account @(Model.BillingInfo.Balance <= 0 ? "Credit" : "Balance")
- - @Math.Abs(Model.BillingInfo.Balance).ToString("C")
+ - Account @(Model.BillingInfo.Balance <= 0 ? "Credit" : "Balance")
+ - @Math.Abs(Model.BillingInfo.Balance).ToString("C")
- Invoices
-
@@ -20,24 +20,26 @@
{
- @foreach(var invoice in Model.BillingHistoryInfo.Invoices)
- {
-
- @invoice.Date |
- @invoice.Number
+ @{ var invoiceIndex = 0; }
+ @foreach (var invoice in Model.BillingHistoryInfo.Invoices)
+ {
+ |
+ @invoice.Date |
+ @invoice.Number
+ |
+ @invoice.Amount.ToString("C") |
+ @(invoice.Paid ? "Paid" : "Unpaid") |
+ @if (canDownloadInvoice)
+ {
+
+
+
+
|
- @invoice.Amount.ToString("C") |
- @(invoice.Paid ? "Paid" : "Unpaid") |
- @if (canDownloadInvoice)
- {
-
-
-
-
- |
- }
-
- }
+ }
+
+ invoiceIndex++;
+ }
}
@@ -53,23 +55,25 @@
{
- @foreach(var transaction in Model.BillingHistoryInfo.Transactions)
- {
-
- @transaction.CreatedDate |
- @transaction.Type.ToString() |
- @transaction.PaymentMethodType.ToString() |
- @transaction.Details |
- @transaction.Amount.ToString("C") |
- @if (canManageTransactions)
- {
-
-
- |
- }
-
- }
+ @{ var transactionIndex = 0; }
+ @foreach (var transaction in Model.BillingHistoryInfo.Transactions)
+ {
+
+ @transaction.CreatedDate |
+ @transaction.Type.ToString() |
+ @transaction.PaymentMethodType.ToString() |
+ @transaction.Details |
+ @transaction.Amount.ToString("C") |
+ @if (canManageTransactions)
+ {
+
+
+ |
+ }
+
+ transactionIndex++;
+ }
}
@@ -79,7 +83,7 @@
}
@if (canManageTransactions)
{
-
New Transaction