merge of B-18434

pkg/assets/notifications/templates/move_counseled_template.html

@@ -1,6 +1,6 @@
 <p>*** DO NOT REPLY directly to this email ***</p>
 
-<p>This is a confirmation that your counselor has approved move details for the <strong>assigned move code{{if or (not .Locator) (lt (len .Locator) 1)}}</strong>{{end}}{{if gt (len .Locator) 0}} {{.Locator}}</strong>{{end}}{{if .OriginDutyLocation}} from {{.OriginDutyLocation}}{{end}}{{if gt (len .DestinationDutyLocation) 0}} to {{.DestinationDutyLocation}}{{end}} in the MilMove system.</p>
+<p>This is a confirmation that your counselor has approved move details for the <strong>assigned move code{{if or (not .Locator) (not .OriginDutyLocation) (not .DestinationDutyLocation)}}</strong>{{end}}{{if and .Locator .OriginDutyLocation .DestinationDutyLocation}} {{.Locator}}</strong> from {{.OriginDutyLocation}} to {{.DestinationDutyLocation}} in the MilMove system{{end}}.</p>
 
 <p>What this means to you:</br>
 If you are doing a Personally Procured Move (PPM), you can start moving your personal property.</p>
@@ -21,4 +21,4 @@
 <p>Thank you,<br>
 USTRANSCOM 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>
+<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>

pkg/assets/notifications/templates/move_counseled_template.txt

@@ -1,14 +1,14 @@
 *** DO NOT REPLY directly to this email ***
 
-This is a confirmation that your counselor has approved move details for the assigned move code{{if gt (len .Locator) 0}} {{.Locator}}{{end}}{{if gt (len .OriginDutyLocation) 0}} from {{.OriginDutyLocation}}{{end}}{{if gt (len .DestinationDutyLocation) 0}} to {{.DestinationDutyLocation}}{{end}} in the MilMove system.
+This is a confirmation that your counselor has approved move details for the assigned move code{{if and .Locator .OriginDutyLocation .DestinationDutyLocation}} {{.Locator}} from {{.OriginDutyLocation}} to {{.DestinationDutyLocation}} in the MilMove system{{end}}.
 
 What this means to you:
 If you are doing a Personally Procured Move (PPM), you can start moving your personal property.
 
 Next steps for a PPM:
     * Remember to get legible certified weight tickets for both the empty and full weights for every trip you perform. If you do not upload legible certified weight tickets, your PPM incentive could be affected.
-    * If your counselor approved an Advance Operating Allowance (AOA, or cash advance) for a PPM, log into MilMove <{{.MyMoveLink}}> to download your AOA Packet, and submit it to finance according to the instructions provided by your counselor. If you have been directed to use your government travel charge card (GTCC) for expenses no further action is required.
-    * Once you complete your PPM, log into MilMove <{{.MyMoveLink}}>, upload your receipts and weight tickets, and submit your PPM for review.
+    * If your counselor approved an Advance Operating Allowance (AOA, or cash advance) for a PPM, log into MilMove <{{.MyMoveLink}}/> to download your AOA Packet, and submit it to finance according to the instructions provided by your counselor. If you have been directed to use your government travel charge card (GTCC) for expenses no further action is required.
+    * Once you complete your PPM, log into MilMove <{{.MyMoveLink}}/>, upload your receipts and weight tickets, and submit your PPM for review.
 
 Next steps for government arranged shipments:
     * Your move request will be reviewed by the responsible personal property shipping office and a move task order for services will be placed with HomeSafe Alliance.
@@ -18,4 +18,4 @@ Next steps for government arranged shipments:
 Thank you,
 USTRANSCOM MilMove Team
 
-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.
+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.

pkg/factory/ppm_shipment_factory.go

@@ -89,6 +89,34 @@ func buildPPMShipmentWithBuildType(db *pop.Connection, customs []Customization,
 		ppmShipment.W2Address = &w2AddressResult
 	}
 
+	oldDutyLocationAddress := ppmShipment.Shipment.MoveTaskOrder.Orders.OriginDutyLocation.Address
+	pickupAddress := BuildAddress(db, []Customization{
+		{
+			Model: models.Address{
+				StreetAddress1: "987 New Street",
+				City:           oldDutyLocationAddress.City,
+				State:          oldDutyLocationAddress.State,
+				PostalCode:     oldDutyLocationAddress.PostalCode,
+			},
+		},
+	}, nil)
+	ppmShipment.PickupAddressID = &pickupAddress.ID
+	ppmShipment.PickupAddress = &pickupAddress
+
+	newDutyLocationAddress := ppmShipment.Shipment.MoveTaskOrder.Orders.NewDutyLocation.Address
+	destinationAddress := BuildAddress(db, []Customization{
+		{
+			Model: models.Address{
+				StreetAddress1: "123 New Street",
+				City:           newDutyLocationAddress.City,
+				State:          newDutyLocationAddress.State,
+				PostalCode:     newDutyLocationAddress.PostalCode,
+			},
+		},
+	}, nil)
+	ppmShipment.DestinationAddressID = &destinationAddress.ID
+	ppmShipment.DestinationAddress = &destinationAddress
+
 	// Overwrite values with those from customizations
 	testdatagen.MergeModels(&ppmShipment, cPPMShipment)