Skip to content

Commit

Permalink
Merge branch 'main' into B21575-MAIN-Add_order_types
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesHawks224 authored Oct 30, 2024
2 parents 658ab78 + 8881af8 commit b989dec
Show file tree
Hide file tree
Showing 67 changed files with 1,322 additions and 153 deletions.
2 changes: 1 addition & 1 deletion config/tls/dod-sw-ca-75.pem
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ dIfLjWrPbLuPSKLxJlPqME1q962+ql+f5Mg5w9CeBi1ORJynkX/yz332sydCgQ3G
kLz8YRyvZH5Jrdg6vDQr4qFMt2kmBUIWq7UDI/G1fmUI7Q7R7qsfnyHhqOdUNBNi
is8yooe7hRBl0TaIiNCmItMFaTl7G38ZI8gL2prAGNHITpTjbaWrlC2CYCgtCoWo
GmlNqlYB/qPgCvk50sSvxFL7dQ==
-----END CERTIFICATE-----
-----END CERTIFICATE-----
2 changes: 2 additions & 0 deletions migrations/app/migrations_manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1020,3 +1020,5 @@
20241007224427_update_addresses_us_post_region_cities_id.up.sql
20241008212243_populate_market_code_on_shipments_table.up.sql
20241009210749_create_view_v_locations.up.sql
20241011201326_changes_for_actual_expense_reimbursement_field.up.sql
20241024114748_create_gbloc_aors.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- adding boolean for actual expense reimbursement for ppm shipments
ALTER TABLE ppm_shipments
ADD COLUMN IF NOT EXISTS is_actual_expense_reimbursement BOOLEAN DEFAULT FALSE;
COMMENT on COLUMN ppm_shipments.is_actual_expense_reimbursement IS 'Whether or not the ppm is an actual expense reimbursement';
219 changes: 219 additions & 0 deletions migrations/app/schema/20241024114748_create_gbloc_aors.up.sql

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions pkg/gen/ghcapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/ghcmessages/create_p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/ghcmessages/p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/ghcmessages/update_p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions pkg/gen/internalapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/internalmessages/create_p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/internalmessages/p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/internalmessages/update_p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions pkg/gen/primeapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/primemessages/create_p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/primemessages/p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/gen/primemessages/update_p_p_m_shipment.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b989dec

Please sign in to comment.