fix(TaxForms/W9): differenciate org/signer names (#1164)

* fix(TaxForms/W9): differenciate org/signer names

* fix(TaxForms/W8BenE): add conditional logic for claims explanation field

Author: Betree

server/lib/tax-forms/frontend-types.ts

@@ -57,13 +57,6 @@ export enum NFFEStatus {
   NonProfitOrganization = 'NonProfitOrganization',
 }
 
-export type TaxFormNameValues = { firstName?: string; middleName?: string; lastName?: string };
-
-export type TaxFormLocationValues = {
-  country?: string;
-  structured?: { address1?: string; address2?: string; city?: string; zone?: string; postalCode?: string };
-};
-
 export type BaseFormValues = {
   isUSPersonOrEntity?: boolean;
   submitterType?: SubmitterType;
@@ -80,6 +73,7 @@ export type W9TaxFormValues = {
   email?: string;
   signer?: { firstName?: string; middleName?: string; lastName?: string };
   isSigned?: boolean;
+  organizationName?: string;
   businessName?: string;
   federalTaxClassificationDetails?: string;
   exemptPayeeCode?: string;
@@ -102,6 +96,7 @@ export type W8BenTaxFormValues = ({
   email?: string;
   signer?: { firstName?: string; middleName?: string; lastName?: string };
   isSigned?: boolean;
+  hasConfirmedTOS?: boolean;
   beneficialOwner?: { firstName?: string; middleName?: string; lastName?: string };
   taxpayerIdentificationNumberTypeUS?: 'SSN' | 'ITIN';
   taxpayerIdentificationNumberUS?: string;
@@ -116,7 +111,6 @@ export type W8BenTaxFormValues = ({
     country?: string;
     structured?: { address1?: string; address2?: string; city?: string; zone?: string; postalCode?: string };
   };
-  hasConfirmedTOS?: boolean;
   claimsSpecialRatesAndConditions?: boolean;
   isSignerTheBeneficialOwner?: boolean;
   certifiesResidentCountry?: boolean;
@@ -130,11 +124,12 @@ export type W8BenTaxFormValues = ({
   | { claimsSpecialRatesAndConditions?: false }
   | {
       claimsSpecialRatesAndConditions?: true;
-      hasTaxTreatySpecialRatesAndConditions?: boolean;
       certifiesResidentCountry?: boolean;
+      hasTaxTreatySpecialRatesAndConditions?: boolean;
     }
 ) &
   (
+    | { hasTaxTreatySpecialRatesAndConditions?: any }
     | { hasTaxTreatySpecialRatesAndConditions?: false }
     | {
         hasTaxTreatySpecialRatesAndConditions?: true;
@@ -154,6 +149,14 @@ export type W8BenETaxFormValues = ((({
   signer?: { firstName?: string; middleName?: string; lastName?: string };
   isSigned?: boolean;
   businessName?: string;
+  hasConfirmedTOS?: boolean;
+  taxpayerIdentificationNumberUS?: string;
+  taxpayerIdentificationNumberForeign?: string;
+  claimsSpecialRatesAndConditions?: boolean;
+  claimsArticleAndParagraph?: string;
+  claimsRate?: number;
+  claimsIncomeType?: string;
+  claimsExplanation?: string;
   businessCountryOfIncorporationOrOrganization?: string;
   businessAddress?: {
     country?: string;
@@ -167,23 +170,15 @@ export type W8BenETaxFormValues = ((({
   chapter3Status?: Chapter3Status;
   hasCapacityToSign?: boolean;
   certifyStatus?: boolean;
-  taxpayerIdentificationNumberForeign?: string;
-  taxpayerIdentificationNumberUS?: string;
   giin?: string;
   reference?: string;
-  hasConfirmedTOS?: boolean;
   isHybridEntity?: boolean;
-  claimsSpecialRatesAndConditions?: boolean;
   nffeStatus?: NFFEStatus;
   certifyDerivesIncome?: boolean;
   typeOfLimitationOnBenefitsProvisions?: TypeOfLimitationOnBenefitsProvisions;
   typeOfLimitationOnBenefitsProvisionsOther?: string;
   certifyBeneficialOwnerCountry?: boolean;
   certifyForeignCorporation?: boolean;
-  claimsArticleAndParagraph?: string;
-  claimsRate?: number;
-  claimsIncomeType?: string;
-  claimsExplanation?: string;
   usOwners?: {
     name?: string;
     address?: {
@@ -197,7 +192,6 @@ export type W8BenETaxFormValues = ((({
   | { nffeStatus?: NFFEStatus.NonProfitOrganization }
   | {
       nffeStatus?: NFFEStatus.PassiveNFFE;
-      entityHasNoUSOwners?: boolean;
       usOwners?: {
         name?: string;
         address?: {
@@ -206,16 +200,17 @@ export type W8BenETaxFormValues = ((({
         };
         tin?: string;
       }[];
+      entityHasNoUSOwners?: boolean;
     }
 )) &
   (
     | { isHybridEntity?: boolean }
     | {
+        claimsSpecialRatesAndConditions?: boolean;
         isHybridEntity?: boolean;
-        certifyBeneficialOwnerCountry?: boolean;
         certifyDerivesIncome?: boolean;
+        certifyBeneficialOwnerCountry?: boolean;
         certifyForeignCorporation?: boolean;
-        claimsSpecialRatesAndConditions?: boolean;
       }
   )) &
   (

server/lib/tax-forms/w8-ben-e.ts

@@ -82,6 +82,7 @@ export const W8BenEFieldsDefinition: Partial<Record<keyof W8BenETaxFormValues, P
   },
   claimsExplanation: {
     type: 'split-text',
+    if: (value, values) => values.claimsSpecialRatesAndConditions,
     fields: [
       { formPath: 'topmostSubform[0].Page2[0].f2_14[0]', maxLength: 18 },
       { formPath: 'topmostSubform[0].Page2[0].f2_15[0]', maxLength: 120 },

server/lib/tax-forms/w9.ts

@@ -2,11 +2,19 @@ import dayjs from '../dayjs.js';
 import { PDFDocument, PDFFont } from 'pdf-lib';
 import { addSignature, fillPDFFormFromValues, PDFFieldDefinition } from '../pdf-lib-utils.js';
 import { getFullName } from './utils.js';
-import { W9TaxFormValues } from './frontend-types.js';
+import { SubmitterType, W9TaxFormValues } from './frontend-types.js';
 import { getCountryName } from '../i18n.js';
 
 export const W9FieldsDefinition: Partial<Record<keyof W9TaxFormValues, PDFFieldDefinition>> = {
-  signer: { formPath: 'topmostSubform[0].Page1[0].f1_01[0]', transform: getFullName },
+  signer: {
+    formPath: 'topmostSubform[0].Page1[0].f1_01[0]',
+    transform: getFullName,
+    if: (value, values) => values.submitterType === SubmitterType.Individual,
+  },
+  organizationName: {
+    formPath: 'topmostSubform[0].Page1[0].f1_01[0]',
+    if: (value, values) => values.submitterType === SubmitterType.Business,
+  },
   businessName: 'topmostSubform[0].Page1[0].f1_02[0]',
   accountNumbers: 'topmostSubform[0].Page1[0].f1_10[0]',
   exemptPayeeCode: 'topmostSubform[0].Page1[0].f1_05[0]',

server/routes/tax-forms.ts

@@ -54,7 +54,7 @@ router.get('/:formType.pdf', async (req: express.Request, res: express.Response)
 
   // Set metadata
   const signerFullName = getFullName(values.signer);
-  const entityName = values.businessName || signerFullName;
+  const entityName = values.organizationName || values.businessName || signerFullName;
   pdfDoc.setTitle(`${formType} Form - ${entityName}`);
   pdfDoc.setSubject(`${formType} Form`);
   pdfDoc.setAuthor(signerFullName || '');