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-21667 B-21374 I-13550 INT #14246

Merged
merged 16 commits into from
Nov 21, 2024
Merged

B-21667 B-21374 I-13550 INT #14246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0619981
Merge branch 'main' into B-21467-MAIN-PPM-Verbiage-Update-to-Customer…
joeydoyecaci Nov 8, 2024
1116a85
Merge branch 'main' into B-21467-MAIN-PPM-Verbiage-Update-to-Customer…
joeydoyecaci Nov 8, 2024
3b843c5
Merge branch 'main' into B-21467-MAIN-PPM-Verbiage-Update-to-Customer…
joeydoyecaci Nov 14, 2024
86790a6
Bump cross-spawn from 7.0.3 to 7.0.6
dependabot[bot] Nov 19, 2024
407b616
Merge branch 'main' into B-21467-MAIN-PPM-Verbiage-Update-to-Customer…
joeydoyecaci Nov 19, 2024
b8de2df
Merge branch 'main' into dependabot/npm_and_yarn/cross-spawn-7.0.6
deandreJones Nov 19, 2024
3431f45
Merge branch 'main' into B-21467-MAIN-PPM-Verbiage-Update-to-Customer…
joeydoyecaci Nov 19, 2024
b0fa7b3
Merge pull request #14226 from transcom/dependabot/npm_and_yarn/cross…
deandreJones Nov 20, 2024
6e20315
Merge branch 'main' into B-21467-MAIN-PPM-Verbiage-Update-to-Customer…
joeydoyecaci Nov 20, 2024
94c1b52
Removed unneeded import.
joeydoyecaci Nov 20, 2024
57f8a19
Merge pull request #14143 from transcom/B-21467-MAIN-PPM-Verbiage-Upd…
pambecker Nov 20, 2024
c6b6f25
Merge branch 'main' into B-21667-MAIN
traskowskycaci Nov 20, 2024
4a4fcee
handle 0 dependent value
traskowskycaci Nov 20, 2024
3d23dba
Merge branch 'B-21487-MAIN' into B-21667-I-13550-MAIN
traskowskycaci Nov 20, 2024
413d5c9
Merge branch 'B-21667-I-13550-MAIN' into B-21667-I-13550-INT
traskowskycaci Nov 20, 2024
701aae3
Merge branch 'integrationTesting' into B-21667-I-13550-INT
traskowskycaci Nov 21, 2024
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
41 changes: 21 additions & 20 deletions src/components/Office/DefinitionLists/AllowancesList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,27 @@ const AllowancesList = ({ info, showVisualCues }) => {
it will be safe to assume it is an OCONUS order. With this, if one field is present
we show all four. Otherwise, we show none */}
{/* Wrap in FF */}
{enableUB && (info?.accompaniedTour || info?.dependentsTwelveAndOver || info?.dependentsUnderTwelve) && (
<>
<div className={descriptionListStyles.row}>
<dt>Accompanied tour</dt>
<dd data-testid="ordersAccompaniedTour">{info.accompaniedTour ? 'Yes' : 'No'}</dd>
</div>
<div className={descriptionListStyles.row}>
<dt>Dependents under age 12</dt>
<dd data-testid="ordersDependentsUnderTwelve">
{info.dependentsUnderTwelve ? info.dependentsUnderTwelve : DEFAULT_EMPTY_VALUE}
</dd>
</div>
<div className={descriptionListStyles.row}>
<dt>Dependents over age 12</dt>
<dd data-testid="ordersDependentsTwelveAndOver">
{info.dependentsTwelveAndOver ? info.dependentsTwelveAndOver : DEFAULT_EMPTY_VALUE}
</dd>
</div>
</>
)}
{enableUB &&
(info?.accompaniedTour || info?.dependentsTwelveAndOver > 0 || info?.dependentsUnderTwelve > 0) && (
<>
<div className={descriptionListStyles.row}>
<dt>Accompanied tour</dt>
<dd data-testid="ordersAccompaniedTour">{info.accompaniedTour ? 'Yes' : 'No'}</dd>
</div>
<div className={descriptionListStyles.row}>
<dt>Dependents under age 12</dt>
<dd data-testid="ordersDependentsUnderTwelve">
{info.dependentsUnderTwelve ? info.dependentsUnderTwelve : DEFAULT_EMPTY_VALUE}
</dd>
</div>
<div className={descriptionListStyles.row}>
<dt>Dependents over age 12</dt>
<dd data-testid="ordersDependentsTwelveAndOver">
{info.dependentsTwelveAndOver ? info.dependentsTwelveAndOver : DEFAULT_EMPTY_VALUE}
</dd>
</div>
</>
)}
{enableUB && info?.ubAllowance >= 0 && (
<div className={descriptionListStyles.row}>
<dt>Unaccompanied baggage allowance</dt>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Office/MoveDetails/MoveDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ const MoveDetails = ({
dependentsUnderTwelve: allowances.dependentsUnderTwelve,
dependentsTwelveAndOver: allowances.dependentsTwelveAndOver,
accompaniedTour: allowances.accompaniedTour,
ubAllowance: allowances.ubAllowance,
ubAllowance: allowances.unaccompaniedBaggageAllowance,
};

const customerInfo = {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ const ServicesCounselingMoveDetails = ({
dependentsUnderTwelve: allowances.dependentsUnderTwelve,
dependentsTwelveAndOver: allowances.dependentsTwelveAndOver,
accompaniedTour: allowances.accompaniedTour,
ubAllowance: allowances.ubAllowance,
ubAllowance: allowances.unaccompaniedBaggageAllowance,
};

const ordersInfo = {
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7187,9 +7187,9 @@ cross-fetch@^3.1.5:
node-fetch "2.6.7"

cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
version "7.0.6"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
dependencies:
path-key "^3.1.0"
shebang-command "^2.0.0"
Expand Down