feat: inject default message value to sales forms

packages/server/src/data/options.ts

@@ -59,6 +59,12 @@ export default {
     auto_increment: {
       type: 'boolean',
     },
+    customer_notes: {
+      type: 'string',
+    },
+    terms_conditions: {
+      type: 'string',
+    },
   },
   sales_receipts: {
     next_number: {
@@ -73,6 +79,12 @@ export default {
     preferred_deposit_account: {
       type: 'number',
     },
+    receipt_message: {
+      type: 'string',
+    },
+    terms_conditions: {
+      type: 'string',
+    },
   },
   sales_invoices: {
     next_number: {
@@ -84,6 +96,12 @@ export default {
     auto_increment: {
       type: 'boolean',
     },
+    customer_notes: {
+      type: 'string',
+    },
+    terms_conditions: {
+      type: 'string',
+    },
   },
   payment_receives: {
     next_number: {
@@ -147,6 +165,12 @@ export default {
     auto_increment: {
       type: 'boolean',
     },
+    customer_notes: {
+      type: 'string',
+    },
+    terms_conditions: {
+      type: 'string',
+    },
   },
   vendor_credit: {
     next_number: {

packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.tsx

@@ -5,7 +5,7 @@ import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import { Formik, Form } from 'formik';
 import { Intent } from '@blueprintjs/core';
-import { isEmpty } from 'lodash';
+import { defaultTo, isEmpty } from 'lodash';
 import { CLASSES } from '@/constants/classes';
 import {
   CreateCreditNoteFormSchema,
@@ -48,6 +48,8 @@ function CreditNoteForm({
   creditAutoIncrement,
   creditNumberPrefix,
   creditNextNumber,
+  creditCustomerNotes,
+  creditTermsConditions,
 
   // #withCurrentOrganization
   organization: { base_currency },
@@ -68,8 +70,7 @@ function CreditNoteForm({
   const creditNumber = transactionNumber(creditNumberPrefix, creditNextNumber);
 
   // Initial values.
-  const initialValues = React.useMemo(
+  const initialValues = {
-    () => ({
     ...(!isEmpty(creditNote)
       ? { ...transformToEditForm(creditNote) }
       : {
@@ -79,11 +80,11 @@ function CreditNoteForm({
           }),
           entries: orderingLinesIndexes(defaultCreditNote.entries),
           currency_code: base_currency,
+          terms_conditions: defaultTo(creditTermsConditions, ''),
+          note: defaultTo(creditCustomerNotes, ''),
           ...newCreditNote,
         }),
-    }),
+  };
-    [],
-  );
 
   // Handles form submit.
   const handleFormSubmit = (
@@ -178,6 +179,8 @@ export default compose(
     creditAutoIncrement: creditNoteSettings?.autoIncrement,
     creditNextNumber: creditNoteSettings?.nextNumber,
     creditNumberPrefix: creditNoteSettings?.numberPrefix,
+    creditCustomerNotes: creditNoteSettings?.customerNotes,
+    creditTermsConditions: creditNoteSettings?.termsConditions,
   })),
   withCurrentOrganization(),
 )(CreditNoteForm);

packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx

@@ -4,7 +4,7 @@ import intl from 'react-intl-universal';
 import classNames from 'classnames';
 import { Formik, Form } from 'formik';
 import { Intent } from '@blueprintjs/core';
-import { sumBy, isEmpty } from 'lodash';
+import { sumBy, isEmpty, defaultTo } from 'lodash';
 import { useHistory } from 'react-router-dom';
 import { CLASSES } from '@/constants/classes';
 
@@ -43,6 +43,8 @@ function EstimateForm({
   estimateNextNumber,
   estimateNumberPrefix,
   estimateAutoIncrementMode,
+  estimateCustomerNotes,
+  estimateTermsConditions,
 
   // #withCurrentOrganization
   organization: { base_currency },
@@ -60,10 +62,8 @@ function EstimateForm({
     estimateNumberPrefix,
     estimateNextNumber,
   );
-
   // Initial values in create and edit mode.
-  const initialValues = useMemo(
+  const initialValues = {
-    () => ({
     ...(!isEmpty(estimate)
       ? { ...transformToEditForm(estimate) }
       : {
@@ -75,10 +75,10 @@ function EstimateForm({
           }),
           entries: orderingLinesIndexes(defaultEstimate.entries),
           currency_code: base_currency,
+          terms_conditions: defaultTo(estimateTermsConditions, ''),
+          note: defaultTo(estimateCustomerNotes, ''),
         }),
-    }),
+  };
-    [estimate, estimateNumber, estimateAutoIncrementMode, base_currency],
-  );
 
   // Handles form submit.
   const handleFormSubmit = (
@@ -181,6 +181,8 @@ export default compose(
     estimateNextNumber: estimatesSettings?.nextNumber,
     estimateNumberPrefix: estimatesSettings?.numberPrefix,
     estimateAutoIncrementMode: estimatesSettings?.autoIncrement,
+    estimateCustomerNotes: estimatesSettings?.customerNotes,
+    estimateTermsConditions: estimatesSettings?.termsConditions,
   })),
   withCurrentOrganization(),
 )(EstimateForm);

packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx

@@ -4,7 +4,7 @@ import intl from 'react-intl-universal';
 import classNames from 'classnames';
 import { Formik, Form } from 'formik';
 import { Intent } from '@blueprintjs/core';
-import { sumBy, isEmpty } from 'lodash';
+import { sumBy, isEmpty, defaultTo } from 'lodash';
 import { useHistory } from 'react-router-dom';
 import { CLASSES } from '@/constants/classes';
 import {
@@ -44,6 +44,8 @@ function InvoiceForm({
   invoiceNextNumber,
   invoiceNumberPrefix,
   invoiceAutoIncrementMode,
+  invoiceCustomerNotes,
+  invoiceTermsConditions,
 
   // #withCurrentOrganization
   organization: { base_currency },
@@ -79,6 +81,8 @@ function InvoiceForm({
           }),
           entries: orderingLinesIndexes(defaultInvoice.entries),
           currency_code: base_currency,
+          invoice_message: defaultTo(invoiceCustomerNotes, ''),
+          terms_conditions: defaultTo(invoiceTermsConditions, ''),
           ...newInvoice,
         }),
   };
@@ -192,6 +196,8 @@ export default compose(
     invoiceNextNumber: invoiceSettings?.nextNumber,
     invoiceNumberPrefix: invoiceSettings?.numberPrefix,
     invoiceAutoIncrementMode: invoiceSettings?.autoIncrement,
+    invoiceCustomerNotes: invoiceSettings?.customerNotes,
+    invoiceTermsConditions: invoiceSettings?.termsConditions,
   })),
   withCurrentOrganization(),
 )(InvoiceForm);

packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx

@@ -1,5 +1,4 @@
 // @ts-nocheck
-import React, { useMemo } from 'react';
 import intl from 'react-intl-universal';
 import classNames from 'classnames';
 import { Formik, Form } from 'formik';
@@ -45,6 +44,8 @@ function ReceiptForm({
   receiptNextNumber,
   receiptNumberPrefix,
   receiptAutoIncrement,
+  receiptTermsConditions,
+  receiptMessage,
   preferredDepositAccount,
 
   // #withCurrentOrganization
@@ -67,8 +68,7 @@ function ReceiptForm({
     receiptNextNumber,
   );
   // Initial values in create and edit mode.
-  const initialValues = useMemo(
+  const initialValues = {
-    () => ({
     ...(!isEmpty(receipt)
       ? { ...transformToEditForm(receipt) }
       : {
@@ -79,11 +79,10 @@ function ReceiptForm({
           deposit_account_id: parseInt(preferredDepositAccount),
           entries: orderingLinesIndexes(defaultReceipt.entries),
           currency_code: base_currency,
+          receipt_message: receiptMessage,
+          terms_conditions: receiptTermsConditions,
         }),
-    }),
+  };
-    [receipt, preferredDepositAccount, nextReceiptNumber, receiptAutoIncrement],
-  );
-
   // Handle the form submit.
   const handleFormSubmit = (
     values,
@@ -184,6 +183,8 @@ export default compose(
     receiptNextNumber: receiptSettings?.nextNumber,
     receiptNumberPrefix: receiptSettings?.numberPrefix,
     receiptAutoIncrement: receiptSettings?.autoIncrement,
+    receiptMessage: receiptSettings?.receiptMessage,
+    receiptTermsConditions: receiptSettings?.termsConditions,
     preferredDepositAccount: receiptSettings?.preferredDepositAccount,
   })),
   withCurrentOrganization(),

packages/webapp/src/containers/Sales/Receipts/ReceiptForm/utils.tsx

@@ -7,7 +7,6 @@ import { omit, first } from 'lodash';
 import { useFormikContext } from 'formik';
 import {
   defaultFastFieldShouldUpdate,
-  transactionNumber,
   repeatValue,
   transformToForm,
   formattedAmount,
@@ -50,7 +49,7 @@ export const defaultReceipt = {
   receipt_date: moment(new Date()).format('YYYY-MM-DD'),
   reference_no: '',
   receipt_message: '',
-  statement: '',
+  terms_conditions: '',
   closed: '',
   branch_id: '',
   warehouse_id: '',