nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

GetTransactionDate

Browse Source
This commit is contained in:
Kyle Spearrin 2019-02-23 13:57:59 -05:00
parent b4f026a946
commit 2f5410de28
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Billing/Controllers/BitPayController.cs
View File

@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using System; using System;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Bit.Billing.Controllers namespace Bit.Billing.Controllers
@ -104,14 +105,14 @@ namespace Bit.Billing.Controllers
var tx = new Core.Models.Table.Transaction var tx = new Core.Models.Table.Transaction
{ {
Amount = invoice.Price, Amount = invoice.Price,
CreationDate = invoice.CurrentTime.DateTime, CreationDate = GetTransactionDate(invoice),
OrganizationId = ids.Item1, OrganizationId = ids.Item1,
UserId = ids.Item2, UserId = ids.Item2,
Type = TransactionType.Charge, Type = TransactionType.Charge,
Gateway = GatewayType.BitPay, Gateway = GatewayType.BitPay,
GatewayId = invoice.Id, GatewayId = invoice.Id,
PaymentMethodType = PaymentMethodType.BitPay, PaymentMethodType = PaymentMethodType.BitPay,
Details = $"{invoice.TransactionCurrency}, BitPay {invoice.Id}" Details = $"{invoice.TransactionCurrency}, BitPay {invoice.Id}"
}; };
await _transactionRepository.CreateAsync(tx); await _transactionRepository.CreateAsync(tx);
@ -160,6 +161,17 @@ namespace Bit.Billing.Controllers
return invoice != null && invoice.PosData != null && invoice.PosData.Contains("accountCredit:1"); return invoice != null && invoice.PosData != null && invoice.PosData.Contains("accountCredit:1");
} }
private DateTime GetTransactionDate(NBitpayClient.Invoice invoice)
{
var transactions = invoice.Transactions?.Where(t => t.Type == null &&
!string.IsNullOrWhiteSpace(t.Confirmations) && t.Confirmations != "0");
if(transactions != null && transactions.Count() == 1)
{
return transactions.First().ReceivedTime.DateTime;
}
return invoice.CurrentTime.DateTime;
}
public Tuple<Guid?, Guid?> GetIdsFromPosData(NBitpayClient.Invoice invoice) public Tuple<Guid?, Guid?> GetIdsFromPosData(NBitpayClient.Invoice invoice)
{ {
Guid? orgId = null; Guid? orgId = null;