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

B 22187 INT - Display tertiary delivery address under updated shipment in H&A Log #14564

Merged
merged 8 commits into from
Jan 16, 2025
Merged

B 22187 INT - Display tertiary delivery address under updated shipment in H&A Log #14564

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
1a129d1
correct 'destination' to 'delivery' in move history and use consisten…
ajlusk Jan 10, 2025
d4d2b44
tests for has_blankary_blank_address values in move history
ajlusk Jan 10, 2025
d39774c
Merge branch 'B-22187' into B-22187-INT
ajlusk Jan 10, 2025
a8f25c6
Merge branch 'integrationTesting' into B-22187-INT
ajlusk Jan 13, 2025
fc63a81
Merge branch 'integrationTesting' into B-22187-INT
ajlusk Jan 13, 2025
4ea42af
Merge branch 'integrationTesting' into B-22187-INT
ajlusk Jan 15, 2025
295d27d
Merge branch 'integrationTesting' into B-22187-INT
ajlusk Jan 16, 2025
b2da634
Merge branch 'integrationTesting' into B-22187-INT
ajlusk Jan 16, 2025
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
6 changes: 3 additions & 3 deletions src/constants/MoveHistory/Database/FieldMappings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ export default {
shipment_type: 'Shipment type',
pickup_address: 'Pickup Address',
secondary_pickup_address: 'Second Pickup Address',
has_secondary_pickup_address: 'Secondary Pickup Address',
has_secondary_pickup_address: 'Second Pickup Address',
tertiary_pickup_address: 'Third Pickup Address',
has_tertiary_pickup_address: 'Third Pickup Address',
destination_address: 'Delivery Address',
secondary_destination_address: 'Second Delivery Address',
has_secondary_delivery_address: 'Secondary Delivery Address',
has_secondary_delivery_address: 'Second Delivery Address',
tertiary_destination_address: 'Third Delivery Address',
has_tertiary_destination_address: 'Third Delivery Address',
has_tertiary_delivery_address: 'Third Delivery Address',
antgmann marked this conversation as resolved.
Show resolved Hide resolved
receiving_agent: 'Receiving agent',
releasing_agent: 'Releasing agent',
tio_remarks: 'Max billable weight remark',
Expand Down
9 changes: 8 additions & 1 deletion src/constants/MoveHistory/EventTemplates/UpdateMTOShipment/updateMTOShipment.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ describe('when given an mto shipment update with mto shipment table history reco
status: 'SUBMITTED',
tac_type: 'NTS',
uses_external_vendor: true,

has_secondary_pickup_address: true,
has_secondary_delivery_address: true,
has_tertiary_pickup_address: false,
has_tertiary_delivery_address: true,
advance_amount_requested: 100,
destination_postal_code: '29102',
estimated_incentive: 2252814,
Expand Down Expand Up @@ -103,6 +106,10 @@ describe('when given an mto shipment update with mto shipment table history reco
[FieldMappings.sit_estimated_entry_date, formatCustomerDate(changedValues.sit_estimated_entry_date)],
[FieldMappings.sit_estimated_weight, formatWeight(Number(changedValues.sit_estimated_weight))],
[FieldMappings.spouse_pro_gear_weight, formatWeight(Number(changedValues.spouse_pro_gear_weight))],
[FieldMappings.has_secondary_pickup_address, changedValues.has_secondary_pickup_address ? 'Yes' : 'No'],
[FieldMappings.has_secondary_delivery_address, changedValues.has_secondary_delivery_address ? 'Yes' : 'No'],
[FieldMappings.has_tertiary_pickup_address, changedValues.has_tertiary_pickup_address ? 'Yes' : 'No'],
[FieldMappings.has_tertiary_delivery_address, changedValues.has_tertiary_delivery_address ? 'Yes' : 'No'],
])('displays the correct details value for %s', async (label, value) => {
const targetItem = Object.fromEntries(
Object.entries(changedValues).filter(([key]) => FieldMappings[key] === label),
Expand Down
Loading