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

Main b 21659 display estimated prices ub #14811

Merged
merged 15 commits into from
Feb 18, 2025
Merged

Main b 21659 display estimated prices ub #14811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
810a4d2
Merge branch 'B-21569' into branch MAIN-B-21659
msaki-caci Jan 14, 2025
9f503f7
B-21659 Add IUBUPK, UBP, and IUBPK to ServiceItemDetails
msaki-caci Jan 15, 2025
fe3c301
Merge branch 'main' into MAIN-B-21659_Display_estimated_prices_UB
msaki-caci Jan 15, 2025
19600c1
B-21659 Add UB prop type to fix warnings
msaki-caci Jan 15, 2025
1dfb099
Merge branch 'B-21569' into branch MAIN-B-21659
msaki-caci Jan 17, 2025
558b9b8
B-21659 Update ServiceItemDetails.test.jsx
msaki-caci Jan 20, 2025
5571ed3
B-21659 Run make server_generate
msaki-caci Jan 20, 2025
0d1b756
Merge branch 'main' into branch B-21659
msaki-caci Jan 20, 2025
094d873
Merge branch 'B-21659' into MAIN-B-21659
msaki-caci Jan 24, 2025
e25ba35
MAIN-B-21659 Add UB to ShipmentFormRemarks
msaki-caci Jan 24, 2025
dcb640f
Merge branch 'main' into MAIN-B-21659_Display_estimated_prices_UB
msaki-caci Feb 3, 2025
fe8e2eb
Merge branch 'main' into MAIN-B-21659_Display_estimated_prices_UB
msaki-caci Feb 5, 2025
ce47e68
Merge branch 'main' into MAIN-B-21659_Display_estimated_prices_UB
msaki-caci Feb 13, 2025
8fecee1
Merge branch 'main' into MAIN-B-21659_Display_estimated_prices_UB
brianmanley-caci Feb 13, 2025
b2f06d9
Merge branch 'main' into MAIN-B-21659_Display_estimated_prices_UB
msaki-caci Feb 17, 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
1 change: 1 addition & 0 deletions src/components/Office/DefinitionLists/ShipmentInfoListSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ ShipmentInfoListSelector.propTypes = {
SHIPMENT_TYPES.BOAT_HAUL_AWAY,
SHIPMENT_TYPES.BOAT_TOW_AWAY,
SHIPMENT_OPTIONS.MOBILE_HOME,
SHIPMENT_OPTIONS.UNACCOMPANIED_BAGGAGE,
]),
isForEvaluationReport: PropTypes.bool,
destinationDutyLocationPostalCode: PropTypes.string,
Expand Down
5 changes: 4 additions & 1 deletion src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,11 @@ const ServiceItemDetails = ({ id, code, details, serviceRequestDocs, shipment, s
case 'ISLH':
case 'IHPK':
case 'IHUPK':
case 'IUBPK':
case 'IUBUPK':
case 'POEFSC':
case 'PODFSC': {
case 'PODFSC':
case 'UBP': {
detailSection = (
<div>
<dl>
Expand Down
96 changes: 61 additions & 35 deletions src/components/Office/ServiceItemDetails/ServiceItemDetails.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,44 +523,70 @@ describe('ServiceItemDetails Crating Rejected', () => {
});
});

describe('ServiceItemDetails Estimated Price for DLH, DSH, FSC, DOP, DDP, DPK, DUPK', () => {
it.each([['DLH'], ['DSH'], ['FSC'], ['DOP'], ['DDP'], ['DPK'], ['DUPK']])(
'renders the formatted estimated price field for the service items',
(code) => {
render(
<ServiceItemDetails
id="1"
code={code}
details={details}
shipment={shipment}
serviceRequestDocs={serviceRequestDocs}
/>,
);

expect(screen.getByText('Estimated Price:')).toBeInTheDocument();
expect(screen.getByText('$28.00')).toBeInTheDocument();
},
);
describe('ServiceItemDetails Estimated Price for DLH, DSH, FSC, DOP, DDP, DPK, DUPK, ISLH, IHPK, IHUPK, IUBPK, IUBUPK, POEFSC, PODFSC, UBP', () => {
it.each([
['DLH'],
['DSH'],
['FSC'],
['DOP'],
['DDP'],
['DPK'],
['DUPK'],
['ISLH'],
['IHPK'],
['IHUPK'],
['IUBPK'],
['IUBUPK'],
['POEFSC'],
['PODFSC'],
['UBP'],
])('renders the formatted estimated price field for the service item: %s', (code) => {
render(
<ServiceItemDetails
id="1"
code={code}
details={details}
shipment={shipment}
serviceRequestDocs={serviceRequestDocs}
/>,
);

expect(screen.getByText('Estimated Price:')).toBeInTheDocument();
expect(screen.getByText('$28.00')).toBeInTheDocument();
});

const noEstimatePriceDetails = {};

it.each([['DLH'], ['DSH'], ['FSC'], ['DOP'], ['DDP'], ['DPK'], ['DUPK']])(
'renders - for estimated price when price is not in details',
(code) => {
render(
<ServiceItemDetails
id="1"
code={code}
details={noEstimatePriceDetails}
shipment={shipment}
serviceRequestDocs={serviceRequestDocs}
/>,
);

expect(screen.getByText('Estimated Price:')).toBeInTheDocument();
expect(screen.getByText('-')).toBeInTheDocument();
},
);
it.each([
['DLH'],
['DSH'],
['FSC'],
['DOP'],
['DDP'],
['DPK'],
['DUPK'],
['ISLH'],
['IHPK'],
['IHUPK'],
['IUBPK'],
['IUBUPK'],
['POEFSC'],
['PODFSC'],
['UBP'],
])('renders - for estimated price when price is not in details for the service item: %s', (code) => {
render(
<ServiceItemDetails
id="1"
code={code}
details={noEstimatePriceDetails}
shipment={shipment}
serviceRequestDocs={serviceRequestDocs}
/>,
);

expect(screen.getByText('Estimated Price:')).toBeInTheDocument();
expect(screen.getByText('-')).toBeInTheDocument();
});
});

describe('ServiceItemDetails Price for MS, CS', () => {
Expand Down
1 change: 1 addition & 0 deletions src/components/Office/ShipmentDisplay/ShipmentDisplay.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ ShipmentDisplay.propTypes = {
SHIPMENT_TYPES.BOAT_HAUL_AWAY,
SHIPMENT_TYPES.BOAT_TOW_AWAY,
SHIPMENT_OPTIONS.MOBILE_HOME,
SHIPMENT_OPTIONS.UNACCOMPANIED_BAGGAGE,
]),
displayInfo: PropTypes.oneOfType([
PropTypes.shape({
Expand Down
1 change: 1 addition & 0 deletions src/components/Office/ShipmentFormRemarks/ShipmentFormRemarks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ ShipmentFormRemarks.propTypes = {
SHIPMENT_OPTIONS.BOAT,
SHIPMENT_TYPES.BOAT_HAUL_AWAY,
SHIPMENT_TYPES.BOAT_TOW_AWAY,
SHIPMENT_OPTIONS.UNACCOMPANIED_BAGGAGE,
]).isRequired,
customerRemarks: PropTypes.string,
counselorRemarks: PropTypes.string,
Expand Down
Loading