Merge branch 'master' of https://github.com/abouolia/Ratteb

2026-02-18 13:50:31 +00:00 · 2021-01-09 21:56:44 +02:00
parent 4d9ff02b50 43508dad38
commit 36f2068474
14 changed files with 125 additions and 75 deletions
--- a/client/src/containers/Accounting/MakeJournalEntriesForm.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesForm.js
@@ -3,7 +3,7 @@ import { Formik, Form } from 'formik';
 import moment from 'moment';
 import { Intent } from '@blueprintjs/core';
 import { useIntl } from 'react-intl';
-import { pick } from 'lodash';
+import { pick, defaultTo } from 'lodash';
 import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';

@@ -78,7 +78,7 @@ function MakeJournalEntriesForm({
  // #withSettings
  journalNextNumber,
  journalNumberPrefix,
-
+  baseCurrency,
  // #ownProps
  manualJournalId,
  manualJournal,
@@ -126,7 +126,8 @@ function MakeJournalEntriesForm({
          }
        : {
            ...defaultInitialValues,
-            journal_number: journalNumber,
+            journal_number: defaultTo(journalNumber, ''),
+            currency_code: defaultTo(baseCurrency, ''),
            entries: orderingLinesIndexes(defaultInitialValues.entries),
          }),
    }),
@@ -239,7 +240,7 @@ function MakeJournalEntriesForm({
        validationSchema={isNewMode ? CreateJournalSchema : EditJournalSchema}
        onSubmit={handleSubmit}
      >
-        {({ isSubmitting}) => (
+        {({ isSubmitting }) => (
          <Form>
            <MakeJournalEntriesHeader
              manualJournal={manualJournalId}
@@ -274,9 +275,10 @@ export default compose(
  withAccountsActions,
  withDashboardActions,
  withMediaActions,
-  withSettings(({ manualJournalsSettings }) => ({
+  withSettings(({ manualJournalsSettings, organizationSettings }) => ({
    journalNextNumber: parseInt(manualJournalsSettings?.nextNumber, 10),
    journalNumberPrefix: manualJournalsSettings?.numberPrefix,
+    baseCurrency: organizationSettings?.baseCurrency,
  })),
  withManualJournalsActions,
 )(MakeJournalEntriesForm);
--- a/client/src/containers/Accounting/MakeJournalEntriesHeaderFields.js
+++ b/client/src/containers/Accounting/MakeJournalEntriesHeaderFields.js
@@ -48,6 +48,7 @@ function MakeJournalEntriesHeader({

  return (
    <div className={classNames(CLASSES.PAGE_FORM_HEADER_FIELDS)}>
+      {/*------------ Posting date -----------*/}
      <FastField name={'date'}>
        {({ form, field: { value }, meta: { error, touched } }) => (
          <FormGroup
@@ -77,6 +78,7 @@ function MakeJournalEntriesHeader({
        )}
      </FastField>

+      {/*------------ Journal number -----------*/}
      <FastField name={'journal_number'}>
        {({ form, field, meta: { error, touched } }) => (
          <FormGroup
@@ -115,6 +117,7 @@ function MakeJournalEntriesHeader({
        )}
      </FastField>

+      {/*------------ Reference -----------*/}
      <FastField name={'reference'}>
        {({ form, field, meta: { error, touched } }) => (
          <FormGroup
@@ -136,14 +139,12 @@ function MakeJournalEntriesHeader({
        )}
      </FastField>

+      {/*------------ Journal type  -----------*/}
      <FastField name={'journal_type'}>
        {({ form, field, meta: { error, touched } }) => (
          <FormGroup
            label={<T id={'journal_type'} />}
-            className={classNames(
-              'form-group--account-type',
-              CLASSES.FILL,
-            )}
+            className={classNames('form-group--account-type', CLASSES.FILL)}
            inline={true}
          >
            <InputGroup
@@ -155,14 +156,12 @@ function MakeJournalEntriesHeader({
        )}
      </FastField>

-      <FastField name={'currency'}>
+      {/*------------ Currency  -----------*/}
+      <FastField name={'currency_code'}>
        {({ form, field: { value }, meta: { error, touched } }) => (
          <FormGroup
            label={<T id={'currency'} />}
-            className={classNames(
-              'form-group--currency',
-              CLASSES.FILL,
-            )}
+            className={classNames('form-group--currency', CLASSES.FILL)}
            inline={true}
          >
            <CurrencySelectList
--- a/client/src/containers/Purchases/Bill/BillFormHeader.js
+++ b/client/src/containers/Purchases/Bill/BillFormHeader.js
@@ -7,11 +7,18 @@ import { CLASSES } from 'common/classes';

 import BillFormHeaderFields from './BillFormHeaderFields';
 import { PageFormBigNumber } from 'components';
+import withSettings from 'containers/Settings/withSettings';
+import { compose } from 'redux';

 /**
 * Fill form header.
 */
-export default function BillFormHeader({ onBillNumberChanged }) {
+function BillFormHeader({
+  onBillNumberChanged,
+
+  // #withSettings
+  baseCurrency,
+}) {
  const { values } = useFormikContext();

  // Calculate the total due amount of bill entries.
@@ -25,8 +32,13 @@ export default function BillFormHeader({ onBillNumberChanged }) {
      <PageFormBigNumber
        label={'Due Amount'}
        amount={totalDueAmount}
-        currencyCode={'LYD'}
+        currencyCode={baseCurrency}
      />
    </div>
  );
 }
+export default compose(
+  withSettings(({ organizationSettings }) => ({
+    baseCurrency: organizationSettings?.baseCurrency,
+  })),
+)(BillFormHeader);
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeDataTable.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeDataTable.js
@@ -23,6 +23,7 @@ import PaymentMadesEmptyStatus from './PaymentMadesEmptyStatus';
 import withPaymentMade from './withPaymentMade';
 import withPaymentMadeActions from './withPaymentMadeActions';
 import withCurrentView from 'containers/Views/withCurrentView';
+import withSettings from 'containers/Settings/withSettings';

 /**
 * Payment made datatable transactions.
@@ -38,6 +39,9 @@ function PaymentMadeDataTable({
  // #withPaymentMadeActions
  addPaymentMadesTableQueries,

+  // #withSettings
+  baseCurrency,
+
  // #ownProps
  onEditPaymentMade,
  onDeletePaymentMade,
@@ -110,7 +114,8 @@ function PaymentMadeDataTable({
      {
        id: 'payment_number',
        Header: formatMessage({ id: 'payment_number' }),
-        accessor: (row) => (row.payment_number ? `#${row.payment_number}` : null),
+        accessor: (row) =>
+          row.payment_number ? `#${row.payment_number}` : null,
        width: 140,
        className: 'payment_number',
      },
@@ -124,7 +129,7 @@ function PaymentMadeDataTable({
      {
        id: 'amount',
        Header: formatMessage({ id: 'amount' }),
-        accessor: (r) => <Money amount={r.amount} currency={'USD'} />,
+        accessor: (r) => <Money amount={r.amount} currency={baseCurrency} />,
        width: 140,
        className: 'amount',
      },
@@ -238,4 +243,7 @@ export default compose(
      paymentMadesCurrentViewId,
    }),
  ),
+  withSettings(({ organizationSettings }) => ({
+    baseCurrency: organizationSettings?.baseCurrency,
+  })),
 )(PaymentMadeDataTable);
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeFloatingActions.js
@@ -45,6 +45,7 @@ export default function PaymentMadeFloatingActions({
    onSubmitForm();
    saveInvoke(onSubmitClick, event, {
      redirect: false,
+      resetForm: true,
    });
  };

--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.js
@@ -156,13 +156,14 @@ function PaymentMadeForm({
        intent: Intent.SUCCESS,
      });
      setSubmitting(false);
-      // resetForm();
-      changePageSubtitle('');
+      // changePageSubtitle('');

      if (submitPayload.redirect) {
        history.push('/payment-mades');
      }
-
+      if (submitPayload.resetForm) {
+        resetForm();
+      }
    };

    const onError = (errors) => {
@@ -193,6 +194,7 @@ function PaymentMadeForm({
    values,
    handleSubmit,
    isSubmitting,
+    resetForm,
    submitForm,
  } = useFormik({
    validationSchema,
@@ -244,13 +246,13 @@ function PaymentMadeForm({

  // Handle cancel button click.
  const handleCancelClick = useCallback(() => {
-    history.push('/payment-mades');
+    history.goBack();
  }, [history]);

  // Handle clear all lines button click.
-  const handleClearAllLines = () => {
+  const handleClearAllLines = useCallback(() => {
    setClearLinesAlert(true);
-  };
+  },[setClearLinesAlert]);

  const handleCancelClearLines = useCallback(() => {
    setClearLinesAlert(false);
@@ -284,6 +286,7 @@ function PaymentMadeForm({
        : {}),
    });
    setClearFormAlert(false);
+    resetForm();
  };
  // Payable full amount.
  const payableFullAmount = useMemo(() => sumBy(values.entries, 'due_amount'), [
@@ -314,7 +317,6 @@ function PaymentMadeForm({
    [setSubmitPayload],
  );

-
  return (
    <div
      className={classNames(
@@ -382,12 +384,14 @@ function PaymentMadeForm({
        <Alert
          cancelButtonText={<T id={'cancel'} />}
          confirmButtonText={<T id={'ok'} />}
-          intent={Intent.DANGER}
+          intent={Intent.WARNING}
          isOpen={clearFormAlert}
          onCancel={handleCancelClearFormAlert}
          onConfirm={handleConfirmCancelClearFormAlert}
        >
-          <p>Are you sure you want to clear this transaction?</p>
+          <p>
+            <T id={'are_you_sure_you_want_to_clear_this_transaction'} />
+          </p>
        </Alert>

        <PaymentMadeFooter getFieldProps={getFieldProps} />
--- a/client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js
@@ -170,7 +170,7 @@ function PaymentMadeFormHeader({
              className={'receive-full-amount'}
            >
              Receive full amount (
-              <Money amount={payableFullAmount} currency={'USD'} />)
+              <Money amount={payableFullAmount} currency={baseCurrency} />)
            </a>
          </FormGroup>

@@ -250,7 +250,7 @@ function PaymentMadeFormHeader({
          <div class="big-amount">
            <span class="big-amount__label">Amount Received</span>
            <h1 class="big-amount__number">
-              <Money amount={amountPaid} currency={'USD'} />
+              <Money amount={amountPaid} currency={baseCurrency} />
            </h1>
          </div>
        </div>
--- a/client/src/containers/Sales/Estimate/EstimatesDataTable.js
+++ b/client/src/containers/Sales/Estimate/EstimatesDataTable.js
@@ -23,6 +23,7 @@ import EstimatesEmptyStatus from './EstimatesEmptyStatus';
 import { statusAccessor } from './components';
 import withEstimates from './withEstimates';
 import withEstimateActions from './withEstimateActions';
+import withSettings from 'containers/Settings/withSettings';

 // Estimates transactions datatable.
 function EstimatesDataTable({
@@ -36,6 +37,9 @@ function EstimatesDataTable({
  // #withEstimatesActions
  addEstimatesTableQueries,

+  // #withSettings
+  baseCurrency,
+
  // #ownProps
  onEditEstimate,
  onDeleteEstimate,
@@ -160,7 +164,7 @@ function EstimatesDataTable({
      {
        id: 'amount',
        Header: formatMessage({ id: 'amount' }),
-        accessor: (r) => <Money amount={r.amount} currency={'USD'} />,
+        accessor: (r) => <Money amount={r.amount} currency={baseCurrency} />,

        width: 140,
        className: 'amount',
@@ -282,4 +286,7 @@ export default compose(
      estimatesCurrentViewId,
    }),
  ),
+  withSettings(({ organizationSettings }) => ({
+    baseCurrency: organizationSettings?.baseCurrency,
+  })),
 )(EstimatesDataTable);
--- a/client/src/containers/Sales/Invoice/InvoiceList.js
+++ b/client/src/containers/Sales/Invoice/InvoiceList.js
@@ -97,9 +97,10 @@ function InvoiceList({
  const handleConfirmInvoiceDelete = useCallback(() => {
    requestDeleteInvoice(deleteInvoice.id)
      .then(() => {
+        setDeleteInvoice(false);
        AppToaster.show({
          message: formatMessage({
-            id: 'the_invocie_has_been_successfully_deleted',
+            id: 'the_invoice_has_been_successfully_deleted',
          }),
          intent: Intent.SUCCESS,
        });
@@ -109,7 +110,7 @@ function InvoiceList({
        setDeleteInvoice(false);
      });
  }, [deleteInvoice, requestDeleteInvoice, formatMessage]);
-
+  
  // Handle cancel/confirm invoice deliver.
  const handleDeliverInvoice = useCallback((invoice) => {
    setDeliverInvoice(invoice);
--- a/client/src/containers/Sales/Invoice/InvoicesDataTable.js
+++ b/client/src/containers/Sales/Invoice/InvoicesDataTable.js
@@ -35,6 +35,7 @@ import withViewDetails from 'containers/Views/withViewDetails';
 import withInvoices from './withInvoices';
 import withInvoiceActions from './withInvoiceActions';
 import withCurrentView from 'containers/Views/withCurrentView';
+import withSettings from 'containers/Settings/withSettings';

 // Invoices datatable.
 function InvoicesDataTable({
@@ -47,6 +48,9 @@ function InvoicesDataTable({
  // #withInvoicesActions
  addInvoiceTableQueries,

+  // #withSettings
+  baseCurrency,
+
  // #OwnProps
  onEditInvoice,
  onDeleteInvoice,
@@ -141,7 +145,7 @@ function InvoicesDataTable({
      {
        id: 'balance',
        Header: formatMessage({ id: 'balance' }),
-        accessor: (r) => <Money amount={r.balance} currency={'USD'} />,
+        accessor: (r) => <Money amount={r.balance} currency={baseCurrency} />,
        width: 140,
        className: 'balance',
      },
@@ -263,5 +267,8 @@ export default compose(
      invoicesCurrentViewId,
    }),
  ),
+  withSettings(({ organizationSettings }) => ({
+    baseCurrency: organizationSettings?.baseCurrency,
+  })),
  withViewDetails(),
 )(InvoicesDataTable);
--- a/client/src/containers/Sales/PaymentReceive/PaymentReceivesDataTable.js
+++ b/client/src/containers/Sales/PaymentReceive/PaymentReceivesDataTable.js
@@ -28,6 +28,7 @@ import withViewDetails from 'containers/Views/withViewDetails';
 import withPaymentReceives from './withPaymentReceives';
 import withPaymentReceivesActions from './withPaymentReceivesActions';
 import withCurrentView from 'containers/Views/withCurrentView';
+import withSettings from 'containers/Settings/withSettings';

 function PaymentReceivesDataTable({
  // #withPaymentReceives
@@ -40,6 +41,9 @@ function PaymentReceivesDataTable({
  // #withPaymentReceivesActions
  addPaymentReceivesTableQueries,

+  // #withSettings
+  baseCurrency,
+  
  // #OwnProps
  onEditPaymentReceive,
  onDeletePaymentReceive,
@@ -146,7 +150,7 @@ function PaymentReceivesDataTable({
      {
        id: 'amount',
        Header: formatMessage({ id: 'amount' }),
-        accessor: (r) => <Money amount={r.amount} currency={'USD'} />,
+        accessor: (r) => <Money amount={r.amount} currency={baseCurrency} />,
        width: 140,
        className: 'amount',
      },
@@ -186,40 +190,40 @@ function PaymentReceivesDataTable({
  const showEmptyStatus = [
    paymentReceivesCurrentViewId === -1,
    PaymentReceivesCurrentPage.length === 0,
-  ].every(condition => condition === true); 
+  ].every((condition) => condition === true);

  return (
    <div className={classNames(CLASSES.DASHBOARD_DATATABLE)}>
-    <LoadingIndicator
-      loading={paymentReceivesLoading && !isLoaded}
-      mount={false}
-    >
-      <Choose>
-        <Choose.When condition={showEmptyStatus}>
-          <PaymentReceivesEmptyStatus />
-        </Choose.When>
+      <LoadingIndicator
+        loading={paymentReceivesLoading && !isLoaded}
+        mount={false}
+      >
+        <Choose>
+          <Choose.When condition={showEmptyStatus}>
+            <PaymentReceivesEmptyStatus />
+          </Choose.When>

-        <Choose.Otherwise>
-          <DataTable
-            columns={columns}
-            data={PaymentReceivesCurrentPage}
-            onFetchData={handleDataTableFetchData}
-            manualSortBy={true}
-            selectionColumn={true}
-            noInitialFetch={true}
-            sticky={true}
-            onSelectedRowsChange={handleSelectedRowsChange}
-            rowContextMenu={onRowContextMenu}
-            pagination={true}
-            autoResetSortBy={false}
-            autoResetPage={false}
-            pagesCount={paymentReceivesPageination.pagesCount}
-            initialPageSize={paymentReceivesTableQuery.page_size}
-            initialPageIndex={paymentReceivesTableQuery.page - 1}
-          />
-        </Choose.Otherwise>
-      </Choose>
-    </LoadingIndicator>
+          <Choose.Otherwise>
+            <DataTable
+              columns={columns}
+              data={PaymentReceivesCurrentPage}
+              onFetchData={handleDataTableFetchData}
+              manualSortBy={true}
+              selectionColumn={true}
+              noInitialFetch={true}
+              sticky={true}
+              onSelectedRowsChange={handleSelectedRowsChange}
+              rowContextMenu={onRowContextMenu}
+              pagination={true}
+              autoResetSortBy={false}
+              autoResetPage={false}
+              pagesCount={paymentReceivesPageination.pagesCount}
+              initialPageSize={paymentReceivesTableQuery.page_size}
+              initialPageIndex={paymentReceivesTableQuery.page - 1}
+            />
+          </Choose.Otherwise>
+        </Choose>
+      </LoadingIndicator>
    </div>
  );
 }
@@ -245,5 +249,8 @@ export default compose(
      paymentReceivesCurrentViewId,
    }),
  ),
+  withSettings(({ organizationSettings }) => ({
+    baseCurrency: organizationSettings?.baseCurrency,
+  })),
  withViewDetails(),
 )(PaymentReceivesDataTable);
--- a/client/src/containers/Sales/Receipt/ReceiptsDataTable.js
+++ b/client/src/containers/Sales/Receipt/ReceiptsDataTable.js
@@ -34,6 +34,7 @@ import withDashboardActions from 'containers/Dashboard/withDashboardActions';

 import withReceipts from './withReceipts';
 import withReceiptActions from './withReceiptActions';
+import withSettings from 'containers/Settings/withSettings';

 function ReceiptsDataTable({
  // #withReceipts
@@ -46,6 +47,9 @@ function ReceiptsDataTable({
  // #withReceiptsActions
  addReceiptsTableQueries,

+  // #withSettings
+  baseCurrency,
+
  // #ownProps
  loading,
  onEditReceipt,
@@ -138,17 +142,10 @@ function ReceiptsDataTable({
        width: 140,
        className: 'deposit_account',
      },
-      // {
-      //   id: 'send_to_email',
-      //   Header: formatMessage({ id: 'email' }),
-      //   accessor: 'send_to_email',
-      //   width: 140,
-      //   className: 'send_to_email',
-      // },
      {
        id: 'amount',
        Header: formatMessage({ id: 'amount' }),
-        accessor: (r) => <Money amount={r.amount} currency={'USD'} />,
+        accessor: (r) => <Money amount={r.amount} currency={baseCurrency} />,

        width: 140,
        className: 'amount',
@@ -287,4 +284,7 @@ export default compose(
      receiptsCurrentViewId,
    }),
  ),
+  withSettings(({ organizationSettings }) => ({
+    baseCurrency: organizationSettings?.baseCurrency,
+  })),
 )(ReceiptsDataTable);
--- a/client/src/lang/en/index.js
+++ b/client/src/lang/en/index.js
@@ -635,7 +635,7 @@ export default {
    'The invoice #{number} has been successfully edited.',
  the_invocie_has_been_successfully_created:
    'The invoice #{number} has been successfully created.',
-  the_invocie_has_been_successfully_deleted:
+  the_invoice_has_been_successfully_deleted:
    'The invoice has been successfully deleted.',
  once_delete_this_invoice_you_will_able_to_restore_it: `Once you delete this invoice, you won\'t be able to restore it later. Are you sure you want to delete this invoice?`,
  receipt_list: 'Receipt List',
--- a/client/src/style/pages/invoice-form.scss
+++ b/client/src/style/pages/invoice-form.scss
@@ -51,11 +51,13 @@
    line-height: 1.5;
  }
  .fully-paid-status {
+    height: 19px;
+    width: 19px;
    display: inline-block;
-    border-radius: 50%;
    background: #2ba01d;
-    color: #ffffff;
+    border-radius: 50%;
    margin-right: 6px;
+    color: #ffffff;
  }

  .bp3-progress-bar {