Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

B 20942 ssw label #13617

Merged
merged 15 commits into from
Sep 5, 2024
Merged

B 20942 ssw label #13617

merged 15 commits into from
Sep 5, 2024

Conversation

antgmann
Copy link
Contributor

@antgmann antgmann commented Sep 3, 2024

B-20942

Int PR

Warning

Per INT PR: Commit 2b95b2f and b80d672 is made directly on the int branch to resolve merge conflicts between other SSW features in the server tests only. This solution to the merge conflicts should be made the same way when moving the feature to main. Commit 2b95b2f and b80d672 have their changes already present in main at time of writing, so pulling in these commits is not necessary.

Summary

This PR adjusts the SSW PDF Template to change the "Actual Move Date" field to instead read "Pick-up date". It also additionally ensures that for a Payment Packet, the actual pick-up date (actual move date is the same value) is used. But, for an AOA packet, the expected departure date is used instead.

Due to git not being able to merge PDF files, this will have to be downstream of the latest template change, B-20939

Further, some code was refactored to remove an erroneous loop that was running for only one ppm shipment in a FormatAllShipments function. This was instead combined with the formatCurrentShipment function, and renamed formatShipment. These changes make things more clear, and it helps clean things up for an upcoming feature supporting multiple shipment information in a single SSW.

Verification Steps for the Author

These are to be checked by the author.

  • Have the Agility acceptance criteria been met for this change?

Verification Steps for Reviewers

These are to be checked by a reviewer.

  • Has the branch been pulled in and checked out?
  • Have the BL acceptance criteria been met for this change?
  • Was the CircleCI build successful?
  • Has the code been reviewed from a standards and best practices point of view?

How to test

  1. Access the app as a service member.
  2. Create a move.
  3. Create a PPM Shipment with an advance, take note of your expected departure date.
  4. Submit the shipment.
  5. Log in as a service counselor.
  6. Approve the orders, submit the details, download the AOA Packet.
  7. Verify that the date field reads "Pick-up date", with the expected departure date.
  8. Log back in as service member. Begin the closeout process, take note of your actual move date.
  9. Complete and submit the closeout process.
  10. Log back in as a service counselor.
  11. Close out the PPM. Make sure the actual move date matches step 8.
  12. Once submitted, download the payment packet.
  13. Ensure the Pick-up date matches steps 8 and 11.

Backend

Screenshots

image

@antgmann antgmann marked this pull request as ready for review September 3, 2024 19:32
@antgmann antgmann requested a review from a team as a code owner September 3, 2024 19:32
@r-mettler r-mettler merged commit 258daa4 into main Sep 5, 2024
41 checks passed
@r-mettler r-mettler deleted the B-20942-SSW-Label branch September 5, 2024 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

3 participants