Skip to content

Commit

Permalink
Merge pull request #13204 from transcom/B-19772-Change-Closeout-Queue…
Browse files Browse the repository at this point in the history
…-Filter-BE-MAIN

B 19772 change closeout queue filter be main
  • Loading branch information
taeJungCaci authored Jul 9, 2024
2 parents 2e5dd30 + b60939f commit d5c360c
Show file tree
Hide file tree
Showing 2 changed files with 141 additions and 353 deletions.
2 changes: 1 addition & 1 deletion pkg/services/order/order_fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -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").
Expand Down
Loading

0 comments on commit d5c360c

Please sign in to comment.