[Release] Version 0.3.8 (#411)

sherryhli · albertlai431 · ChinemeremChigbo · web-flow · commit 7c77fcb89204 · 2025-12-22T14:31:27.000-05:00
* [Fix] Use Heroku recommended heap configs for 512 MB dyno (#405) * [Fix] make patient condition mandatory (#404) * [Fix] make patient condition mandatory * set default * Use created at not expiry date for sorting apps (#399) * Use created at not expiry date * Update utils.ts * Wallet Card Fix (#398) * [Release] Version 0.0.1 (#243) * [Fix] Fix replacement application expiry date ([Fix] Fix replacement application expiry date #242) * [Feature] Build privacy policy and terms and conditions pages ([Feature] Build privacy policy and terms and conditions pages #241) * [Improvement] Add error logging, improve error handling ([Improvement] Add error logging, improve error handling #240) * [Fix] Convert patient condition field to checkbox field ([Fix] Convert patient condition field to checkbox field #239) * [Feature] Add date of birth filter to permit holders page ([Feature] Add date of birth filter to permit holders page #238) * [Fix] Prevent RCD email from breaking into two lines ([Fix] Prevent RCD email from breaking into two lines #237) * [Fix] Various bug fixes ([Fix] Various bug fixes #236) * [Release] Version 0.0.2 (#249) * [Fix] Various bug fixes (#236) * [Fix] Prevent RCD email from breaking into two lines (#237) * [Feature] Add date of birth filter to permit holders page (#238) * [Fix] Convert patient condition field to checkbox field (#239) * Convert patient condition field to checkbox field * Fix build error * [Improvement] Add error logging, improve error handling (#240) * Add error logging, improve error handling * Replace GraphQL hooks with custom implementation * [Feature] Build privacy policy and terms and conditions pages (#241) * Create privacy policy and ToC pages * Fix links in ToC pages * [Fix] Fix replacement application expiry date (#242) * [Fix] Disable GraphQL playground in production (#244) * [Fix] Remove GQL playground redirect (#245) * [Improvement] Various fixes (#246) * [Fix] Fix homepage RCD emails (#247) * [Fix] Get most recent permit by latest expiry date (#248) * [Release] Version 0.0.3 (#251) * [Fix] Various bug fixes (#236) * [Fix] Prevent RCD email from breaking into two lines (#237) * [Feature] Add date of birth filter to permit holders page (#238) * [Fix] Convert patient condition field to checkbox field (#239) * Convert patient condition field to checkbox field * Fix build error * [Improvement] Add error logging, improve error handling (#240) * Add error logging, improve error handling * Replace GraphQL hooks with custom implementation * [Feature] Build privacy policy and terms and conditions pages (#241) * Create privacy policy and ToC pages * Fix links in ToC pages * [Fix] Fix replacement application expiry date (#242) * [Fix] Disable GraphQL playground in production (#244) * [Fix] Remove GQL playground redirect (#245) * [Improvement] Various fixes (#246) * [Fix] Fix homepage RCD emails (#247) * [Fix] Get most recent permit by latest expiry date (#248) * [Fix] Fix various applications issues (#250) * [Release] Version 0.0.4 (#255) * [Improvement] Split address fields in permit holders report ([Improvement] Split address fields in permit holders report #253) * [Fix] Restrict permit expiry filter to only active permits ([Fix] Restrict permit expiry filter to only active permits #254) * [Fix] Standardize date formatting ([Fix] Standardize date formatting #252) * [Release] Version 0.0.5 (#257) * [Fix] Show applicants even if they do not have an active permit ([Fix] Show applicants even if they do not have an active permit #256) * [Release] Version 0.0.6 (#264) * [Fix] Fix create new APP flow failing (#263) * [Fix] Fix task log entries not showing (#262) * [Fix] Fix inconsistent applicant flow copy (#261) * [Fix] Fix accountant report aggregation values (#260) * [Fix] Fix invoice records failing to be created (#259) * [Fix] Fix permit holders not rendering if no recent permit (#258) * Revert "[Release] Version 0.0.6 (#264)" This reverts commit 1f971f9. * [Release] Version 0.0.6 (#270) * [Fix] Disable GQL playground and introspection in production (#269) * [Fix] Specify node version in package.json (#268) * [Fix] Allow GQL introspection (#267) * [Fix] Re-enable GQL playground for debugging (#266) * [Fix] Add port to Next start script (#265) * [Fix] Fix create new APP flow failing (#263) * [Fix] Fix task log entries not showing (#262) * [Fix] Fix inconsistent applicant flow copy (#261) * [Fix] Fix accountant report aggregation values (#260) * [Fix] Fix invoice records failing to be created (#259) * [Fix] Fix permit holders not rendering if no recent permit (#258) * [Release] Version 0.0.7 * [Fix] Pin GitHub CI runner image to ubuntu-20.04 (#285) * Update README (#284) * Fix time zone bug in requests header (#281) * [Fix] Fix time zone for requests and reports (#278) * [Chore] Add BSF contributors to employee database (#277) * [Chore] Create docker-compose.yml file for local PostgreSQL instance (#276) * [Docs] BSF CONTRIBUTING.md (#275) * Revert "[Release] Version 0.0.7" This reverts commit 3f2d160. * [Release] Version 0.0.7 (#294) * [Fix] Change renewal report to most recent expiring permits (#293) * [Feature] Allow processing fee field to be manually edited (#291) * [Fix] Fix the GraphQL delete employee mutation (#286) * [Fix] Add refunds to accountant report (#292) * Add note field for permit holder’s old user ID (#290) * Update User ID copy (#289) * [Fix] Pin GitHub CI runner image to ubuntu-20.04 (#285) * Update README (#284) * Fix time zone bug in requests header (#281) * [Fix] Fix time zone for requests and reports (#278) * [Chore] Add BSF contributors to employee database (#277) * [Chore] Create docker-compose.yml file for local PostgreSQL instance (#276) * [Docs] BSF CONTRIBUTING.md (#275) * [Release] Version 0.0.8 (#304) * Update shopify-buy in yarn.lock (#303) * update shopify version to undeprecated one (#302) * Revert "[Release] Version 0.0.8 (#304)" This reverts commit 73dd958. * [Release] Version 0.0.8 (#308) * Allow numbers in MSP (#296) * [Fix] Broken contact us link (#298) * change nam and address spacing to absolute instead of floating (#300) * Go to applicationProcessing instead of application (#301) * update shopify version to undeprecated one (#302) * Fix bash command for Windows (#299) * Update shopify-buy in yarn.lock (#303) * [Fix] No guardian on delete (#297) * Update processing fee from $26 to $31 (#305) * [Feature] Support search by permit ID on Permit Holders page (#307) * Change pdf address spacing from 1.5 to 1.4 (#306) * [Fix] Update form links to reflect new processing fee (#309) * [Release] Version 0.0.9 (#321) * [Fix] Save poaFormS3ObjectKey when updating guardian information in permit holders page (#319) * [Fix] Postal Code Space Issue (#316) * Set other gender field on permit holders page (#318) * Add .nvmrc file (#317) * [Feature] Implement applicant deletion (#310) * [Feature] Implement application deletion (#315) * Display other gender field on permit holders page (#314) * Move wallet card task in application processing (#313) * [Feature] Tax receipt (#311) * [Fix] Fix expiry date for in-progress replacement applications (#274) * [Fix] Fix APP history permit type badge (#273) * [Improvement] Adjust spacing of address in invoice (#272) * [Fix] Show validation error messages on form mount (#271) * Revert "[Release] Version 0.0.9 (#321)" This reverts commit 6fb599c. * [Release] Version 0.0.9 (#324) * [Feature] Create setEmployeeAsActive GraphQL endpoint (#322) * [Fix] Save poaFormS3ObjectKey when updating guardian information in permit holders page (#319) * [Fix] Postal Code Space Issue (#316) * Set other gender field on permit holders page (#318) * Add .nvmrc file (#317) * [Feature] Implement applicant deletion (#310) * [Feature] Implement application deletion (#315) * Display other gender field on permit holders page (#314) * Move wallet card task in application processing (#313) * [Feature] Tax receipt (#311) * [Fix] Fix expiry date for in-progress replacement applications (#274) * [Fix] Fix APP history permit type badge (#273) * [Improvement] Adjust spacing of address in invoice (#272) * [Fix] Show validation error messages on form mount (#271) * [Release] Version 0.1.0 (#332) * [Release] Version 0.2.0 (#337) * [Improvement] Update donation receipt spacing (#326) * Fix validation schema for other gender field (#327) * Adjust schema to evaluate date at validation time (#328) * [Fix] Make replacement requests clearer (#325) * Add new contributor to seeding script (#330) * ignore the .yarn file for > v2.0.0 (#331) * [Misc] Create initial baseline migration file (#333) * [Doc] Update README with prisma migrate deploy command (#334) * [Fix] Fix replacement request otherGender and lostTimestamp form validations (#335) * [Misc] Add holiday closure banner (#336) * [Release] Version 0.3.0 (#351) * [Improvement] Clarify lowercase extension requirement for POA form upload (#343) * Change text on processing task 2 (#344) * Remove holiday closure banner (#345) * [Feature] Update ci.yml to add pending migrations to db (#339) * Update ci.yml to add pending migrations to db * Add .env file to CI * Update ci.yml * Update ci.yml * Use longer URL * Add to package.json instead * revert ci.yml * Re-add ci.yml * Add space to yarn build * Make title fit on one line (#347) * [Fix] Remove npx from start script (#348) * [Feature] Add AMEX (#346) * Add Amex * Add Amex to popoulate js file * Update populate-db-09-13-21.ts * [Fix] Revert init migration file and add new migration for AMEX paymenttype (#349) * Revert paymenttype edit to init migration file * Create migration to add AMEX paymenttype * [Improvement] Change helper text for date of birth (#350) * Change helper text for date of birth * Remove text wrapper on DOB helper text * [Feature] Add second payment method for permit requests (#338) * Add second payment method types to schema * Update application validation schema to allow second payment methods * Change payment detail components to show second payment method * Consider donations on second payment method in processing tasks * Update data pipelines to generate accountant reports with second payment method included * Update invoice and donation receipt with second payment method included * Rename second payment method variables to improve clarity * Add migration for second payment method --------- Co-authored-by: Sherry Li <sherryhli@users.noreply.github.com> Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> * [Release] Version 0.3.1 (#354) * Fix second payment method reports (#352) * [Feature] Update permit holders report (#353) * Combine address lines 1 and 2 into one line * Add applicant age to permit holders report * Add recent app expiry date to permit holders report * [Version] Release 0.3.2 (#359) * Matthew Wang (#356) * [Fix] Fix formatting of date in donation tax receipt number (#357) * Fix month value indexing and padding in tax receipt number * Switch to using formatDate function from date util * Update permit holders report 2 (#358) * Update permit holders report 2 * Format postal code --------- Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> Co-authored-by: Matthew Wang <53355975+mslwang@users.noreply.github.com> * [Release] Version 0.3.3 (#365) * Add Sharujan to employees.ts (#360) * [Improvement] Add Mail Lost Option as Replacement Reason (#340) * initial commit for the mail lost option * changed the processing fee for mail lost * made the migrations for mail lost * reverted yarn lock to staging * initial commit for the mail lost option * changed the processing fee for mail lost * made the migrations for mail lost * reverted yarn lock to staging --------- Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> * Add $200 donation option (#355) * Add $200 donation option * Add $200 donation option * Update .env.sample with $200 donation product id --------- Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> * Change address from unit 842 to 968 (#361) * [Fix] Add AMEX as a second payment option (#362) * [Feature] Add receipt numbers to application reports (#363) * [Misc] Update README.md (#364) --------- Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> Co-authored-by: Keane Moraes <lordvader3002@gmail.com> Co-authored-by: Sherry Li <sherryhli@users.noreply.github.com> * [Release] Version 0.3.4 (#375) * Add bowen to employees (#367) * Add Jenny to employees (#368) * [Fix] Mail Lost Default to Cash (#366) * initial commit for the mail lost option * changed the processing fee for mail lost * made the migrations for mail lost * reverted yarn lock to staging * mail lost default to cash * removed the extra other option * Add Jenn Chen * fix name * [Fix] Fix names being clipped in table cell content (#370) * Set overflow-y to visible for table content * Update employee email for testing * Update overflow property for requests table * move generate report button (#369) * Update permit form links (#373) Use the 2024 links for the permit replacement and application forms * [Fix] Force network call for accountant report download (#371) --------- Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> Co-authored-by: Keane Moraes <lordvader3002@gmail.com> Co-authored-by: Jennifer Chen <32009013+jennchenn@users.noreply.github.com> Co-authored-by: Jenny Vong <jenny_vong@outlook.com> * [Release] Version 0.3.5 (#384) * [enhancement] Track application status to return to original tab in admin view (#372) * Track application status to return to correct tab * fixup! Track application status to return to correct tab * [Fix] Unsaved Doctor's Information (#374) * used values.doctorInformation instead of doctorInformation * using validated values for doctor's info * [Improvement] Add pagination controls to top of requests/permit holders tables (#376) * Add pagination to top of requests table * Add pagination to top of permit holders table * Add Vihaan to employees.ts (#379) * Add Braydent to employee.ts (#380) * broyston: updated stamp png to contain new address (#382) * Add phone number and addresses to request report (#383) * Remove applicant deletion (#377) --------- Co-authored-by: Jennifer Chen <32009013+jennchenn@users.noreply.github.com> Co-authored-by: Keane Moraes <lordvader3002@gmail.com> Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> Co-authored-by: Brayden Royston <brayden.royston10@gmail.com> * [Release] Version 0.3.6 (#396) * [Improvement] Sort permit past applications (#378) * Return creation timestamp in permit application query * Sort past permit applications in permit holder page * Fix types in sort function * Add createdAt type to application Pick * [Fix] updatedAt for Replacement Application fixed (#381) * added the updatedAt tag for the replacement appplicaiton * added the migration for the replacement app * removed the migration * Add David to employee.ts (#388) * Remove completed request deletion (#386) * [Feature] Add editable page numbers (#387) * Add editable page numbers * Add total pagination denominator * Added the model updatedAt to the prisma schema (#385) * Fixed Finanical Report Header Order (#390) * update GitHub Actions to use v4 cache/actions (#394) * Migrate Shopify checkout to Cart API (#393) * Migrate Shopify checkout to Cart API - Replace deprecated shopify-buy Checkout API with Shopify's Cart API - Remove shopify-buy.d.ts * Update utils.ts * Downgrad graphql-request * Create Wallet Card (#389) * Update Prisma Schema to store Generated Wallet Card (cherry picked from commit 3fc2703) * Update Prisma Schema to maintain both WalletCardCreated and WalletCard (cherry picked from commit 2b65a46) * Prisma Schema Wallet Bug fix (cherry picked from commit 4aa3307) * Update resolvers to upload test pdf to s3 bucket (cherry picked from commit dc1b7c1) * Update GraphQl Schema with WalletCard info (cherry picked from commit b371b48) * Renaming changes from wallet to walletCard in generateWalletCard Resolvers (cherry picked from commit 96d06e9) * Add Wallet Document Creation Logic * Update Prisma Schema to store Generated Wallet Card (cherry picked from commit 3fc2703) * Update Prisma Schema to maintain both WalletCardCreated and WalletCard (cherry picked from commit 2b65a46) * Prisma Schema Wallet Bug fix (cherry picked from commit 4aa3307) * Update resolvers to upload test pdf to s3 bucket (cherry picked from commit dc1b7c1) * Update GraphQl Schema with WalletCard info (cherry picked from commit b371b48) * Renaming changes from wallet to walletCard in generateWalletCard Resolvers (cherry picked from commit 96d06e9) * Add Wallet Document Creation Logic * Update PDF Generation to use user data * Update PDF Generation Expiry Time * Remove Wallet Card from Application Processing * Fix Bug with disabled mark as complete button * Generate Wallet With Application Completion * Fix CLI errors * Fix Lint Issues * Add wallet card creation and PDF generation to transaction application completion process * Upgrade to ubuntu 22.04 * Revert to Ubuntu 20.04 --------- Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> * [Feature] Search by Doctor MSP number for Renewal Application (#392) * added a doctor typeahead * added the graphql for the typeahead * updated thre graphql schemas to correctky handle the request * generated the graphql types * sending the request correctly to the graphql server * sending the request correctly to the graphql server * changed the search criterion to contains * added the resolver to the lib graphql * kept only msp number in the git commit * changed the search box placeholder text * return more doctor information * added the form filling code * added spacing and explanations * patched the problem with the reinitialize form * patching the linting errors --------- Co-authored-by: Jennifer Chen <32009013+jennchenn@users.noreply.github.com> Co-authored-by: Keane Moraes <lordvader3002@gmail.com> Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> Co-authored-by: David Lu <151972620+ludavidca@users.noreply.github.com> Co-authored-by: Sharujan Sreekaran <34523327+ssreekar@users.noreply.github.com> * Fix Application Id * Update Wallet Card to be 2.75 by 1.25 * Add Comment * Fix Lint issues * Update lib/application-processing/resolvers.ts Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> --------- Co-authored-by: Oustan Ding <oustan10@gmail.com> Co-authored-by: Leo Huang <leogjhuang@gmail.com> Co-authored-by: Leo Huang <77544794+leogjhuang@users.noreply.github.com> Co-authored-by: Sherry Li <sherryhli@users.noreply.github.com> Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> Co-authored-by: Matthew Wang <53355975+mslwang@users.noreply.github.com> Co-authored-by: Keane Moraes <lordvader3002@gmail.com> Co-authored-by: Jennifer Chen <32009013+jennchenn@users.noreply.github.com> Co-authored-by: Jenny Vong <jenny_vong@outlook.com> Co-authored-by: Brayden Royston <brayden.royston10@gmail.com> Co-authored-by: David Lu <151972620+ludavidca@users.noreply.github.com> * Add Banner for Jan 1st Price increase (#407) * Add Banner for Jan 1st * Update Description * Update Banner Info * Update price increase message (#409) * Revert heap size configs in start script (#410) --------- Co-authored-by: Albert Lai <albertlai631@outlook.com> Co-authored-by: Chinemerem <chinemeremchigbo@Outlook.com> Co-authored-by: Sharujan Sreekaran <34523327+ssreekar@users.noreply.github.com> Co-authored-by: Oustan Ding <oustan10@gmail.com> Co-authored-by: Leo Huang <leogjhuang@gmail.com> Co-authored-by: Leo Huang <77544794+leogjhuang@users.noreply.github.com> Co-authored-by: Matthew Wang <53355975+mslwang@users.noreply.github.com> Co-authored-by: Keane Moraes <lordvader3002@gmail.com> Co-authored-by: Jennifer Chen <32009013+jennchenn@users.noreply.github.com> Co-authored-by: Jenny Vong <jenny_vong@outlook.com> Co-authored-by: Brayden Royston <brayden.royston10@gmail.com> Co-authored-by: David Lu <151972620+ludavidca@users.noreply.github.com>
diff --git a/lib/applicants/utils.ts b/lib/applicants/utils.ts
@@ -34,7 +34,8 @@ export const getMostRecentPermit = async (applicantId: number): Promise<Permit |
       where: { id: applicantId },
     })
     .permits({
-      orderBy: { expiryDate: SortOrder.DESC },
+      where: { active: true },
+      orderBy: [{ expiryDate: SortOrder.DESC }, { createdAt: SortOrder.DESC }],
       take: 1,
     });
 
diff --git a/lib/application-processing/resolvers.ts b/lib/application-processing/resolvers.ts
@@ -400,7 +400,7 @@ export const completeApplication: Resolver<
             firstName,
             lastName,
             dateOfBirth,
-            id
+            applicantId.toString()
           );
           if (!result || !result.ok) {
             logger.error({ error: 'Error creating Wallet Card PDF' });
@@ -465,14 +465,29 @@ export const completeApplication: Resolver<
           },
         });
 
-        const [upsertedPhysician, createdPermit, completedApplicationProcessing] =
-          await prisma.$transaction([
-            upsertPhysicianOperation,
-            createPermitOperation,
-            completeApplicationOperation,
-          ]);
+        const queryApplicationOperation = prisma.application.findUnique({
+          where: { id },
+          include: { applicationProcessing: true },
+        });
+
+        const [
+          upsertedPhysician,
+          createdPermit,
+          completedApplicationProcessing,
+          queriedApplication,
+        ] = await prisma.$transaction([
+          upsertPhysicianOperation,
+          createPermitOperation,
+          completeApplicationOperation,
+          queryApplicationOperation,
+        ]);
 
-        if (!upsertedPhysician || !createdPermit || !completedApplicationProcessing) {
+        if (
+          !upsertedPhysician ||
+          !createdPermit ||
+          !completedApplicationProcessing ||
+          !queriedApplication
+        ) {
           const message = 'Error completing application';
           logger.error({ error: message });
           throw new ApolloError(message);
@@ -499,7 +514,7 @@ export const completeApplication: Resolver<
               firstName,
               lastName,
               dateOfBirth,
-              id
+              queriedApplication?.applicantId?.toString() ?? 'N/A'
             );
             if (!result || !result.ok) {
               logger.error({ error: 'Error creating Wallet Card PDF' });
@@ -644,7 +659,7 @@ export const completeApplication: Resolver<
             firstName,
             lastName,
             updatedApplicant.dateOfBirth,
-            id
+            applicantId.toString()
           );
           if (!result || !result.ok) {
             logger.error({ error: 'Error creating Wallet Card PDF' });
@@ -767,7 +782,7 @@ export const completeApplication: Resolver<
             firstName,
             lastName,
             updatedApplicant.dateOfBirth,
-            id
+            applicantId.toString()
           );
           if (!result || !result.ok) {
             logger.error({ error: 'Error creating Wallet Card PDF' });
@@ -1018,7 +1033,14 @@ export const createWalletCard = async (
     }
 
     const walletCardPdf = createdWalletCard
-      ? generateWalletCardPDF(permitId, permitExpiry, firstName, lastName, dateOfBirth, userId)
+      ? generateWalletCardPDF(
+          permitId,
+          permitExpiry,
+          firstName,
+          lastName,
+          dateOfBirth,
+          userId.toString()
+        )
       : null;
 
     if (walletCardPdf && createdWalletCard) {
diff --git a/lib/application-processing/utils.ts b/lib/application-processing/utils.ts
@@ -31,7 +31,7 @@ export const createWalletCardPDF = async (
   firstName: string,
   lastName: string,
   dateOfBirth: Date,
-  userId: number
+  userId: string
 ): Promise<{ ok: boolean; error?: any }> => {
   const walletCardPdf = createdWalletCard
     ? generateWalletCardPDF(permitId, permitExpiry, firstName, lastName, dateOfBirth, userId)
diff --git a/lib/physicians/validation.ts b/lib/physicians/validation.ts
@@ -19,7 +19,9 @@ export const physicianAssessmentSchema = object({
     mixed<PatientCondition>()
       .oneOf(Object.values(PatientCondition))
       .required('Please select a condition')
-  ).required(),
+  )
+    .default([])
+    .min(1, 'Please select at least one condition'),
   otherPatientCondition: string()
     .nullable()
     .default(null)
diff --git a/lib/walletCard/utils.ts b/lib/walletCard/utils.ts
@@ -8,141 +8,129 @@ const walletCardPdfDefinition = (
   firstName: string,
   lastName: string,
   dateOfBirth: Date,
-  userId: number
+  userId: string
 ) => {
-  const calculateTextWidth = (text: string, fontSize: number, averageCharacterWidth = 0.5) => {
-    return fontSize * averageCharacterWidth * text.length;
-  };
-
   const pad2Dig = (amount: number) => {
     if (amount < 10) {
       return '0' + amount.toString();
     }
     return amount.toString();
   };
 
-  // Pixel Constants
-  const MARGIN_TOP = 40;
-  const MARGIN_LEFT = 40;
+  // Pixel Constants for 2.75" x 1.25" wallet card
   const PTS_TO_INCH = 72;
-  const CARD_FRONT_HEIGHT = 2 * PTS_TO_INCH;
-  const CARD_FRONT_WIDTH = 3.5 * PTS_TO_INCH;
-  const CARD_BACK_HEIGHT = 1.5 * PTS_TO_INCH;
-  const CARD_BACK_WIDTH = 3 * PTS_TO_INCH;
-  const CARDS_SPACING = 50;
-  const HEADER_FONT_SIZE = 12;
-  const FOOTER_FONT_SIZE = 9;
-  const boxStartY = MARGIN_TOP + CARD_FRONT_HEIGHT + CARDS_SPACING;
-  const boxStartX = MARGIN_LEFT;
+  const CARD_WIDTH = 2.75 * PTS_TO_INCH; // 198 points
+  const CARD_HEIGHT = 1.25 * PTS_TO_INCH; // 90 points
+  const MARGIN = 4; // Small margin for content
 
   // Text
   const headerText = 'Richmond Centre For Disability';
   const footerText = '604.232.2404  parkingpermit@rcdrichmond.org';
 
   return {
     content: [
+      // Card border
       {
-        image: 'cardFront',
-        width: CARD_FRONT_WIDTH,
-        height: CARD_FRONT_HEIGHT,
-      },
-      {
-        stack: [
+        canvas: [
           {
-            canvas: [
-              {
-                type: 'rect',
-                x: 0, // x position
-                y: 50, // y position
-                w: CARD_BACK_WIDTH, // width
-                h: CARD_BACK_HEIGHT, // height
-                r: 5, // Border radius
-                lineColor: 'black', // Border color
-                lineWidth: 1, // Border width
-              },
-            ],
-          },
-          {
-            text: [{ text: headerText, style: 'header' }],
-            absolutePosition: {
-              x:
-                boxStartX +
-                (CARD_BACK_WIDTH - calculateTextWidth(headerText, HEADER_FONT_SIZE)) / 2,
-              y: boxStartY + 14,
-            },
+            type: 'rect',
+            x: 1,
+            y: 1,
+            w: CARD_WIDTH - 2,
+            h: CARD_HEIGHT - 2,
+            r: 6,
+            color: 'white',
+            lineColor: 'black',
+            lineWidth: 1.5,
           },
+        ],
+      },
+      // Header
+      {
+        text: headerText,
+        style: 'header',
+        absolutePosition: {
+          x: 0,
+          y: MARGIN + 3,
+        },
+        width: CARD_WIDTH,
+      },
+      // Permit information
+      {
+        text: [
+          { text: 'Permit # ', style: 'label' },
+          { text: permitId.toString(), style: 'value' },
+          { text: '    Expiry: ', style: 'label' },
           {
-            text: [
-              { text: 'Permit # ', style: 'subheader' },
-              { text: permitId.toString(), style: 'subheaderB' },
-              { text: '    Expiry:  ', style: 'subheader' },
-              {
-                text: permitExpiry.getFullYear() + '-' + pad2Dig(permitExpiry.getDate()),
-                style: 'subheaderB',
-              },
-              { text: '\n\n', style: 'space' },
-              { text: 'Name:  ', style: 'subheader' },
-              { text: firstName + ' ' + lastName, style: 'subheaderB' },
-              { text: '\n\n', style: 'space' },
-              { text: 'MoB:  ', style: 'subheader' },
-              {
-                text: dateOfBirth.getFullYear() + '-' + pad2Dig(dateOfBirth.getDate()),
-                style: 'subheaderB',
-              },
-              { text: '    User #  ', style: 'subheader' },
-              { text: userId.toString(), style: 'subheaderB' },
-            ],
-            absolutePosition: { x: boxStartX + 10, y: boxStartY + 35 },
+            text: permitExpiry.getFullYear() + '-' + pad2Dig(permitExpiry.getMonth() + 1),
+            style: 'value',
           },
+        ],
+        absolutePosition: { x: MARGIN + 6, y: MARGIN + 20 },
+      },
+      // Name
+      {
+        text: [
+          { text: 'Name: ', style: 'label' },
+          { text: firstName + ' ' + lastName, style: 'value' },
+        ],
+        absolutePosition: { x: MARGIN + 6, y: MARGIN + 36 },
+      },
+      // Month of birth and User ID
+      {
+        text: [
+          { text: 'MoB: ', style: 'label' },
           {
-            text: [{ text: footerText, style: 'footer' }],
-            absolutePosition: {
-              x:
-                boxStartX +
-                (CARD_BACK_WIDTH - calculateTextWidth(footerText, FOOTER_FONT_SIZE)) / 2,
-              y: boxStartY + CARD_BACK_HEIGHT - FOOTER_FONT_SIZE - 10,
-            },
+            text: dateOfBirth.getFullYear() + '-' + pad2Dig(dateOfBirth.getMonth() + 1),
+            style: 'value',
           },
+          { text: '    User # ', style: 'label' },
+          { text: userId, style: 'value' },
         ],
+        absolutePosition: { x: MARGIN + 6, y: MARGIN + 52 },
+      },
+      // Footer
+      {
+        text: footerText,
+        style: 'footer',
+        absolutePosition: {
+          x: MARGIN,
+          y: CARD_HEIGHT - MARGIN - 11,
+        },
+        width: CARD_WIDTH - MARGIN * 2,
       },
     ],
+    // Styles
     styles: {
       header: {
-        fontSize: HEADER_FONT_SIZE,
+        fontSize: 9,
         bold: true,
-        alignment: 'left',
+        alignment: 'center',
       },
-      subheader: {
-        fontSize: 10,
+      label: {
+        fontSize: 8,
         bold: false,
         alignment: 'left',
       },
-      subheaderB: {
-        fontSize: 10,
+      value: {
+        fontSize: 8,
         bold: true,
         alignment: 'left',
       },
       footer: {
-        fontSize: FOOTER_FONT_SIZE,
+        fontSize: 8,
         bold: false,
-        alignment: 'left',
-      },
-      space: {
-        fontSize: 9,
-        bold: false,
-        alignment: 'center',
-      },
-      tableHeader: {
-        bold: true,
         alignment: 'center',
       },
     },
     defaultStyle: {
       font: 'Helvetica',
     },
-    images: {
-      cardFront: 'public/assets/card-front.png',
+    pageSize: {
+      width: CARD_WIDTH,
+      height: CARD_HEIGHT,
     },
+    pageMargins: [0, 0, 0, 0] as [number, number, number, number],
   };
 };
 
@@ -152,7 +140,7 @@ export const generateWalletCardPDF = (
   firstName: string,
   lastName: string,
   dateOfBirth: Date,
-  userId: number
+  userId: string
 ): PDFKit.PDFDocument | null => {
   let pdfDoc = null;
   try {
diff --git a/pages/index.tsx b/pages/index.tsx
@@ -10,6 +10,9 @@ import {
   ListItem,
   Button,
   VStack,
+  Alert,
+  AlertIcon,
+  AlertDescription,
 } from '@chakra-ui/react'; // Chakra UI
 import Layout from '@components/applicant/Layout'; // Layout wrapper
 import FAQs from '@components/applicant/FAQs';
@@ -19,6 +22,20 @@ export default function Landing() {
 
   return (
     <Layout>
+      {Date.now() < new Date('2026-01-10T00:00:00.000Z').getTime() && (
+        <GridItem colSpan={12} colStart={1}>
+          <Alert status="warning" variant="top-accent">
+            <AlertIcon />
+            <AlertDescription textAlign="left">
+              Due to increased operational and postage expenses, RCD will implement a $33 parking
+              permit processing fee starting January 1, 2026. All applications received on or after
+              January 1st, 2026, will be processed at $33, including all permanent and temporary
+              permits (regardless of the signed date or postage date stamp). Thank you for your
+              understanding and continued support!
+            </AlertDescription>
+          </Alert>
+        </GridItem>
+      )}
       <GridItem colSpan={12} colStart={1}>
         <Text as="h1" textStyle={{ sm: 'display-large', md: 'display-xlarge' }} align="left">
           {t('landing')}
@@ -65,7 +82,10 @@ export default function Landing() {
                 <Text as="p">Provide your date of birth</Text>
               </ListItem>
               <ListItem textAlign="left" textStyle="body-regular">
-                <Text as="p">Complete the online form and pay a $31 processing fee</Text>
+                <Text as="p">
+                  Complete the online form and pay the processing fee — $31 for submissions received
+                  before Jan 1; $33 for submissions on or after Jan 1.
+                </Text>
               </ListItem>
             </UnorderedList>
           </Box>
