From b0658be041367837ba80bc6a30410c2fcaf25051 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Wed, 25 Sep 2024 15:20:24 +0200 Subject: [PATCH] fix: Invoice customize bugs --- packages/webapp/src/constants/PdfTemplates.ts | 9 ++++++++ .../CreditNotePaperTemplate.tsx | 18 ++++++++++----- .../EstimatePaperTemplate.tsx | 23 ++++++++++++++----- .../InvoiceCustomize/InvoicePaperTemplate.tsx | 16 +++++++++---- .../PaymentReceivedPaperTemplate.tsx | 2 +- .../ReceiptCustomize/ReceiptPaperTemplate.tsx | 18 ++++++++++----- 6 files changed, 62 insertions(+), 24 deletions(-) create mode 100644 packages/webapp/src/constants/PdfTemplates.ts diff --git a/packages/webapp/src/constants/PdfTemplates.ts b/packages/webapp/src/constants/PdfTemplates.ts new file mode 100644 index 000000000..6b1ec8b96 --- /dev/null +++ b/packages/webapp/src/constants/PdfTemplates.ts @@ -0,0 +1,9 @@ +export const DefaultPdfTemplateTerms = 'All services provided are non-refundable. For any disputes, please contact us within 7 days of receiving this invoice.'; + +export const DefaultPdfTemplateStatement = + 'Thank you for your business. We look forward to working with you again!'; + +export const DefaultPdfTemplateItemName = 'Web development'; + +export const DefaultPdfTemplateItemDescription = + 'Website development with content and SEO optimization'; diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx index 93cef8956..2e575fc11 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNotePaperTemplate.tsx @@ -1,8 +1,14 @@ -import { Group, Stack } from '@/components'; +import { Stack } from '@/components'; import { PaperTemplate, PaperTemplateProps, } from '../../Invoices/InvoiceCustomize/PaperTemplate'; +import { + DefaultPdfTemplateTerms, + DefaultPdfTemplateItemDescription, + DefaultPdfTemplateStatement, + DefaultPdfTemplateItemName, +} from '@/constants/PdfTemplates'; export interface CreditNotePaperTemplateProps extends PaperTemplateProps { // Address @@ -95,18 +101,18 @@ export function CreditNotePaperTemplate({ // Customer note showCustomerNote = true, - customerNote = 'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.', + customerNote = DefaultPdfTemplateStatement, customerNoteLabel = 'Customer Note', // Terms & conditions showTermsConditions = true, - termsConditions = 'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.', + termsConditions = DefaultPdfTemplateTerms, termsConditionsLabel = 'Terms & Conditions', lines = [ { - item: 'Simply dummy text', - description: 'Simply dummy text of the printing and typesetting', + item: DefaultPdfTemplateItemName, + description: DefaultPdfTemplateItemDescription, rate: '1', quantity: '1000', total: '$1000.00', @@ -161,7 +167,7 @@ export function CreditNotePaperTemplate({ )} + {showStatement && statement && ( {statement} diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedPaperTemplate.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedPaperTemplate.tsx index d8068c797..114842bf8 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedPaperTemplate.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedPaperTemplate.tsx @@ -1,4 +1,4 @@ -import { Group, Stack } from '@/components'; +import { Stack } from '@/components'; import { PaperTemplate, PaperTemplateProps, diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptPaperTemplate.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptPaperTemplate.tsx index 13b409558..ed00a2775 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptPaperTemplate.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptPaperTemplate.tsx @@ -3,6 +3,12 @@ import { PaperTemplate, PaperTemplateProps, } from '../../Invoices/InvoiceCustomize/PaperTemplate'; +import { + DefaultPdfTemplateTerms, + DefaultPdfTemplateItemDescription, + DefaultPdfTemplateStatement, + DefaultPdfTemplateItemName, +} from '@/constants/PdfTemplates'; export interface ReceiptPaperTemplateProps extends PaperTemplateProps { // Addresses @@ -22,7 +28,7 @@ export interface ReceiptPaperTemplateProps extends PaperTemplateProps { showSubtotal?: boolean; subtotalLabel?: string; -// Customer Note + // Customer Note showCustomerNote?: boolean; customerNote?: string; customerNoteLabel?: string; @@ -93,17 +99,17 @@ export function ReceiptPaperTemplate({ showSubtotal = true, showCustomerNote = true, - customerNote = 'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.', customerNoteLabel = 'Customer Note', + customerNote = DefaultPdfTemplateStatement, showTermsConditions = true, - termsConditions = 'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.', termsConditionsLabel = 'Terms & Conditions', + termsConditions = DefaultPdfTemplateTerms, lines = [ { - item: 'Simply dummy text', - description: 'Simply dummy text of the printing and typesetting', + item: DefaultPdfTemplateItemName, + description: DefaultPdfTemplateItemDescription, rate: '1', quantity: '1000', total: '$1000.00', @@ -156,7 +162,7 @@ export function ReceiptPaperTemplate({