-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/go_modules/github.com/go-openapi/…
…loads-0.21.5
- Loading branch information
Showing
166 changed files
with
5,040 additions
and
6,455 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
10 changes: 10 additions & 0 deletions
10
migrations/app/schema/20240109200110_add_address_columns_to_ppmshipments4.up.sql
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| ALTER TABLE public.ppm_shipments | ||
| ADD COLUMN pickup_postal_address_id uuid NULL, | ||
| ADD COLUMN secondary_pickup_postal_address_id uuid NULL, | ||
| ADD COLUMN destination_postal_address_id uuid NULL, | ||
| ADD COLUMN secondary_destination_postal_address_id uuid NULL; | ||
| ALTER TABLE public.ppm_shipments | ||
| ADD CONSTRAINT ppm_shipments_pickup_postal_address_fkey FOREIGN KEY (pickup_postal_address_id) REFERENCES public.addresses(id), | ||
| ADD CONSTRAINT ppm_shipments_secondary_pickup_postal_address_fkey FOREIGN KEY (secondary_pickup_postal_address_id) REFERENCES public.addresses(id), | ||
| ADD CONSTRAINT ppm_shipments_destination_postal_address_fkey FOREIGN KEY (destination_postal_address_id) REFERENCES public.addresses(id), | ||
| ADD CONSTRAINT ppm_shipments_secondary_destination_postal_address_fkey FOREIGN KEY (secondary_destination_postal_address_id) REFERENCES public.addresses(id); |
This file contains 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
43 changes: 24 additions & 19 deletions
43
pkg/assets/notifications/templates/reweigh_requested_template.html
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,32 @@ | ||
| <p><strong>*** DO NOT REPLY directly to this email ***</strong></p> | ||
| <p><strong>*** This is an email generated by the U.S. Government system – MilMove. ***</strong></p> | ||
|
|
||
| <p><strong>Essential information</strong></p> | ||
| <ul> | ||
| <li>MilMove let your movers know that they need to reweigh your HHG shipment before they deliver it to your destination</li> | ||
| <li>Your movers will tell you where and when they’ll perform the reweigh</li> | ||
| <li>You have the right to witness the reweigh, but you do not have to</li> | ||
| <li>Your shipment must be reweighed before it reaches your destination.</li> | ||
| <li>Your HomeSafe Alliance (HSA) Customer Care Representative will tell you where and when they will perform the reweigh.</li> | ||
| <li>You have the right to witness the reweigh, but it is your decision whether to do so.</li> | ||
| </ul> | ||
|
|
||
| <p><strong>Why was a reweigh requested?</strong></p> | ||
| <p>When MilMove notices that you might move more weight than your weight allowance, the system will automatically request a reweigh.</p> | ||
| <p>This happens when a shipment’s weight brings you within 10% of your weight allowance.</p> | ||
| <p>It’s also possible for a transportation officer to manually request a reweigh for a shipment.</p> | ||
| <p>You can always request a reweigh yourself until the shipment has been unloaded.</p> | ||
| <p>The advantage for you: The official weight of your shipment will be the lower weight between the original weighing and the reweigh.</p> | ||
| <p>Remember, if you move more weight than your allowance, you have to pay for the extra. A reweigh makes sure you end up with the lowest weight total possible.</p> | ||
| <p>When a shipment’s weight brings you <strong><u>within 10% (or above) your standard weight allowance</u></strong>, the system will automatically request a reweigh.</p> | ||
| <p>It is also possible for a transportation office to manually request a reweigh for a shipment.</p> | ||
| <p>The official weight of your shipment will be the lower net weight between the original weighing and the reweigh.</p> | ||
| <p>Remember, if you move more weight than your allowance, you are subject to excess cost charges pending a review of all shipment(s) weights.</p> | ||
|
|
||
| <p><strong>What do I need to do?</strong></p> | ||
| <p>Your movers will let you know <strong>where</strong> and <strong>when</strong> they will reweigh your shipment.</p> | ||
| <p>Reweighs typically happen near your destination and close to your delivery date.</p> | ||
| <p>You’re entitled to witness the reweigh yourself, or send someone else to do it on your behalf. This is optional. You do not have to attend the reweigh.</p> | ||
| <p><strong>What do you need to do?</strong></p> | ||
| <p>Nothing, unless you wish to witness the reweigh.</p> | ||
| <p>If you wish to witness the reweigh, your HSA Customer Care Representative is required to let you know <strong>when</strong> and <strong>where</strong> they will reweigh your shipment (any cost incurred to witness a reweigh is at your own expense).</p> | ||
| <p>Reweighs typically happen near your destination and close to your delivery date; however, this is not always the case. If your shipment goes into storage-in-transit (SIT) and the transportation service provider (TSP) does not reweigh it beforehand, the TSP still has the opportunity to perform a reweigh after you schedule a delivery date and your personal property leaves the warehouse.</p> | ||
|
|
||
| <p><strong>Who should I talk to about my reweigh?</strong></p> | ||
| <p>Your movers will be arranging the logistics of the reweigh. You should talk to them directly if you have questions or arrange to be present for the reweigh.</p> | ||
| <p>If your movers don’t give you a date and time for this reweigh soon, ask them for that info.</p> | ||
| <p><strong>Who should you talk to about the reweigh?</strong></p> | ||
| <p>Your HSA Customer Care Representative will be arranging the logistics of the reweigh. You should talk to them directly if you have questions or wish to be present for the reweigh.</p> | ||
| <p>If your HSA Customer Care Representative does not give you a date and time for this reweigh, ask them for this information.</p> | ||
|
|
||
| <p><strong>Make sure your movers have reweighed your shipment before you accept delivery.</strong></p> | ||
| <p>The only reason they can reject a reweigh request is if they get the request after the shipment has been unloaded.</p> | ||
| <p>If you believe your shipment should be reweighed and has not been, do not accept delivery. Tell your movers that they need to reweigh the shipment before they unload it.</p> | ||
| <p><strong>Make sure your shipment has been reweighed before you accept delivery.</strong></p> | ||
| <p>The only time a reweigh cannot be performed is when the shipment has already been unloaded.</p> | ||
| <p>If you believe your shipment should be reweighed and has not been, do not accept delivery. Tell your HSA Customer Care Representative that they need to reweigh the shipment before they unload it.</p> | ||
| <p>Remember, your HomeSafe Alliance (HSA) Customer Care Representative is your first point of contact; however, if you are unsatisfied at any time, contact a government transportation office. You can see a listing of transportation offices on Military One Source here: <a href="https://www.militaryonesource.mil/benefits/militaryinstallations-local-transportation-office/.">https://www.militaryonesource.mil/benefits/militaryinstallations-local-transportation-office/</a>.</p> | ||
| <p>Thank you,</p> | ||
| <p>Defense Personal Property Program’s MilMove Team</p> | ||
| <p>The information contained in this email may contain Privacy Act information and is therefore protected under the Privacy Act of 1974. Failure to protect Privacy Act information could result in a $5,000 fine.</p> |
45 changes: 26 additions & 19 deletions
45
pkg/assets/notifications/templates/reweigh_requested_template.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,42 @@ | ||
| *** DO NOT REPLY directly to this email *** | ||
|
|
||
| *** This is an email generated by the U.S. Government system – MilMove. *** | ||
|
|
||
| Essential information | ||
| * MilMove let your movers know that they need to reweigh your HHG shipment before they deliver it to your destination | ||
| * Your movers will tell you where and when they’ll perform the reweigh | ||
| * You have the right to witness the reweigh, but you do not have to | ||
| * Your shipment must be reweighed before it reaches your destination. | ||
| * Your HomeSafe Alliance (HSA) Customer Care Representative will tell you where and when they will perform the reweigh. | ||
| * You have the right to witness the reweigh, but it is your decision whether to do so. | ||
|
|
||
| Why was a reweigh requested? | ||
| When MilMove notices that you might move more weight than your weight allowance, the system will automatically request a reweigh. | ||
| When a shipment’s weight brings you within 10% (or above) your standard weight allowance, the system will automatically request a reweigh. | ||
|
|
||
| It is also possible for a transportation office to manually request a reweigh for a shipment. | ||
|
|
||
| This happens when a shipment’s weight brings you within 10% of your weight allowance. | ||
| The official weight of your shipment will be the lower net weight between the original weighing and the reweigh. | ||
|
|
||
| It’s also possible for a transportation officer to manually request a reweigh for a shipment. | ||
| Remember, if you move more weight than your allowance, you are subject to excess cost charges pending a review of all shipment(s) weights. | ||
|
|
||
| You can always request a reweigh yourself until the shipment has been unloaded. | ||
| What do you need to do? | ||
| Nothing, unless you wish to witness the reweigh. | ||
|
|
||
| The advantage for you: The official weight of your shipment will be the lower weight between the original weighing and the reweigh. | ||
| If you wish to witness the reweigh, your HSA Customer Care Representative is required to let you know when and where they will reweigh your shipment (any cost incurred to witness a reweigh is at your own expense). | ||
|
|
||
| Remember, if you move more weight than your allowance, you have to pay for the extra. A reweigh makes sure you end up with the lowest weight total possible. | ||
| Reweighs typically happen near your destination and close to your delivery date; however, this is not always the case. If your shipment goes into storage-in-transit (SIT) and the transportation service provider (TSP) does not reweigh it beforehand, the TSP still has the opportunity to perform a reweigh after you schedule a delivery date and your personal property leaves the warehouse. | ||
|
|
||
| What do I need to do? | ||
| Your movers will let you know where and when they will reweigh your shipment. | ||
| Who should you talk to about the reweigh? | ||
| Your HSA Customer Care Representative will be arranging the logistics of the reweigh. You should talk to them directly if you have questions or wish to be present for the reweigh. | ||
|
|
||
| Reweighs typically happen near your destination and close to your delivery date. | ||
| If your HSA Customer Care Representative does not give you a date and time for this reweigh, ask them for this information. | ||
|
|
||
| You’re entitled to witness the reweigh yourself, or send someone else to do it on your behalf. This is optional. You do not have to attend the reweigh. | ||
| Make sure your shipment has been reweighed before you accept delivery. | ||
| The only time a reweigh cannot be performed is when the shipment has already been unloaded. | ||
|
|
||
| Who should I talk to about my reweigh? | ||
| Your movers will be arranging the logistics of the reweigh. You should talk to them directly if you have questions or arrange to be present for the reweigh. | ||
| If you believe your shipment should be reweighed and has not been, do not accept delivery. Tell your HSA Customer Care Representative that they need to reweigh the shipment before they unload it. | ||
|
|
||
| If your movers don’t give you a date and time for this reweigh soon, ask them for that info. | ||
| Remember, your HomeSafe Alliance (HSA) Customer Care Representative is your first point of contact; however, if you are unsatisfied at any time, contact a government transportation office. You can see a listing of transportation offices on Military One Source here: https://www.militaryonesource.mil/benefits/militaryinstallations-local-transportation-office/. | ||
|
|
||
| Make sure your movers have reweighed your shipment before you accept delivery. | ||
| Thank you, | ||
|
|
||
| The only reason they can reject a reweigh request is if they get the request after the shipment has been unloaded. | ||
| Defense Personal Property Program’s MilMove Team | ||
|
|
||
| If you believe your shipment should be reweighed and has not been, do not accept delivery. Tell your movers that they need to reweigh the shipment before they unload it. | ||
| The information contained in this email may contain Privacy Act information and is therefore protected under the Privacy Act of 1974. Failure to protect Privacy Act information could result in a $5,000 fine. |
This file contains 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
This file contains 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
Oops, something went wrong.