OnRouteBC Release 47 Merge back to main (#2218)

Signed-off-by: Abhishek Dere <abhishek.dere@gov.bc.ca>
Co-authored-by: Abhishek Dere <abhishek.dere@gov.bc.ca>

Author: zgong-gov

database/mssql/scripts/versions/revert/v_88_ddl_revert.sql

@@ -0,0 +1,49 @@
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET NOCOUNT ON
+GO
+SET XACT_ABORT ON
+GO
+SET TRANSACTION ISOLATION LEVEL SERIALIZABLE
+GO
+BEGIN TRANSACTION
+GO
+
+-- Reset vehicle subtype name back to Buses/Crummies in power unit types table for Buses
+UPDATE [dbo].[ORBC_POWER_UNIT_TYPE]
+SET [TYPE]=N'Buses/Crummies'
+WHERE [POWER_UNIT_TYPE]=N'BUSCRUM'
+GO
+
+-- Remove the newly added policy configuration
+DELETE FROM [dbo].[ORBC_POLICY_CONFIGURATION]
+WHERE POLICY_CONFIGURATION_ID = (SELECT MAX(POLICY_CONFIGURATION_ID) FROM [dbo].[ORBC_POLICY_CONFIGURATION])
+GO
+
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+
+DECLARE @VersionDescription VARCHAR(255)
+SET @VersionDescription = 'Reverting updates to power unit types table policy config to update vehicle subtype name for Buses'
+
+INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (87, @VersionDescription, getutcdate())
+GO
+
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+
+COMMIT TRANSACTION
+GO
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+DECLARE @Success AS BIT
+SET @Success = 1
+SET NOEXEC OFF
+IF (@Success = 1) PRINT 'The database revert succeeded'
+ELSE BEGIN
+   IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION
+   PRINT 'The database revert failed'
+END
+GO

database/mssql/scripts/versions/revert/v_89_ddl_revert.sql

@@ -0,0 +1,43 @@
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+SET NOCOUNT ON
+GO
+SET XACT_ABORT ON
+GO
+SET TRANSACTION ISOLATION LEVEL SERIALIZABLE
+GO
+BEGIN TRANSACTION
+GO
+
+-- Remove the newly added policy configuration
+DELETE FROM [dbo].[ORBC_POLICY_CONFIGURATION]
+WHERE POLICY_CONFIGURATION_ID = (SELECT MAX(POLICY_CONFIGURATION_ID) FROM [dbo].[ORBC_POLICY_CONFIGURATION])
+GO
+
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+
+DECLARE @VersionDescription VARCHAR(255)
+SET @VersionDescription = 'Reverting updates to power unit types table policy config to update vehicle subtype name for Buses'
+
+INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (88, @VersionDescription, getutcdate())
+GO
+
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+
+COMMIT TRANSACTION
+GO
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+DECLARE @Success AS BIT
+SET @Success = 1
+SET NOEXEC OFF
+IF (@Success = 1) PRINT 'The database revert succeeded'
+ELSE BEGIN
+   IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION
+   PRINT 'The database revert failed'
+END
+GO

database/mssql/scripts/versions/v_88_ddl.sql

@@ -55,7 +55,10 @@ footer {
 
 @media (width < 768px) {
   .footer {
-    padding: 0 5.5rem;
+    padding: 0 1.25rem;
+    width: 100%;
+    justify-content: center;
+    align-items: center;
   }
 }
 

database/mssql/scripts/versions/v_89_ddl.sql

@@ -104,6 +104,7 @@
         color: orbcStyles.$white;
         list-style: none;
         padding-left: 8.551vw;
+        box-sizing: border-box;
 
         li {
           margin: 0;
@@ -142,11 +143,50 @@
 */
 @media (width < 768px) {
   .header {
+    position: relative;
+    header {
+      height: fit-content;
+      flex-direction: column;
+
+      .brand-section {
+        padding: 0;
+        justify-content: center;
+      }
+
+      .options-section {
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+
+        .auth-section {
+          flex-direction: column;
+
+          .user-section {
+            flex-direction: column;
+          }
+
+          .search-button {
+            margin-right: 0;
+            padding-top: 1rem;
+            color: orbcStyles.$bc-gold;
+            background-color: orbcStyles.$bc-primary-blue;
+          }
+        }
+
+        .other {
+          .nav-btn {
+            padding: 1rem 0;
+            margin-right: 0;
+          }
+        }
+      }
+    }
+
     &__main {
-      padding: 0 5.5rem;
+      padding: 0 0.5rem;
 
       .user-section {
-        display: none;
+        display: flex;
       }
 
       .other {
@@ -201,14 +241,14 @@
         ul {
           flex-direction: column;
           margin: 0;
-          padding: 0 5.5rem;
+          padding: 0 1.5rem;
 
           li {
             margin: 5px 0;
 
             a {
               border: none;
-              
+
               &:hover {
                 text-decoration: underline;
               }

frontend/src/common/components/footer/Footer.scss

@@ -167,7 +167,7 @@ export const Header = () => {
           <Brand />
         </div>
         <div className="options-section">
-          {isAuthenticated ? (
+          {isAuthenticated && !menuOpen ? (
             <div className="auth-section">
               {isIdir ? <SearchButton onClick={toggleFilter} /> : null}
               <UserSection username={username} />

frontend/src/common/components/header/Header.scss

@@ -31,7 +31,7 @@ export const BANNER_MESSAGES = {
     "Rejected applications appear in Applications in Progress.",
   APPLICATION_NOTES:
     "Application notes can provide additional details to the Provincial Permit Centre when submitting a permit application for review.",
-  APPLICATION_NOTES_EXAMPLE: "e.g. Use the credit account for payment.",
+  APPLICATION_NOTES_EXAMPLE: "e.g. For extraordinary load approval AB1234",
   APPLICATION_NOTES_INFO:
     "Application notes will not appear on the permit document.",
   HIGHWAY_SEQUENCES: {

frontend/src/common/components/header/Header.tsx

@@ -108,7 +108,7 @@ export const getDefaultPowerUnitSubTypes = () => [
   },
   {
     typeCode: "BUSCRUM",
-    type: "Buses/Crummies",
+    type: "Buses",
     description: "A motor vehicle used to transport persons, when such transportation is not undertaken for compensation or gain.",
   },
 ];

frontend/src/common/constants/bannerMessages.ts

@@ -128,4 +128,8 @@ export const CONDITIONAL_LICENSING_FEE_LINKS = {
     LINK_TEXT: "Commercial Transport Fees Regulation Item 2(b)",
     URL: "https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/328_91",
   },
+  COMMERCIAL_PASSENGER_VEHICLE_FEE_RATE: {
+    LINK_TEXT: "Commercial Transport Fees Regulation 2 (a.2)",
+    URL: "https://www.bclaws.gov.bc.ca/civix/document/id/complete/statreg/328_91",
+  },
 };