Skip to content

Commit f67ce3c

Browse files
committed
Merge branch 'ORV2-5202-Shopping-Cart--Responsive-Design-Needed' of https://github.com/bcgov/onroutebc into ORV2-5202-Shopping-Cart--Responsive-Design-Needed
2 parents 377e94d + 80538d1 commit f67ce3c

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

frontend/src/features/permits/constants/stos.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,21 @@ export const STOS_CONDITIONS: PermitCondition[] = [
4545
conditionLink: "https://www.th.gov.bc.ca/forms/getForm.aspx?formId=1254",
4646
checked: false
4747
},
48+
{
49+
description: "Structure Permit Conditions",
50+
condition: "CVSE-1000S",
51+
conditionLink: "https://www.th.gov.bc.ca/forms/getForm.aspx?formId=1255",
52+
checked: false
53+
},
54+
{
55+
description: "Log Permit Conditions",
56+
condition: "CVSE-1000L",
57+
conditionLink: "https://www.th.gov.bc.ca/forms/getForm.aspx?formId=1250",
58+
checked: false
59+
},
4860
];
4961

50-
export const MANDATORY_STOS_CONDITIONS: PermitCondition[] =
62+
export const MANDATORY_STOS_CONDITIONS: PermitCondition[] =
5163
STOS_CONDITIONS.filter(
5264
({ condition }: PermitCondition) =>
5365
condition === "CVSE-1000" || condition === "CVSE-1070"

frontend/src/features/permits/helpers/vehicles/subtypes/getEligibleVehicleSubtypes.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Policy } from "onroute-policy-engine";
22

33
import { Nullable } from "../../../../../common/types/common";
4-
import { PermitType } from "../../../types/PermitType";
4+
import { isTermPermitType, PermitType } from "../../../types/PermitType";
55
import { getDefaultRequiredVal } from "../../../../../common/helpers/util";
66
import { DEFAULT_EMPTY_SELECT_VALUE } from "../../../../../common/constants/constants";
77

@@ -38,7 +38,10 @@ export const getEligibleVehicleSubtypes = (
3838
).keys(),
3939
...getDefaultRequiredVal(
4040
new Map<string, string>(),
41-
subtypesMap.get("trailers"),
41+
// Only term permits allow trailer subtypes to be used
42+
isTermPermitType(permitType)
43+
? subtypesMap.get("trailers")
44+
: undefined,
4245
).keys(),
4346
],
4447
);

frontend/src/features/permits/pages/Application/components/common/ConditionalLicensingFeeLabel.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ export const ConditionalLicensingFeeLabel = ({
7777
{link ? (
7878
<CustomExternalLink
7979
href={link.link}
80+
openInNewTab
8081
className={classes?.link}
8182
data-testid={`conditional-licensing-fee-link-${clf}`}
8283
withLinkIcon={true}

frontend/src/features/permits/pages/Application/components/form/VehicleInformationSection/VehicleDetails.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ export const VehicleDetails = ({
9191
PERMIT_TYPES.QRFR,
9292
PERMIT_TYPES.NRSCV,
9393
PERMIT_TYPES.NRQCV,
94+
PERMIT_TYPES.STOS,
9495
] as PermitType[]
9596
).includes(permitType);
9697

frontend/src/features/permits/pages/Application/components/pay/paymentOptions/InPersonPPCPaymentOption.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export const InPersonPPCPaymentOption = ({
152152
}}
153153
label={
154154
<div className="label__text">
155-
In-person at a Provinicial Permit Centre
155+
In-person at a Provincial Permit Centre
156156
</div>
157157
}
158158
value={paymentMethod}

0 commit comments

Comments
 (0)