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.

Sign up for GitHub

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

B19764 int 20240506 fe aoa packet change text #12609

Merged
merged 8 commits into from
May 10, 2024
Merged

B19764 int 20240506 fe aoa packet change text #12609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0239ce6
code changes
JamesHawks224 Apr 29, 2024
50e8ecb
Merge branch 'b19764-main-fe-aoa-packet-change-text' into b19764-int-…
JamesHawks224 May 7, 2024
608bd07
fix failing tests
JamesHawks224 May 7, 2024
9db1755
Merge branch 'b19764-main-fe-aoa-packet-change-text' into b19764-int-…
JamesHawks224 May 7, 2024
f41b0cb
Merge branch 'integrationTesting' into b19764-int-20240506-fe-aoa-pac…
JamesHawks224 May 7, 2024
d2f1024
Merge branch 'integrationTesting' into b19764-int-20240506-fe-aoa-pac…
JamesHawks224 May 7, 2024
9e980ed
Merge branch 'integrationTesting' into b19764-int-20240506-fe-aoa-pac…
taeJungCaci May 9, 2024
f305bf8
Merge branch 'integrationTesting' into b19764-int-20240506-fe-aoa-pac…
JamesHawks224 May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/services/shipment_summary_worksheet/shipment_summary_worksheet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
}

Expand Down
Loading