From 3d192770e95bc916392a9298b00557f7dd764abc Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Thu, 13 Nov 2025 12:01:17 +0530 Subject: [PATCH] Set updateAt nullable in payment request details VM --- Marco.Pms.Model/ViewModels/Expenses/PaymentRequestDetailsVM.cs | 2 +- Marco.Pms.Services/Service/ExpensesService.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Marco.Pms.Model/ViewModels/Expenses/PaymentRequestDetailsVM.cs b/Marco.Pms.Model/ViewModels/Expenses/PaymentRequestDetailsVM.cs index 06a5004..d39f629 100644 --- a/Marco.Pms.Model/ViewModels/Expenses/PaymentRequestDetailsVM.cs +++ b/Marco.Pms.Model/ViewModels/Expenses/PaymentRequestDetailsVM.cs @@ -29,7 +29,7 @@ namespace Marco.Pms.Model.ViewModels.Expenses public bool IsAdvancePayment { get; set; } public DateTime CreatedAt { get; set; } public BasicEmployeeVM? CreatedBy { get; set; } - public DateTime UpdatedAt { get; set; } + public DateTime? UpdatedAt { get; set; } public BasicEmployeeVM? UpdatedBy { get; set; } public List? NextStatus { get; set; } public List? UpdateLogs { get; set; } diff --git a/Marco.Pms.Services/Service/ExpensesService.cs b/Marco.Pms.Services/Service/ExpensesService.cs index dd672f0..77787a0 100644 --- a/Marco.Pms.Services/Service/ExpensesService.cs +++ b/Marco.Pms.Services/Service/ExpensesService.cs @@ -1458,6 +1458,7 @@ namespace Marco.Pms.Services.Service .Include(pr => pr.RecurringPayment) .Include(pr => pr.ExpenseCategory) .Include(pr => pr.ExpenseStatus) + .Include(pr => pr.PaidBy).ThenInclude(e => e!.JobRole) .Include(pr => pr.CreatedBy).ThenInclude(e => e!.JobRole) .Include(pr => pr.UpdatedBy).ThenInclude(e => e!.JobRole) .Where(pr =>