admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Not updating the strike date when updating recurring template

Browse Source
This commit is contained in:
ashutosh.nehete 2025-11-05 16:19:21 +05:30
parent e14468b124
commit b313f3ce70
6 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marco.Pms.Model/Dtos/Expenses/RecurringTemplateDto.cs → Marco.Pms.Model/Dtos/Expenses/CreateRecurringTemplateDto.cs
View File

@ -2,9 +2,8 @@
namespace Marco.Pms.Model.Dtos.Expenses
{
public class RecurringTemplateDto
public class CreateRecurringTemplateDto
{
public Guid? Id { get; set; }
public required string Title { get; set; }
public required string Description { get; set; }
public required string Payee { get; set; }

22
Marco.Pms.Model/Dtos/Expenses/UpdateRecurringTemplateDto.cs Normal file
View File

@ -0,0 +1,22 @@
using Marco.Pms.Model.TenantModels;
namespace Marco.Pms.Model.Dtos.Expenses
{
public class UpdateRecurringTemplateDto
{
public Guid Id { get; set; }
public required string Title { get; set; }
public required string Description { get; set; }
public required string Payee { get; set; }
public required string NotifyTo { get; set; }
public required Guid CurrencyId { get; set; }
public required double Amount { get; set; }
public Guid? ProjectId { get; set; }
public required int PaymentBufferDays { get; set; }
public required int NumberOfIteration { get; set; }
public required Guid ExpenseCategoryId { get; set; }
public required Guid StatusId { get; set; }
public required PLAN_FREQUENCY Frequency { get; set; }
public required bool IsVariable { get; set; }
}
}

4
Marco.Pms.Services/Controllers/ExpenseController.cs
View File

@ -223,7 +223,7 @@ namespace Marco.Pms.Services.Controllers
}
[HttpPost("recurring-payment/create")]
public async Task<IActionResult> CreateRecurringPayment([FromBody] RecurringTemplateDto model)
public async Task<IActionResult> CreateRecurringPayment([FromBody] CreateRecurringTemplateDto model)
{
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
var response = await _expensesService.CreateRecurringPaymentAsync(model, loggedInEmployee, tenantId);
@ -246,7 +246,7 @@ namespace Marco.Pms.Services.Controllers
}
[HttpPost("recurring-payment/edit/{id}")]
public async Task<IActionResult> EditRecurringPaymentAsync(Guid id, [FromBody] RecurringTemplateDto model)
public async Task<IActionResult> EditRecurringPaymentAsync(Guid id, [FromBody] UpdateRecurringTemplateDto model)
{
var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
var response = await _expensesService.EditRecurringPaymentAsync(id, model, loggedInEmployee, tenantId);

4
Marco.Pms.Services/MappingProfiles/MappingProfile.cs
View File

@ -269,9 +269,9 @@ namespace Marco.Pms.Services.MappingProfiles
#region ======================================================= Recurring Request =======================================================
CreateMap<RecurringTemplateDto, RecurringPayment>();
CreateMap<CreateRecurringTemplateDto, RecurringPayment>();
CreateMap<UpdateRecurringTemplateDto, RecurringPayment>();
CreateMap<RecurringPayment, RecurringPaymentVM>();
//CreateMap<RecurringPayment, PaymentRequestDetailsVM>();
#endregion

5
Marco.Pms.Services/Service/ExpensesService.cs
View File

@ -2514,7 +2514,7 @@ namespace Marco.Pms.Services.Service
_logger.LogInfo("End GetRecurringPaymentListAsync called by EmployeeId: {EmployeeId}", loggedInEmployee.Id);
}
}
public async Task<ApiResponse<object>> CreateRecurringPaymentAsync(RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId)
public async Task<ApiResponse<object>> CreateRecurringPaymentAsync(CreateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId)
{
_logger.LogInfo("Start CreateRecurringPaymentAsync called by EmployeeId: {EmployeeId} for TenantId: {TenantId}", loggedInEmployee.Id, tenantId);
@ -2753,8 +2753,7 @@ namespace Marco.Pms.Services.Service
_logger.LogInfo("End PaymentRequestConversionAsync called by EmployeeId: {EmployeeId} for TenantId: {TenantId}", loggedInEmployee.Id, tenantId);
}
}
public async Task<ApiResponse<object>> EditRecurringPaymentAsync(Guid id, RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId)
public async Task<ApiResponse<object>> EditRecurringPaymentAsync(Guid id, UpdateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId)
{
_logger.LogInfo("Start EditRecurringPaymentAsync called by EmployeeId: {EmployeeId} for TenantId: {TenantId}, RecurringPaymentId: {RecurringPaymentId}",
loggedInEmployee.Id, tenantId, id);

4
Marco.Pms.Services/Service/ServiceInterfaces/IExpensesService.cs
View File

@ -30,8 +30,8 @@ namespace Marco.Pms.Services.Service.ServiceInterfaces
#region =================================================================== Recurring Payment Functions ===================================================================
Task<ApiResponse<object>> GetRecurringPaymentListAsync(string? searchString, string? filter, bool isActive, int pageSize, int pageNumber, Employee loggedInEmployee, Guid tenantId);
Task<ApiResponse<object>> CreateRecurringPaymentAsync(RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId);
Task<ApiResponse<object>> EditRecurringPaymentAsync(Guid id, RecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId);
Task<ApiResponse<object>> CreateRecurringPaymentAsync(CreateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId);
Task<ApiResponse<object>> EditRecurringPaymentAsync(Guid id, UpdateRecurringTemplateDto model, Employee loggedInEmployee, Guid tenantId);
Task<ApiResponse<object>> PaymentRequestConversionAsync(List<Guid> RecurringTemplateIds, Employee loggedInEmployee, Guid tenantId);
#endregion