PM-6432 payment assoctiation timesheet entry - #2403
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related JIRA Ticket:
https://topcoder.atlassian.net/browse/PM-6432
What's in this PR?
This pull request introduces enhancements to timesheet payment reconciliation and improves the handling of timesheet entry payment status in the engagements and work apps. The main focus is on supporting the detection and resolution of timesheet entries that have already been paid, providing tools for admins to reconcile and link excluded entries to their correct payments, and improving the data model and UI to reflect payment linkage.
Payment Reconciliation and Linking Enhancements:
PaymentFormModalto detect timesheet entries already linked to other payments, display reconciliation candidates, and allow admins to link excluded entries to their corresponding payment references. This includes new state management, UI feedback, and a handler for linking entries (PaymentFormModal.tsx). [1] [2] [3] [4]fetchTimesheetEntriesByPaymentReferenceservice function to retrieve all timesheet entries associated with a specific payment reference for reconciliation purposes (engagements.service.ts).Data Model Updates for Payment Tracking:
TimesheetEntryandTimesheetRowinterfaces to includepaymentReferenceandpaidAtfields, allowing entries to be explicitly linked to payments and track when they were paid (Timesheet.model.ts,timesheet.utils.ts). [1] [2] [3]TimesheetPaymentEntryinterface to represent entries consumed by a payment, and updatedAssignmentPaymentattributes to includeassignmentIdandtimesheetEntryIdsfor better traceability (Engagement.model.ts). [1] [2]Utility and Test Improvements:
timesheet.utils.spec.ts,AdminTimesheetView.spec.tsx,ManagerTimesheetView.spec.tsx,MemberTimesheetView.spec.tsx). [1] [2] [3] [4]PaymentFormModal.tsx).Service and Import Organization:
PaymentFormModal.tsx,payments.service.spec.ts). [1] [2] [3]These changes collectively make timesheet payment processing more robust, transparent, and easier to administer, especially in scenarios where entries may have been previously paid or require reconciliation across multiple payments.