feat: Hook up customer/company address to pdf templates

packages/server/resources/views/modules/credit-note-standard.pug

@@ -150,17 +150,14 @@ block content
         div(class=`${prefix}-terms-item__value`) #{creditNoteDate}
 
   div(class=`${prefix}-address-section`)
-    if showBilledFromAddress
+    if showCompanyAddress
-      div(class=`${prefix}-address`)
+      div(class=`${prefix}-address-from`)
-        strong #{companyName}
+        div !{companyAddress}
-        each address in billedFromAddress
-          div #{address}
 
-    if showBilledToAddress
+    if showCustomerAddress
-      div(class=`${prefix}-address`)
+      div(class=`${prefix}-address-to`)
         strong #{billedToLabel}
-        each address in billedToAddress
+        div !{customerAddress}
-          div #{address}
 
   table(class=`${prefix}-table`)
     thead

packages/server/resources/views/modules/estimate-regular.pug

@@ -156,17 +156,14 @@ block content
 
     //- Addresses (Group section)
     div(class=`${prefix}-addresses`)
-      if showBilledFromAddress
+      if showCompanyAddress
-        div(class=`${prefix}-address`)
+        div(class=`${prefix}-address-from`)
-          strong #{companyName}
+          div !{companyAddress}
-          each item in billedFromAddress
-            div(class=`${prefix}-address__item`) #{item}
 
-      if showBilledToAddress
+      if showCustomerAddress
-        div(class=`${prefix}-address`)
+        div(class=`${prefix}-address-to`)
           strong #{billedToLabel}
-          each item in billedToAddress
+          div !{customerAddress}
-            div(class=`${prefix}-address__item`) #{item}
 
     //- Table section (Line items)
     table(class=`${prefix}-table`)

packages/server/resources/views/modules/invoice-standard.pug

@@ -173,6 +173,7 @@ block content
 
       if showCustomerAddress
         div(class=`${prefix}-address-to`)
+          strong #{billedToLabel}
           div !{customerAddress}
 
     //- Invoice table

packages/server/resources/views/modules/payment-receive-standard.pug

@@ -140,17 +140,14 @@ block content
           div(class=`${prefix}-terms-item__value`) #{paymentReceivedDate}
     
     div(class=`${prefix}-addresses`)
-      if showBilledFromAddress
+      if showCompanyAddress
-        div(class=`${prefix}-address`)
+        div(class=`${prefix}-address-from`)
-          strong(class=`${prefix}-address__item`) #{companyName}
+          div !{companyAddress}
-          each addressLine in billedFromAddress
-            div(class=`${prefix}-address__item`) #{addressLine}
 
-      if showBillingToAddress
+      if showCustomerAddress
-        div(class=`${prefix}-address`)
+        div(class=`${prefix}-address-to`)
-          strong(class=`${prefix}-address__item`) #{billedToLabel}
+          strong #{billedToLabel}
-          each addressLine in billedToAddress
+          div !{customerAddress}
-            div(class=`${prefix}-address__item`) #{addressLine}
 
     table(class=`${prefix}-table`)
       thead

packages/server/resources/views/modules/receipt-regular.pug

@@ -146,17 +146,14 @@ block content
 
     //- Address Section
     div(class=`${prefix}-address-section`)
-      if showBilledFromAddress
+      if showCompanyAddress
-        div(class=`${prefix}-address`)
+        div(class=`${prefix}-address-from`)
-          strong= companyName
+          div !{companyAddress}
-          each addressLine in billedFromAddress
-            div= addressLine
 
-      if showBilledToAddress
+      if showCustomerAddress
-        div(class=`${prefix}-address`)
+        div(class=`${prefix}-address-to`)
-          strong= billedToLabel
+          strong #{billedToLabel}
-          each addressLine in billedToAddress
+          div !{customerAddress}
-            div= addressLine
 
     //- Table Section
     table(class=`${prefix}-table`)

packages/server/src/interfaces/CreditNote.ts

@@ -262,16 +262,24 @@ export type ICreditNoteGLCommonEntry = Pick<
 >;
 
 export interface CreditNotePdfTemplateAttributes {
+  // # Primary color
   primaryColor: string;
   secondaryColor: string;
+
+  // # Company logo
   showCompanyLogo: boolean;
   companyLogo: string;
+
+  // # Company name
   companyName: string;
 
-  billedToAddress: string[];
+  // # Customer Address
-  billedFromAddress: string[];
+  showCustomerAddress: boolean;
-  showBilledToAddress: boolean;
+  customerAddress: string;
-  showBilledFromAddress: boolean;
+
+  // # Company address
+  showCompanyAddress: boolean;
+  companyAddress: string;
   billedToLabel: string;
 
   total: string;

packages/server/src/interfaces/PaymentReceive.ts

@@ -207,10 +207,13 @@ export interface PaymentReceivedPdfTemplateAttributes {
   companyLogo: string;
   companyName: string;
 
-  billedToAddress: string[];
+  // Customer Address
-  billedFromAddress: string[];
+  showCustomerAddress: boolean;
-  showBilledFromAddress: boolean;
+  customerAddress: string;
-  showBillingToAddress: boolean;
+
+  // Company address
+  showCompanyAddress: boolean;
+  companyAddress: string;
   billedToLabel: string;
 
   total: string;

packages/server/src/interfaces/SaleInvoice.ts

@@ -294,8 +294,13 @@ export interface InvoicePdfTemplateAttributes {
   invoiceNumber: string;
   showInvoiceNumber: boolean;
 
-  showBillingToAddress: boolean;
+  // Customer Address
-  showBilledFromAddress: boolean;
+  showCustomerAddress: boolean;
+  customerAddress: string;
+
+  // Company address
+  showCompanyAddress: boolean;
+  companyAddress: string;
   billedToLabel: string;
 
   lineItemLabel: string;
@@ -333,7 +338,4 @@ export interface InvoicePdfTemplateAttributes {
   statementLabel: string;
   showStatement: boolean;
   statement: string;
-
-  billedToAddress: string[];
-  billedFromAddres: string[];
 }

packages/server/src/interfaces/SaleReceipt.ts

@@ -163,11 +163,13 @@ export interface ISaleReceiptBrandingTemplateAttributes {
   companyLogo: string;
   companyName: string;
 
-  // Address
+  // Customer Address
-  billedToAddress: string[];
+  showCustomerAddress: boolean;
-  billedFromAddress: string[];
+  customerAddress: string;
-  showBilledFromAddress: boolean;
+
-  showBilledToAddress: boolean;
+  // Company address
+  showCompanyAddress: boolean;
+  companyAddress: string;
   billedToLabel: string;
 
   // Total

packages/server/src/services/CreditNotes/CreditNoteBrandingTemplate.ts

@@ -1,26 +1,44 @@
-import { Inject } from "typedi";
+import { Inject } from 'typedi';
-import { GetPdfTemplate } from "../PdfTemplate/GetPdfTemplate";
+import { GetPdfTemplate } from '../PdfTemplate/GetPdfTemplate';
-import { defaultCreditNoteBrandingAttributes } from "./constants";
+import { defaultCreditNoteBrandingAttributes } from './constants';
-import { mergePdfTemplateWithDefaultAttributes } from "../Sales/Invoices/utils";
+import { mergePdfTemplateWithDefaultAttributes } from '../Sales/Invoices/utils';
+import { GetOrganizationBrandingAttributes } from '../PdfTemplate/GetOrganizationBrandingAttributes';
 
 export class CreditNoteBrandingTemplate {
   @Inject()
   private getPdfTemplateService: GetPdfTemplate;
 
+  @Inject()
+  private getOrgBrandingAttributes: GetOrganizationBrandingAttributes;
+
   /**
    * Retrieves the credit note branding template.
-   * @param {number} tenantId 
+   * @param {number} tenantId
-   * @param {number} templateId 
+   * @param {number} templateId
    * @returns {}
    */
-  public async getCreditNoteBrandingTemplate(tenantId: number, templateId: number) {
+  public async getCreditNoteBrandingTemplate(
+    tenantId: number,
+    templateId: number
+  ) {
     const template = await this.getPdfTemplateService.getPdfTemplate(
       tenantId,
       templateId
     );
+    // Retrieves the organization branding attributes.
+    const commonOrgBrandingAttrs =
+      await this.getOrgBrandingAttributes.getOrganizationBrandingAttributes(
+        tenantId
+      );
+    // Merges the default branding attributes with common organization branding attrs.
+    const organizationBrandingAttrs = {
+      ...defaultCreditNoteBrandingAttributes,
+      ...commonOrgBrandingAttrs,
+    };
+
     const attributes = mergePdfTemplateWithDefaultAttributes(
       template.attributes,
-      defaultCreditNoteBrandingAttributes
+      organizationBrandingAttrs
     );
     return {
       ...template,

packages/server/src/services/CreditNotes/GetCreditNotePdf.ts

@@ -34,8 +34,6 @@ export default class GetCreditNotePdf {
       tenantId,
       creditNoteId
     );
-    console.log(brandingAttributes, 'brandingAttributes');
-
     const htmlContent = await this.templateInjectable.render(
       tenantId,
       'modules/credit-note-standard',

packages/server/src/services/CreditNotes/constants.ts

@@ -80,24 +80,13 @@ export const defaultCreditNoteBrandingAttributes = {
   // # Company name
   companyName: 'Bigcapital Technology, Inc.',
 
-  // Address
+  // # Customer address
-  billedToAddress: [
+  showCustomerAddress: true,
-    'Bigcapital Technology, Inc.',
+  customerAddress: '',
-    '131 Continental Dr Suite 305 Newark,',
+
-    'Delaware 19713',
+  // # Company address
-    'United States',
+  showCompanyAddress: true,
-    '+1 762-339-5634',
+  companyAddress: '',
-    'ahmed@bigcapital.app',
-  ],
-  billedFromAddress: [
-    '131 Continental Dr Suite 305 Newark,',
-    'Delaware 19713',
-    'United States',
-    '+1 762-339-5634',
-    'ahmed@bigcapital.app',
-  ],
-  showBilledToAddress: true,
-  showBilledFromAddress: true,
   billedToLabel: 'Billed To',
 
   // Total

packages/server/src/services/CreditNotes/utils.ts

@@ -1,4 +1,5 @@
 import { CreditNotePdfTemplateAttributes, ICreditNote } from '@/interfaces';
+import { contactAddressTextFormat } from '@/utils/address-text-format';
 
 export const transformCreditNoteToPdfTemplate = (
   creditNote: ICreditNote
@@ -19,5 +20,6 @@ export const transformCreditNoteToPdfTemplate = (
     })),
     customerNote: creditNote.note,
     termsConditions: creditNote.termsConditions,
+    customerAddress: contactAddressTextFormat(creditNote.customer),
   };
 };

packages/server/src/services/Sales/Estimates/constants.ts

@@ -231,7 +231,6 @@ export const defaultEstimatePdfBrandingAttributes = {
   expirationDate: 'September 3, 2024',
 };
 
-
 interface EstimatePdfBrandingLineItem {
   item: string;
   description: string;
@@ -247,10 +246,13 @@ export interface EstimatePdfBrandingAttributes {
   companyLogo: string;
   companyName: string;
 
-  billedToAddress: string[];
+  // Customer Address
-  billedFromAddress: string[];
+  showCustomerAddress: boolean;
-  showBilledFromAddress: boolean;
+  customerAddress: string;
-  showBilledToAddress: boolean;
+
+  // Company Address
+  showCompanyAddress: boolean;
+  companyAddress: string;
   billedToLabel: string;
 
   total: string;
@@ -282,4 +284,4 @@ export interface EstimatePdfBrandingAttributes {
   expirationDateLabel: string;
   showExpirationDate: boolean;
   expirationDate: string;
-}
+}

packages/server/src/services/Sales/Estimates/utils.ts

@@ -1,3 +1,4 @@
+import { contactAddressTextFormat } from '@/utils/address-text-format';
 import { EstimatePdfBrandingAttributes } from './constants';
 
 export const transformEstimateToPdfTemplate = (
@@ -18,5 +19,6 @@ export const transformEstimateToPdfTemplate = (
     subtotal: estimate.formattedSubtotal,
     customerNote: estimate.customerNote,
     termsConditions: estimate.termsConditions,
+    customerAddress: contactAddressTextFormat(estimate.customer),
   };
 };

packages/server/src/services/Sales/Invoices/SaleEstimatePdfTemplate.ts

@@ -28,7 +28,7 @@ export class SaleEstimatePdfTemplate {
       await this.getOrgBrandingAttrs.getOrganizationBrandingAttributes(
         tenantId
       );
-
+    // Merge the default branding attributes with organization attrs.
     const orgainizationBrandingAttrs = {
       ...defaultEstimatePdfBrandingAttributes,
       ...commonOrgBrandingAttrs,

packages/server/src/services/Sales/Invoices/utils.ts

@@ -1,5 +1,6 @@
 import { pickBy } from 'lodash';
 import { InvoicePdfTemplateAttributes, ISaleInvoice } from '@/interfaces';
+import { contactAddressTextFormat } from '@/utils/address-text-format';
 
 export const mergePdfTemplateWithDefaultAttributes = (
   brandingTemplate?: Record<string, any>,
@@ -42,5 +43,7 @@ export const transformInvoiceToPdfTemplate = (
       label: tax.name,
       amount: tax.taxRateAmountFormatted,
     })),
+
+    customerAddress: contactAddressTextFormat(invoice.customer),
   };
 };

packages/server/src/services/Sales/PaymentReceived/PaymentReceivedBrandingTemplate.ts

@@ -3,12 +3,18 @@ import { Inject, Service } from 'typedi';
 import { mergePdfTemplateWithDefaultAttributes } from '../Invoices/utils';
 import { defaultPaymentReceivedPdfTemplateAttributes } from './constants';
 import { PdfTemplate } from '@/models/PdfTemplate';
+import { GetOrganizationBrandingAttributes } from '@/services/PdfTemplate/GetOrganizationBrandingAttributes';
 
 @Service()
 export class PaymentReceivedBrandingTemplate {
   @Inject()
   private getPdfTemplateService: GetPdfTemplate;
 
+
+  @Inject()
+  private getOrgBrandingAttributes: GetOrganizationBrandingAttributes;
+
+
   /**
    * Retrieves the payment received pdf template.
    * @param {number} tenantId 
@@ -23,9 +29,16 @@ export class PaymentReceivedBrandingTemplate {
       tenantId,
       paymentTemplateId
     );
+    // Retrieves the organization branding attributes.
+    const commonOrgBrandingAttrs = this.getOrgBrandingAttributes.getOrganizationBrandingAttributes(tenantId);
+
+    const organizationBrandingAttrs = {
+      ...defaultPaymentReceivedPdfTemplateAttributes,
+      ...commonOrgBrandingAttrs,
+    };
     const attributes = mergePdfTemplateWithDefaultAttributes(
       template.attributes,
-      defaultPaymentReceivedPdfTemplateAttributes
+      organizationBrandingAttrs 
     );
     return {
       ...template,

packages/server/src/services/Sales/PaymentReceived/constants.ts

@@ -58,24 +58,13 @@ export const defaultPaymentReceivedPdfTemplateAttributes = {
   // # Company name
   companyName: 'Bigcapital Technology, Inc.',
 
-  // Address
+  // # Customer address
-  billedToAddress: [
+  showCustomerAddress: true,
-    'Bigcapital Technology, Inc.',
+  customerAddress: '',
-    '131 Continental Dr Suite 305 Newark,',
+
-    'Delaware 19713',
+  // # Company address
-    'United States',
+  showCompanyAddress: true,
-    '+1 762-339-5634',
+  companyAddress: '',
-    'ahmed@bigcapital.app',
-  ],
-  billedFromAddress: [
-    '131 Continental Dr Suite 305 Newark,',
-    'Delaware 19713',
-    'United States',
-    '+1 762-339-5634',
-    'ahmed@bigcapital.app',
-  ],
-  showBilledFromAddress: true,
-  showBillingToAddress: true,
   billedToLabel: 'Billed To',
 
   // Total

packages/server/src/services/Sales/PaymentReceived/utils.ts

@@ -2,6 +2,7 @@ import {
   IPaymentReceived,
   PaymentReceivedPdfTemplateAttributes,
 } from '@/interfaces';
+import { contactAddressTextFormat } from '@/utils/address-text-format';
 
 export const transformPaymentReceivedToPdfTemplate = (
   payment: IPaymentReceived
@@ -17,5 +18,6 @@ export const transformPaymentReceivedToPdfTemplate = (
       invoiceAmount: entry.invoice.totalFormatted,
       paidAmount: entry.paymentAmountFormatted,
     })),
+    customerAddress: contactAddressTextFormat(payment.customer),
   };
 };

packages/server/src/services/Sales/Receipts/SaleReceiptBrandingTemplate.ts

@@ -2,12 +2,15 @@ import { GetPdfTemplate } from '@/services/PdfTemplate/GetPdfTemplate';
 import { Inject, Service } from 'typedi';
 import { defaultSaleReceiptBrandingAttributes } from './constants';
 import { mergePdfTemplateWithDefaultAttributes } from '../Invoices/utils';
+import { GetOrganizationBrandingAttributes } from '@/services/PdfTemplate/GetOrganizationBrandingAttributes';
 
 @Service()
 export class SaleReceiptBrandingTemplate {
   @Inject()
   private getPdfTemplateService: GetPdfTemplate;
 
+  @Inject()
+  private getOrgBrandingAttributes: GetOrganizationBrandingAttributes;
 
   /**
    * Retrieves the sale receipt branding template.
@@ -23,9 +26,20 @@ export class SaleReceiptBrandingTemplate {
       tenantId,
       templateId
     );
+    // Retrieves the organization branding attributes.
+    const commonOrgBrandingAttrs =
+      await this.getOrgBrandingAttributes.getOrganizationBrandingAttributes(
+        tenantId
+      );
+
+    // Merges the default branding attributes with organization common branding attrs.
+    const organizationBrandingAttrs = {
+      ...defaultSaleReceiptBrandingAttributes,
+      ...commonOrgBrandingAttrs,
+    };
     const attributes = mergePdfTemplateWithDefaultAttributes(
       template.attributes,
-      defaultSaleReceiptBrandingAttributes
+      organizationBrandingAttrs
     );
     return {
       ...template,

packages/server/src/services/Sales/Receipts/constants.ts

@@ -76,26 +76,16 @@ export const defaultSaleReceiptBrandingAttributes = {
   companyLogoUri: '',
   companyLogoKey: '',
 
-  // # Address
+  // # Customer address
-  billedToAddress: [
+  showCustomerAddress: true,
-    'Bigcapital Technology, Inc.',
+  customerAddress: '',
-    '131 Continental Dr Suite 305 Newark,',
+
-    'Delaware 19713',
+  // # Company address
-    'United States',
+  showCompanyAddress: true,
-    '+1 762-339-5634',
+  companyAddress: '',
-    'ahmed@bigcapital.app',
-  ],
-  billedFromAddress: [
-    '131 Continental Dr Suite 305 Newark,',
-    'Delaware 19713',
-    'United States',
-    '+1 762-339-5634',
-    'ahmed@bigcapital.app',
-  ],
-  showBilledFromAddress: true,
-  showBilledToAddress: true,
   billedToLabel: 'Billed To',
 
+  // # Total
   total: '$1000.00',
   totalLabel: 'Total',
   showTotal: true,

packages/server/src/services/Sales/Receipts/utils.ts

@@ -1,4 +1,5 @@
 import { ISaleReceipt, ISaleReceiptBrandingTemplateAttributes } from "@/interfaces";
+import { contactAddressTextFormat } from "@/utils/address-text-format";
 
 
 
@@ -13,8 +14,8 @@ export const transformReceiptToBrandingTemplateAttributes = (saleReceipt: ISaleR
       quantity: entry.quantityFormatted,
       total: entry.totalFormatted,
     })),
-
     receiptNumber: saleReceipt.receiptNumber,
     receiptDate: saleReceipt.formattedReceiptDate,
+    customerAddress: contactAddressTextFormat(saleReceipt.customer),
   };
 }

packages/server/src/system/models/TenantMetadata.ts

@@ -1,4 +1,4 @@
-import { addressTextFormat } from '@/utils/address-text-format';
+import { organizationAddressTextFormat } from '@/utils/address-text-format';
 import BaseModel from 'models/Model';
 import { getUploadedObjectUri } from '../../services/Attachments/utils';
 
@@ -74,7 +74,7 @@ export default class TenantMetadata extends BaseModel {
   {POSTAL_CODE},
   {COUNTRY}
 `;
-    return addressTextFormat(defaultMessage, {
+    return organizationAddressTextFormat(defaultMessage, {
       organizationName: this.name,
       address1: this.address?.address1,
       address2: this.address?.address2,

packages/server/src/utils/address-text-format.ts

@@ -1,3 +1,5 @@
+import { IContact } from '@/interfaces';
+
 interface OrganizationAddressFormatArgs {
   organizationName?: string;
   address1?: string;
@@ -17,7 +19,19 @@ const defaultMessage = `
   {COUNTRY}
 `;
 
-export const addressTextFormat = (
+const formatText = (message: string, replacements: Record<string, string>) => {
+  let formattedMessage = Object.entries(replacements).reduce(
+    (msg, [key, value]) => {
+      return msg.split(`{${key}}`).join(value || '');
+    },
+    message
+  );
+  formattedMessage = formattedMessage.replace(/\n/g, '<br />');
+
+  return formattedMessage.trim();
+};
+
+export const organizationAddressTextFormat = (
   message: string,
   args: OrganizationAddressFormatArgs
 ) => {
@@ -30,13 +44,53 @@ export const addressTextFormat = (
     POSTAL_CODE: args.postalCode || '',
     COUNTRY: args.country || '',
   };
-  let formattedMessage = Object.entries(replacements).reduce(
+  return formatText(message, replacements);
-    (msg, [key, value]) => {
+};
-      return value ? msg.split(`{${key}}`).join(value) : msg;
+
-    },
+interface ContactAddressTextFormatArgs {
-    message
+  displayName?: string;
-  );
+  state?: string;
-  formattedMessage = formattedMessage.replace(/\n/g, '<br />');
+  postalCode?: string;
-
+  email?: string;
-  return formattedMessage.trim();
+  country?: string;
+  city?: string;
+  address2?: string;
+  address1?: string;
+}
+
+const contactFormatMessage = `{CONTACT_NAME}
+{ADDRESS_1}
+{ADDRESS_2}
+{CITY} {STATE}
+{POSTAL_CODE}
+{COUNTRY}
+{EMAIL}
+`;
+
+export const contactAddressTextFormat = (
+  contact: IContact,
+  message: string = contactFormatMessage
+) => {
+  const args = {
+    displayName: contact.displayName,
+    address1: contact.billingAddress1,
+    address2: contact.billingAddress2,
+    state: contact.billingAddressState,
+    country: contact.billingAddressCountry,
+    postalCode: contact?.billingAddressPostcode,
+    city: contact?.billingAddressCity,
+    email: contact?.email,
+  } as ContactAddressTextFormatArgs;
+
+  const replacements: Record<string, string> = {
+    CONTACT_NAME: args.displayName || '',
+    ADDRESS_1: args.address1 || '',
+    ADDRESS_2: args.address2 || '',
+    CITY: args.city || '',
+    STATE: args.state || '',
+    POSTAL_CODE: args.postalCode || '',
+    COUNTRY: args.country || '',
+    EMAIL: args?.email || '',
+  };
+  return formatText(message, replacements);
 };

packages/webapp/src/constants/PdfTemplates.ts

@@ -17,10 +17,9 @@ United States, <br />
 ahmed@bigcapital.app
 `;
 
-
 export const DefaultPdfTemplateAddressBilledFrom = `131 Continental Dr Suite 305 Newark, <br />
 Delaware 19713,<br />
 United States, <br />
 +1 762-339-5634, <br />
 ahmed@bigcapital.app
-`;
+`;

packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimatePaperTemplate.tsx

@@ -71,23 +71,27 @@ export function EstimatePaperTemplate({
   primaryColor,
   secondaryColor,
 
+  // # Company logo
   showCompanyLogo = true,
   companyLogoUri = '',
 
   companyName,
 
-  // # Address
+  // # Company address
-  customerAddress = DefaultPdfTemplateAddressBilledTo,
   companyAddress = DefaultPdfTemplateAddressBilledFrom,
   showCompanyAddress = true,
+
+  // # Customer address
+  customerAddress = DefaultPdfTemplateAddressBilledTo,
   showCustomerAddress = true,
   billedToLabel = 'Billed To',
 
-  // #Total
+  // # Total
   total = '$1000.00',
   totalLabel = 'Total',
   showTotal = true,
 
+  // # Subtotal
   subtotal = '1000/00',
   subtotalLabel = 'Subtotal',
   showSubtotal = true,
@@ -111,14 +115,18 @@ export function EstimatePaperTemplate({
       total: '$1000.00',
     },
   ],
+
+  // Estimate number
   showEstimateNumber = true,
   estimateNumberLabel = 'Estimate Number',
   estimateNumebr = '346D3D40-0001',
 
+  // Estimate date
   estimateDate = 'September 3, 2024',
   showEstimateDate = true,
   estimateDateLabel = 'Estimate Date',
 
+  // Expiration date
   expirationDateLabel = 'Expiration Date',
   showExpirationDate = true,
   expirationDate = 'September 3, 2024',

packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/constants.ts

@@ -23,10 +23,11 @@ export const initialValues = {
   // Company name
   companyName: 'Bigcapital Technology, Inc.',
 
-  // Addresses
+  // Customer address
   showCustomerAddress: true,
+  
+  // Company address
   showCompanyAddress: true,
-  customerAddress: '',
   companyAddress: '',
   billedToLabel: 'Billed To',
 

packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/constants.ts

@@ -21,11 +21,12 @@ export const initialValues = {
   // Company name
   companyName: 'Bigcapital Technology, Inc.',
 
-  // Addresses
+  // Customer address 
-  showCompanyAddress: true,
   showCustomerAddress: true,
+
+  // Company address
   companyAddress: '',
-  customerAddress: '',
+  showCompanyAddress: true,
   billedToLabel: 'Billed To',
 
   // Entries