Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions JobFlow.API/appsettings.Development.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,11 @@
},
"Backend": {
"BaseUrl": "http://localhost:5131"
},
"QuickBooksSettings": {
"ClientId": "YOUR_QB_CLIENT_ID",
"ClientSecret": "YOUR_QB_CLIENT_SECRET",
"RedirectUrl": "http://localhost:5131/api/quickbooks/callback",
"UseSandbox": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,9 @@ public async Task<PaymentSessionResult> CreatePaymentIntentAsync(
Destination = request.ConnectedAccountId
},

Metadata = new Dictionary<string, string>
{
{ "invoiceId", request.InvoiceId!.Value.ToString() }
}
Metadata = request.InvoiceId.HasValue
? new Dictionary<string, string> { { "invoiceId", request.InvoiceId.Value.ToString() } }
: null
};

var service = new PaymentIntentService();
Expand Down
6 changes: 5 additions & 1 deletion JobFlow.Infrastructure/Security/AuditLogService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ orderby a.CreatedAt descending
OrganizationName = o != null ? o.OrganizationName : null,
OrganizationEmail = o != null ? o.EmailAddress : null,
UserId = a.UserId,
UserDisplayName = u != null ? (u.FirstName + " " + u.LastName).Trim() : null,
UserDisplayName = u != null
? (u.FirstName != null || u.LastName != null
? (u.FirstName ?? "") + " " + (u.LastName ?? "")
: u.Email)
: null,
Category = a.Category,
Action = a.Action,
ResourceType = a.ResourceType,
Expand Down
Loading