fix: payment receive and made.

client/src/containers/Sales/Invoices/InvoicesLanding/components.js

@@ -54,8 +54,7 @@ export const statusAccessor = (row) => {
               <T
                 id={'day_partially_paid'}
                 values={{
-                  due: round(row.due_amount, 2),
-                  currencySign: '$',
+                  due: <Money amount={row.due_amount} currency={'USD'} />,
                 }}
               />
             </span>

client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.js

@@ -6,6 +6,8 @@ import { Intent } from '@blueprintjs/core';
 import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';
 
+import 'style/pages/PaymentReceive/PageForm.scss';
+
 import { CLASSES } from 'common/classes';
 import PaymentReceiveHeader from './PaymentReceiveFormHeader';
 import PaymentReceiveFormBody from './PaymentReceiveFormBody';
@@ -29,8 +31,6 @@ import {
   transformToEditForm,
 } from './utils';
 
-import 'style/pages/PaymentReceive/PageForm.scss';
-
 /**
  * Payment Receive form.
  */

client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormProvider.js

@@ -30,7 +30,6 @@ function PaymentReceiveFormProvider({ paymentReceiveId, ...props }) {
   } = usePaymentReceiveEditPage(paymentReceiveId, {
     enabled: !!paymentReceiveId,
   });
-
   // Handle fetch accounts data.
   const { data: accounts, isFetching: isAccountsFetching } = useAccounts();
 

client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveInnerProvider.js

@@ -29,10 +29,10 @@ function PaymentReceiveInnerProvider({ ...props }) {
   });
 
   useEffect(() => {
-    if (!isDueInvoicesFetching && !isEmpty(dueInvoices)) {
+    if (!isDueInvoicesFetching && dueInvoices && isNewMode) {
       setFieldValue('entries', transformInvoicesNewPageEntries(dueInvoices));
     }
-  }, [isDueInvoicesFetching, dueInvoices, setFieldValue]);
+  }, [isDueInvoicesFetching, dueInvoices, isNewMode, setFieldValue]);
 
   // Provider payload.
   const provider = {

client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveItemsTable.js

@@ -1,38 +1,34 @@
 import React, { useCallback } from 'react';
-import { Button } from '@blueprintjs/core';
-import { FormattedMessage as T } from 'react-intl';
 import { CloudLoadingIndicator } from 'components';
 import classNames from 'classnames';
+import { useFormikContext } from 'formik';
 
 import { CLASSES } from 'common/classes';
-import { usePaymentReceiveFormContext } from './PaymentReceiveFormProvider';
+import { usePaymentReceiveInnerContext } from './PaymentReceiveInnerProvider';
 import { DataTableEditable } from 'components';
 import { usePaymentReceiveEntriesColumns } from './components';
-import { compose, updateTableRow, safeSumBy } from 'utils';
-import withAlertActions from 'containers/Alert/withAlertActions';
-
+import { compose, updateTableRow } from 'utils';
 
 /**
  * Payment receive items table.
  */
-function PaymentReceiveItemsTable({
+export default function PaymentReceiveItemsTable({
   entries,
   onUpdateData,
-
-  // #withDialogActions
-  openAlert
 }) {
   // Payment receive form context.
   const {
     isDueInvoicesFetching,
-    paymentCustomerId,
-  } = usePaymentReceiveFormContext();
+  } = usePaymentReceiveInnerContext();
 
   // Payment receive entries form context.
   const columns = usePaymentReceiveEntriesColumns();
 
+  // Formik context.
+  const { values: { customer_id } } = useFormikContext();
+
   // No results message.
-  const noResultsMessage = paymentCustomerId
+  const noResultsMessage = customer_id
     ? 'There is no receivable invoices for this customer that can be applied for this payment'
     : 'Please select a customer to display all open invoices for it.';
 
@@ -62,6 +58,4 @@ function PaymentReceiveItemsTable({
       />
     </CloudLoadingIndicator>
   );
-}
-
-export default compose(withAlertActions)(PaymentReceiveItemsTable);
+}

client/src/containers/Sales/PaymentReceives/PaymentReceiveForm/utils.js

@@ -32,6 +32,7 @@ export const transformToEditForm = (paymentReceive, paymentReceiveEntries) => ({
   entries: [
     ...paymentReceiveEntries.map((paymentReceiveEntry) => ({
       ...transformToForm(paymentReceiveEntry, defaultPaymentReceiveEntry),
+      payment_amount: paymentReceiveEntry.payment_amount || '',
     })),
   ],
 });
@@ -47,7 +48,7 @@ export const transformInvoicesNewPageEntries = (invoices) => [
     due_amount: invoice.due_amount,
     date: invoice.invoice_date,
     amount: invoice.balance,
-    payment_amount: 0,
+    payment_amount: '',
     invoice_no: invoice.invoice_no,
     total_payment_amount: invoice.payment_amount,
   })),

client/src/containers/Sales/PaymentReceives/PaymentsLanding/components.js

@@ -114,13 +114,6 @@ export function usePaymentReceivesColumns() {
         width: 140,
         className: 'payment_receive_no',
       },
-      {
-        id: 'reference_no',
-        Header: formatMessage({ id: 'reference_no' }),
-        accessor: 'reference_no',
-        width: 140,
-        className: 'reference_no',
-      },
       {
         id: 'deposit_account',
         Header: formatMessage({ id: 'deposit_account' }),
@@ -128,6 +121,13 @@ export function usePaymentReceivesColumns() {
         width: 140,
         className: 'deposit_account_id',
       },
+      {
+        id: 'reference_no',
+        Header: formatMessage({ id: 'reference_no' }),
+        accessor: 'reference_no',
+        width: 140,
+        className: 'reference_no',
+      },
       {
         id: 'actions',
         Header: '',

client/src/containers/Sales/Receipts/ReceiptsLanding/components.js

@@ -34,6 +34,7 @@ export function ActionsMenu({
       />
       <If condition={!receipt.is_closed}>
         <MenuItem
+          icon={<Icon icon={'check'} iconSize={18} />}
           text={formatMessage({ id: 'mark_as_closed' })}
           onClick={safeCallback(onClose, receipt)}
         />