Merge branch 'integrationTesting' into B-19722-INT

transcom · May 10, 2024 · 6423578 · 6423578
2 parents 21c6b79 + 4201dc6
commit 6423578
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -927,5 +927,6 @@
 20240502175909_add_lookup_valid_columns_to_tac_and_loa_tables.up.sql
 20240502183613_add_support_for_standalone_payment_cap.up.sql
 20240503123556_add_diversion_reason_to_mto_shipments.up.sql
+20240506214039_add_submitted_columns_to_ppm_document_tables.up.sql
 20240507133524_add_locked_moves_column_to_moves_table.up.sql
 20240507192232_add_emplid_col_to_service_members_table.up.sql
diff --git a/migrations/app/schema/20240506214039_add_submitted_columns_to_ppm_document_tables.up.sql b/migrations/app/schema/20240506214039_add_submitted_columns_to_ppm_document_tables.up.sql
@@ -0,0 +1,19 @@
+ALTER TABLE weight_tickets
+    ADD COLUMN IF NOT EXISTS submitted_empty_weight INT4 DEFAULT NULL,
+    ADD COLUMN IF NOT EXISTS submitted_full_weight INT4 DEFAULT NULL;
+
+COMMENT ON COLUMN weight_tickets.submitted_empty_weight IS 'Stores the customer submitted empty_weight.';
+COMMENT ON COLUMN weight_tickets.submitted_full_weight IS 'Stores the customer submitted full_weight.';
+
+ALTER TABLE progear_weight_tickets ADD COLUMN IF NOT EXISTS submitted_weight INT4 DEFAULT NULL;
+
+COMMENT ON COLUMN progear_weight_tickets.submitted_weight IS 'Stores the customer submitted weight.';
+
+ALTER TABLE moving_expenses
+    ADD COLUMN IF NOT EXISTS submitted_amount INT4 DEFAULT NULL,
+    ADD COLUMN IF NOT EXISTS submitted_sit_start_date DATE DEFAULT NULL,
+    ADD COLUMN IF NOT EXISTS submitted_sit_end_date DATE DEFAULT NULL;
+
+COMMENT ON COLUMN moving_expenses.submitted_amount IS 'Stores the customer submitted amount.';
+COMMENT ON COLUMN moving_expenses.submitted_sit_start_date IS 'Stores the customer submitted sit_start_date.';
+COMMENT ON COLUMN moving_expenses.submitted_sit_end_date IS 'Stores the customer submitted sit_end_date.';
diff --git a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet.go b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet.go
@@ -586,7 +586,7 @@ func FormatSITNumberAndType(i int) string {
 func FormatPPMWeight(ppm models.PPMShipment) string {
 	if ppm.EstimatedWeight != nil {
 		wtg := FormatWeights(unit.Pound(*ppm.EstimatedWeight))
-		return fmt.Sprintf("%s lbs - FINAL", wtg)
+		return fmt.Sprintf("%s lbs - Estimated", wtg)
 	}
 	return ""
 }

diff --git a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go
@@ -313,7 +313,7 @@ func (suite *ShipmentSummaryWorksheetServiceSuite) TestFormatValuesShipmentSumma
 
 	suite.Equal("01 - PPM", sswPage1.ShipmentNumberAndTypes)
 	suite.Equal("11-Jan-2019", sswPage1.ShipmentPickUpDates)
-	suite.Equal("4,000 lbs - FINAL", sswPage1.ShipmentWeights)
+	suite.Equal("4,000 lbs - Estimated", sswPage1.ShipmentWeights)
 	suite.Equal("Waiting On Customer", sswPage1.ShipmentCurrentShipmentStatuses)
 
 	suite.Equal("17,500", sswPage1.TotalWeightAllotmentRepeat)
@@ -574,7 +574,7 @@ func (suite *ShipmentSummaryWorksheetServiceSuite) TestFormatPPMWeight() {
 	ppm := models.PPMShipment{EstimatedWeight: &pounds}
 	noWtg := models.PPMShipment{EstimatedWeight: nil}
 
-	suite.Equal("1,000 lbs - FINAL", FormatPPMWeight(ppm))
+	suite.Equal("1,000 lbs - Estimated", FormatPPMWeight(ppm))
 	suite.Equal("", FormatPPMWeight(noWtg))
 }
 

diff --git a/src/components/Office/PPM/ReviewDocumentsSidePanel/ReviewDocumentsSidePanel.jsx b/src/components/Office/PPM/ReviewDocumentsSidePanel/ReviewDocumentsSidePanel.jsx
@@ -231,7 +231,7 @@ export default function ReviewDocumentsSidePanel({
                     <div className={classnames(styles.ItemDetails)}>
                       <dl>
                         <span className={classnames(styles.ReceiptTotal)}>
-                          <dt>Authorized Receipt Total:</dt>
+                          <dt>Accepted Receipt Totals:</dt>
                           <dd>${formatCents(total)}</dd>
                         </span>
                       </dl>