nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 09:02:48 -05:00
Code Activity

add billing info to admin edit page

Browse Source
This commit is contained in:
Kyle Spearrin
2019-02-25 10:39:04 -05:00
parent b229985256
commit 7ee8c0a240
9 changed files with 106 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Admin/Models/OrganizationEditModel.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Bit.Core;
using Bit.Core.Enums;
using Bit.Core.Models.Business;
using Bit.Core.Models.Data;
using Bit.Core.Models.Table;
using Bit.Core.Utilities;
@ -14,9 +15,10 @@ namespace Bit.Admin.Models
public OrganizationEditModel() { }
public OrganizationEditModel(Organization org, IEnumerable<OrganizationUserUserDetails> orgUsers,
GlobalSettings globalSettings)
BillingInfo billingInfo, GlobalSettings globalSettings)
: base(org, orgUsers)
{
BillingInfo = billingInfo;
BraintreeMerchantId = globalSettings.Braintree.MerchantId;
Name = org.Name;
@ -42,6 +44,7 @@ namespace Bit.Admin.Models
ExpirationDate = org.ExpirationDate;
}
public BillingInfo BillingInfo { get; set; }
public string RandomLicenseKey => CoreHelpers.SecureRandomString(20);
public string FourteenDayExpirationDate => DateTime.Now.AddDays(14).ToString("yyyy-MM-ddTHH:mm");
public string BraintreeMerchantId { get; set; }