From 3b8552b2fac2fc6c1d68fec88304ed3470ce2ac9 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 25 Feb 2019 12:43:20 -0500 Subject: [PATCH] billing info and tx management tools --- src/Admin/Admin.csproj | 3 + src/Admin/Controllers/ToolsController.cs | 63 +++++++++- src/Admin/Models/BillingInformationModel.cs | 12 ++ .../Models/CreateUpdateTransactionModel.cs | 80 +++++++++++++ src/Admin/Models/TransactionViewModel.cs | 19 --- src/Admin/Models/UserEditModel.cs | 2 +- src/Admin/Sass/site.scss | 4 + src/Admin/Views/Organizations/Edit.cshtml | 3 +- .../Views/Shared/_BillingInformation.cshtml | 29 +++-- src/Admin/Views/Shared/_Layout.cshtml | 3 + src/Admin/Views/Tools/ChargeBraintree.cshtml | 2 +- .../Tools/CreateUpdateTransaction.cshtml | 109 ++++++++++++++++++ src/Admin/Views/Users/Edit.cshtml | 3 +- src/Core/Models/Business/BillingInfo.cs | 2 + 14 files changed, 302 insertions(+), 32 deletions(-) create mode 100644 src/Admin/Models/BillingInformationModel.cs create mode 100644 src/Admin/Models/CreateUpdateTransactionModel.cs delete mode 100644 src/Admin/Models/TransactionViewModel.cs create mode 100644 src/Admin/Views/Tools/CreateUpdateTransaction.cshtml diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj index d06d5ee310..898dfd7ff8 100644 --- a/src/Admin/Admin.csproj +++ b/src/Admin/Admin.csproj @@ -20,6 +20,9 @@ $(IncludeRazorContentInPack) + + $(IncludeRazorContentInPack) + diff --git a/src/Admin/Controllers/ToolsController.cs b/src/Admin/Controllers/ToolsController.cs index 5cb4247086..c1604bebe7 100644 --- a/src/Admin/Controllers/ToolsController.cs +++ b/src/Admin/Controllers/ToolsController.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Bit.Admin.Models; using Bit.Core; +using Bit.Core.Repositories; using Bit.Core.Utilities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -14,10 +15,14 @@ namespace Bit.Admin.Controllers public class ToolsController : Controller { private readonly GlobalSettings _globalSettings; + private readonly ITransactionRepository _transactionRepository; - public ToolsController(GlobalSettings globalSettings) + public ToolsController( + GlobalSettings globalSettings, + ITransactionRepository transactionRepository) { _globalSettings = globalSettings; + _transactionRepository = transactionRepository; } public IActionResult ChargeBraintree() @@ -76,5 +81,61 @@ namespace Bit.Admin.Controllers } return View(model); } + + public IActionResult CreateTransaction(Guid? organizationId = null, Guid? userId = null) + { + return View("CreateUpdateTransaction", new CreateUpdateTransactionModel + { + OrganizationId = organizationId, + UserId = userId + }); + } + + [HttpPost] + public async Task CreateTransaction(CreateUpdateTransactionModel model) + { + if(!ModelState.IsValid) + { + return View("CreateUpdateTransaction", model); + } + + await _transactionRepository.CreateAsync(model.ToTransaction()); + if(model.UserId.HasValue) + { + return RedirectToAction("Edit", "Users", new { id = model.UserId }); + } + else + { + return RedirectToAction("Edit", "Organizations", new { id = model.OrganizationId }); + } + } + + public async Task EditTransaction(Guid id) + { + var transaction = await _transactionRepository.GetByIdAsync(id); + if(transaction == null) + { + return RedirectToAction("Index", "Home"); + } + return View("CreateUpdateTransaction", new CreateUpdateTransactionModel(transaction)); + } + + [HttpPost] + public async Task EditTransaction(Guid id, CreateUpdateTransactionModel model) + { + if(!ModelState.IsValid) + { + return View("CreateUpdateTransaction", model); + } + await _transactionRepository.ReplaceAsync(model.ToTransaction(id)); + if(model.UserId.HasValue) + { + return RedirectToAction("Edit", "Users", new { id = model.UserId }); + } + else + { + return RedirectToAction("Edit", "Organizations", new { id = model.OrganizationId }); + } + } } } diff --git a/src/Admin/Models/BillingInformationModel.cs b/src/Admin/Models/BillingInformationModel.cs new file mode 100644 index 0000000000..317a9e8f1e --- /dev/null +++ b/src/Admin/Models/BillingInformationModel.cs @@ -0,0 +1,12 @@ +using System; +using Bit.Core.Models.Business; + +namespace Bit.Admin.Models +{ + public class BillingInformationModel + { + public BillingInfo BillingInfo { get; set; } + public Guid? UserId { get; set; } + public Guid? OrganizationId { get; set; } + } +} diff --git a/src/Admin/Models/CreateUpdateTransactionModel.cs b/src/Admin/Models/CreateUpdateTransactionModel.cs new file mode 100644 index 0000000000..7f35b01142 --- /dev/null +++ b/src/Admin/Models/CreateUpdateTransactionModel.cs @@ -0,0 +1,80 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using Bit.Core.Enums; +using Bit.Core.Models.Table; + +namespace Bit.Admin.Models +{ + public class CreateUpdateTransactionModel : IValidatableObject + { + public CreateUpdateTransactionModel() { } + + public CreateUpdateTransactionModel(Transaction transaction) + { + Edit = true; + UserId = transaction.UserId; + OrganizationId = transaction.OrganizationId; + Amount = transaction.Amount; + RefundedAmount = transaction.RefundedAmount; + Refunded = transaction.Refunded.GetValueOrDefault(); + Details = transaction.Details; + Date = transaction.CreationDate; + PaymentMethod = transaction.PaymentMethodType; + Gateway = transaction.Gateway; + GatewayId = transaction.GatewayId; + Type = transaction.Type; + } + + public bool Edit { get; set; } + + [Display(Name = "User Id")] + public Guid? UserId { get; set; } + [Display(Name = "Organization Id")] + public Guid? OrganizationId { get; set; } + [Required] + public decimal? Amount { get; set; } + [Display(Name = "Refunded Amount")] + public decimal? RefundedAmount { get; set; } + public bool Refunded { get; set; } + [Required] + public string Details { get; set; } + [Required] + public DateTime? Date { get; set; } + [Display(Name = "Payment Method")] + public PaymentMethodType? PaymentMethod { get; set; } + public GatewayType? Gateway { get; set; } + [Display(Name = "Gateway Id")] + public string GatewayId { get; set; } + [Required] + public TransactionType? Type { get; set; } + + + public IEnumerable Validate(ValidationContext validationContext) + { + if((!UserId.HasValue && !OrganizationId.HasValue) || (UserId.HasValue && OrganizationId.HasValue)) + { + yield return new ValidationResult("Must provide either User Id, or Organization Id."); + } + } + + public Transaction ToTransaction(Guid? id = null) + { + return new Transaction + { + Id = id.GetValueOrDefault(), + UserId = UserId, + OrganizationId = OrganizationId, + Amount = Amount.Value, + RefundedAmount = RefundedAmount, + Refunded = Refunded ? true : (bool?)null, + Details = Details, + CreationDate = Date.Value, + PaymentMethodType = PaymentMethod, + Gateway = Gateway, + GatewayId = GatewayId, + Type = Type.Value + }; + } + } +} diff --git a/src/Admin/Models/TransactionViewModel.cs b/src/Admin/Models/TransactionViewModel.cs deleted file mode 100644 index a1a87530eb..0000000000 --- a/src/Admin/Models/TransactionViewModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Bit.Core.Models.Table; - -namespace Bit.Admin.Models -{ - public class TransactionViewModel - { - public TransactionViewModel() { } - - public TransactionViewModel(User user, IEnumerable ciphers) - { - - } - - - } -} diff --git a/src/Admin/Models/UserEditModel.cs b/src/Admin/Models/UserEditModel.cs index de8abef55b..036ad31976 100644 --- a/src/Admin/Models/UserEditModel.cs +++ b/src/Admin/Models/UserEditModel.cs @@ -30,7 +30,7 @@ namespace Bit.Admin.Models LicenseKey = user.LicenseKey; PremiumExpirationDate = user.PremiumExpirationDate; } - + public BillingInfo BillingInfo { get; set; } public string RandomLicenseKey => CoreHelpers.SecureRandomString(20); public string OneYearExpirationDate => DateTime.Now.AddYears(1).ToString("yyyy-MM-ddTHH:mm"); diff --git a/src/Admin/Sass/site.scss b/src/Admin/Sass/site.scss index 38676f337d..39e577fb32 100644 --- a/src/Admin/Sass/site.scss +++ b/src/Admin/Sass/site.scss @@ -32,3 +32,7 @@ h3 { .validation-summary-valid { display: none; } + +.alert.validation-summary-errors > ul { + margin-bottom: 0; +} diff --git a/src/Admin/Views/Organizations/Edit.cshtml b/src/Admin/Views/Organizations/Edit.cshtml index 3eb99a934f..d64a68f0e6 100644 --- a/src/Admin/Views/Organizations/Edit.cshtml +++ b/src/Admin/Views/Organizations/Edit.cshtml @@ -77,7 +77,8 @@

Organization Information

@await Html.PartialAsync("_ViewInformation", Model)

Billing Information

-@await Html.PartialAsync("_BillingInformation", Model.BillingInfo) +@await Html.PartialAsync("_BillingInformation", + new BillingInformationModel { BillingInfo = Model.BillingInfo, OrganizationId = Model.Organization.Id })

General

diff --git a/src/Admin/Views/Shared/_BillingInformation.cshtml b/src/Admin/Views/Shared/_BillingInformation.cshtml index 3d3e040808..e01fe2fc0e 100644 --- a/src/Admin/Views/Shared/_BillingInformation.cshtml +++ b/src/Admin/Views/Shared/_BillingInformation.cshtml @@ -1,21 +1,26 @@ -@model Bit.Core.Models.Business.BillingInfo +@model BillingInformationModel
-
Account @(Model.Balance <= 0 ? "Credit" : "Balance")
-
@Math.Abs(Model.Balance).ToString("C")
+
Account @(Model.BillingInfo.Balance <= 0 ? "Credit" : "Balance")
+
@Math.Abs(Model.BillingInfo.Balance).ToString("C")
Invoices
- @if(Model.Invoices?.Any() ?? false) + @if(Model.BillingInfo.Invoices?.Any() ?? false) { - @foreach(var invoice in Model.Invoices) + @foreach(var invoice in Model.BillingInfo.Invoices) { + } @@ -29,11 +34,11 @@
Transactions
- @if(Model.Transactions?.Any() ?? false) + @if(Model.BillingInfo.Transactions?.Any() ?? false) {
@invoice.Date @invoice.Number @invoice.Amount.ToString("C") @(invoice.Paid ? "Paid" : "Unpaid") + + + +
- @foreach(var transaction in Model.Transactions) + @foreach(var transaction in Model.BillingInfo.Transactions) { @@ -41,6 +46,10 @@ + } @@ -48,7 +57,11 @@ } else { - @: No transactions. +

No transactions.

} + + New Transaction + diff --git a/src/Admin/Views/Shared/_Layout.cshtml b/src/Admin/Views/Shared/_Layout.cshtml index 0344b52767..d9ee5816d1 100644 --- a/src/Admin/Views/Shared/_Layout.cshtml +++ b/src/Admin/Views/Shared/_Layout.cshtml @@ -49,6 +49,9 @@ Charge Braintree Customer + + Create Transaction +
  • diff --git a/src/Admin/Views/Tools/ChargeBraintree.cshtml b/src/Admin/Views/Tools/ChargeBraintree.cshtml index d9081ac1fa..aaf3bbf167 100644 --- a/src/Admin/Views/Tools/ChargeBraintree.cshtml +++ b/src/Admin/Views/Tools/ChargeBraintree.cshtml @@ -39,6 +39,6 @@ else - + } diff --git a/src/Admin/Views/Tools/CreateUpdateTransaction.cshtml b/src/Admin/Views/Tools/CreateUpdateTransaction.cshtml new file mode 100644 index 0000000000..2e9c308382 --- /dev/null +++ b/src/Admin/Views/Tools/CreateUpdateTransaction.cshtml @@ -0,0 +1,109 @@ +@model CreateUpdateTransactionModel +@{ + var action = Model.Edit ? "Edit" : "Create"; + ViewData["Title"] = $"{action} Transaction"; +} + +

    @action Transaction

    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + +
    +
    + $ +
    + +
    +
    +
    +
    +
    + +
    +
    + $ +
    + +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + diff --git a/src/Admin/Views/Users/Edit.cshtml b/src/Admin/Views/Users/Edit.cshtml index c25a5c99f6..8e44e76c81 100644 --- a/src/Admin/Views/Users/Edit.cshtml +++ b/src/Admin/Views/Users/Edit.cshtml @@ -59,7 +59,8 @@

    User Information

    @await Html.PartialAsync("_ViewInformation", Model)

    Billing Information

    -@await Html.PartialAsync("_BillingInformation", Model.BillingInfo) +@await Html.PartialAsync("_BillingInformation", + new BillingInformationModel { BillingInfo = Model.BillingInfo, UserId = Model.User.Id })

    General

    diff --git a/src/Core/Models/Business/BillingInfo.cs b/src/Core/Models/Business/BillingInfo.cs index 1c32d4e1c2..376960a8b6 100644 --- a/src/Core/Models/Business/BillingInfo.cs +++ b/src/Core/Models/Business/BillingInfo.cs @@ -88,6 +88,7 @@ namespace Bit.Core.Models.Business { public BillingTransaction(Transaction transaction) { + Id = transaction.Id; CreatedDate = transaction.CreationDate; Refunded = transaction.Refunded; Type = transaction.Type; @@ -97,6 +98,7 @@ namespace Bit.Core.Models.Business RefundedAmount = transaction.RefundedAmount; } + public Guid Id { get; set; } public DateTime CreatedDate { get; set; } public decimal Amount { get; set; } public bool? Refunded { get; set; }
    • @transaction.CreatedDate@transaction.PaymentMethodType.ToString() @transaction.Details @transaction.Amount.ToString("C") + +