Merge branch 'main' into B21575-MAIN-Add_order_types

transcom · Oct 30, 2024 · b989dec · b989dec
2 parents 658ab78 + 8881af8
commit b989dec
Show file tree

Hide file tree

Showing 67 changed files with 1,322 additions and 153 deletions.
diff --git a/config/tls/dod-sw-ca-75.pem b/config/tls/dod-sw-ca-75.pem
@@ -26,4 +26,4 @@ dIfLjWrPbLuPSKLxJlPqME1q962+ql+f5Mg5w9CeBi1ORJynkX/yz332sydCgQ3G
 kLz8YRyvZH5Jrdg6vDQr4qFMt2kmBUIWq7UDI/G1fmUI7Q7R7qsfnyHhqOdUNBNi
 is8yooe7hRBl0TaIiNCmItMFaTl7G38ZI8gL2prAGNHITpTjbaWrlC2CYCgtCoWo
 GmlNqlYB/qPgCvk50sSvxFL7dQ==
------END CERTIFICATE-----
+-----END CERTIFICATE-----
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -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
diff --git a/migrations/app/schema/20241011201326_changes_for_actual_expense_reimbursement_field.up.sql b/migrations/app/schema/20241011201326_changes_for_actual_expense_reimbursement_field.up.sql
@@ -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';
diff --git a/migrations/app/schema/20241024114748_create_gbloc_aors.up.sql b/migrations/app/schema/20241024114748_create_gbloc_aors.up.sql
diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go
diff --git a/pkg/gen/ghcmessages/create_p_p_m_shipment.go b/pkg/gen/ghcmessages/create_p_p_m_shipment.go
diff --git a/pkg/gen/ghcmessages/p_p_m_shipment.go b/pkg/gen/ghcmessages/p_p_m_shipment.go
diff --git a/pkg/gen/ghcmessages/update_p_p_m_shipment.go b/pkg/gen/ghcmessages/update_p_p_m_shipment.go
diff --git a/pkg/gen/internalapi/embedded_spec.go b/pkg/gen/internalapi/embedded_spec.go
diff --git a/pkg/gen/internalmessages/create_p_p_m_shipment.go b/pkg/gen/internalmessages/create_p_p_m_shipment.go
diff --git a/pkg/gen/internalmessages/p_p_m_shipment.go b/pkg/gen/internalmessages/p_p_m_shipment.go
diff --git a/pkg/gen/internalmessages/update_p_p_m_shipment.go b/pkg/gen/internalmessages/update_p_p_m_shipment.go
diff --git a/pkg/gen/primeapi/embedded_spec.go b/pkg/gen/primeapi/embedded_spec.go
diff --git a/pkg/gen/primemessages/create_p_p_m_shipment.go b/pkg/gen/primemessages/create_p_p_m_shipment.go
diff --git a/pkg/gen/primemessages/p_p_m_shipment.go b/pkg/gen/primemessages/p_p_m_shipment.go
diff --git a/pkg/gen/primemessages/update_p_p_m_shipment.go b/pkg/gen/primemessages/update_p_p_m_shipment.go