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

assign credit type for account credit

Browse Source
This commit is contained in:
Kyle Spearrin 2019-02-23 20:24:34 -05:00
parent b5782f7b72
commit b028696891
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ namespace Bit.Billing.Controllers
CreationDate = GetTransactionDate(invoice), CreationDate = GetTransactionDate(invoice),
OrganizationId = ids.Item1, OrganizationId = ids.Item1,
UserId = ids.Item2, UserId = ids.Item2,
Type = TransactionType.Charge, Type = TransactionType.Credit,
Gateway = GatewayType.BitPay, Gateway = GatewayType.BitPay,
GatewayId = invoice.Id, GatewayId = invoice.Id,
PaymentMethodType = PaymentMethodType.BitPay, PaymentMethodType = PaymentMethodType.BitPay,

5
src/Billing/Controllers/PayPalController.cs
View File

@ -226,7 +226,8 @@ namespace Bit.Billing.Controllers
return new OkResult(); return new OkResult();
} }
if(!ipnTransaction.IsAccountCredit()) var isAccountCredit = ipnTransaction.IsAccountCredit();
if(!isAccountCredit)
{ {
// Only processing credits via IPN for now // Only processing credits via IPN for now
return new OkResult(); return new OkResult();
@ -250,7 +251,7 @@ namespace Bit.Billing.Controllers
CreationDate = ipnTransaction.PaymentDate, CreationDate = ipnTransaction.PaymentDate,
OrganizationId = ids.Item1, OrganizationId = ids.Item1,
UserId = ids.Item2, UserId = ids.Item2,
Type = TransactionType.Charge, Type = isAccountCredit ? TransactionType.Credit : TransactionType.Charge,
Gateway = GatewayType.PayPal, Gateway = GatewayType.PayPal,
GatewayId = ipnTransaction.TxnId, GatewayId = ipnTransaction.TxnId,
PaymentMethodType = PaymentMethodType.PayPal, PaymentMethodType = PaymentMethodType.PayPal,