Merge branch 'main' into dependabot/go_modules/go.opentelemetry.io/co…

…ntrib/propagators/aws-1.28.0
transcom · Jul 9, 2024 · e73bd3c · e73bd3c
2 parents 22e3b18 + 805ecc6
commit e73bd3c
Show file tree

Hide file tree

Showing 4 changed files with 146 additions and 367 deletions.
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "redux-thunk": "^2.4.2",
     "regenerator-runtime": "^0.13.11",
     "reselect": "^4.1.8",
-    "sass": "^1.63.6",
+    "sass": "^1.77.6",
     "swagger-client": "^3.18.5",
     "swagger-ui-dist": "^5.2.0",
     "uswds": "2.13.3",

diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go
@@ -175,7 +175,7 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid
 			if *params.NeedsPPMCloseout {
 				query.InnerJoin("ppm_shipments", "ppm_shipments.shipment_id = mto_shipments.id").
 					LeftJoin("transportation_offices as closeout_to", "closeout_to.id = moves.closeout_office_id").
-					Where("ppm_shipments.status IN (?)", models.PPMShipmentStatusWaitingOnCustomer, models.PPMShipmentStatusNeedsCloseout, models.PPMShipmentStatusCloseoutComplete).
+					Where("ppm_shipments.status IN (?)", models.PPMShipmentStatusWaitingOnCustomer, models.PPMShipmentStatusNeedsCloseout).
 					Where("service_members.affiliation NOT IN (?)", models.AffiliationNAVY, models.AffiliationMARINES, models.AffiliationCOASTGUARD)
 			} else {
 				query.LeftJoin("ppm_shipments", "ppm_shipments.shipment_id = mto_shipments.id").