merge: estimate work branch to master

client/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.js

@@ -0,0 +1,70 @@
+import React from 'react';
+import { DialogContent } from 'components';
+import { useQuery, queryCache } from 'react-query';
+
+import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm';
+import withDialogActions from 'containers/Dialog/withDialogActions';
+import withSettingsActions from 'containers/Settings/withSettingsActions';
+import withSettings from 'containers/Settings/withSettings';
+
+import { compose, optionsMapToArray } from 'utils';
+
+/**
+ * Estimate number dialog's content.
+ */
+
+function EstimateNumberDialogContent({
+  // #withSettings
+  nextNumber,
+  numberPrefix,
+  // #withSettingsActions
+  requestFetchOptions,
+  requestSubmitOptions,
+
+  // #withDialogActions
+  closeDialog,
+}) {
+  const fetchSettings = useQuery(['settings'], () => requestFetchOptions({}));
+
+  const handleSubmitForm = (values, { setSubmitting }) => {
+    const options = optionsMapToArray(values).map((option) => {
+      return { key: option.key, ...option, group: 'sales_estimates' };
+    });
+    requestSubmitOptions({ options })
+      .then(() => {
+        setSubmitting(false);
+        closeDialog('estimate-number-form');
+
+        setTimeout(() => {
+          queryCache.invalidateQueries('settings');
+        }, 250);
+      })
+      .catch(() => {
+        setSubmitting(false);
+      });
+  };
+
+  const handleClose = () => {
+    closeDialog('estimate-number-form');
+  };
+
+  return (
+    <DialogContent isLoading={fetchSettings.isFetching}>
+      <ReferenceNumberForm
+        initialNumber={nextNumber}
+        initialPrefix={numberPrefix}
+        onSubmit={handleSubmitForm}
+        onClose={handleClose}
+      />
+    </DialogContent>
+  );
+}
+
+export default compose(
+  withDialogActions,
+  withSettingsActions,
+  withSettings(({ estimatesSettings }) => ({
+    nextNumber: estimatesSettings?.next_number,
+    numberPrefix: estimatesSettings?.number_prefix,
+  })),
+)(EstimateNumberDialogContent);

client/src/containers/Dialogs/EstimateNumberDialog/index.js

@@ -0,0 +1,28 @@
+import React, { lazy } from 'react';
+import { FormattedMessage as T } from 'react-intl';
+import { Dialog, DialogSuspense } from 'components';
+import withDialogRedux from 'components/DialogReduxConnect';
+import { compose } from 'utils';
+
+const EstimateNumberDialogContent = lazy(() =>
+  import('./EstimateNumberDialogContent'),
+);
+
+function EstimateNumberDialog({ dialogName, paylaod = { id: null }, isOpen }) {
+  return (
+    <Dialog
+      name={dialogName}
+      title={<T id={'Estimate_number_settings'} />}
+      autoFocus={true}
+      canEscapeKeyClose={true}
+      isOpen={isOpen}
+      className={'dialog--journal-number-settings'}
+    >
+      <DialogSuspense>
+        <EstimateNumberDialogContent EstimateNumberId={paylaod.id} />
+      </DialogSuspense>
+    </Dialog>
+  );
+}
+
+export default compose(withDialogRedux())(EstimateNumberDialog);

client/src/containers/Dialogs/PaymentNumberDialog/PaymentNumberDialogContent.js

@@ -0,0 +1,78 @@
+import React from 'react';
+import { DialogContent } from 'components';
+import { useQuery, queryCache } from 'react-query';
+
+import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm';
+
+import withDialogActions from 'containers/Dialog/withDialogActions';
+import withSettingsActions from 'containers/Settings/withSettingsActions';
+import withSettings from 'containers/Settings/withSettings';
+import withPaymentMadeActions from 'containers/Purchases/PaymentMades/withPaymentMadeActions';
+
+import { compose, optionsMapToArray } from 'utils';
+
+/**
+ * payment number dialog's content.
+ */
+
+function PaymentNumberDialogContent({
+  // #withSettings
+  nextNumber,
+  numberPrefix,
+
+  // #withSettingsActions
+  requestFetchOptions,
+  requestSubmitOptions,
+
+  // #withDialogActions
+  closeDialog,
+  // #withPaymentMadeActions
+  setPaymentNumberChange,
+}) {
+  const fetchSettings = useQuery(['settings'], () => requestFetchOptions({}));
+
+  const handleSubmitForm = (values, { setSubmitting }) => {
+    const options = optionsMapToArray(values).map((option) => {
+      return { key: option.key, ...option, group: 'bill_payments' };
+    });
+
+    requestSubmitOptions({ options })
+      .then(() => {
+        setSubmitting(false);
+        closeDialog('payment-number-form');
+        setPaymentNumberChange(true);
+
+        setTimeout(() => {
+          queryCache.invalidateQueries('settings');
+        }, 250);
+      })
+      .catch(() => {
+        setSubmitting(false);
+      });
+  };
+  const handleClose = () => {
+    closeDialog('payment-number-form');
+  };
+  return (
+    <DialogContent
+     isLoading={fetchSettings.isFetching}
+    >
+      <ReferenceNumberForm
+        initialNumber={nextNumber}
+        initialPrefix={numberPrefix}
+        onSubmit={handleSubmitForm}
+        onClose={handleClose}
+      />
+    </DialogContent>
+  );
+}
+
+export default compose(
+  withDialogActions,
+  withSettingsActions,
+  withSettings(({ billPaymentSettings }) => ({
+    nextNumber: billPaymentSettings?.next_number,
+    numberPrefix: billPaymentSettings?.number_prefix,
+  })),
+  withPaymentMadeActions,
+)(PaymentNumberDialogContent);

client/src/containers/Dialogs/PaymentNumberDialog/index.js

@@ -0,0 +1,28 @@
+import React, { lazy } from 'react';
+import { FormattedMessage as T } from 'react-intl';
+import { Dialog, DialogSuspense } from 'components';
+import withDialogRedux from 'components/DialogReduxConnect';
+import { compose } from 'utils';
+
+const PaymentNumbereDialogConetnet = lazy(() =>
+  import('./PaymentNumberDialogContent'),
+);
+
+function PaymentNumberDialog({ dialogName, payload = { id: null }, isOpen }) {
+  return (
+    <Dialog
+      name={dialogName}
+      name={dialogName}
+      title={<T id={'payment_number_settings'} />}
+      autoFocus={true}
+      canEscapeKeyClose={true}
+      isOpen={isOpen}
+    >
+      <DialogSuspense>
+        <PaymentNumbereDialogConetnet paymentNumberId={payload.id} />
+      </DialogSuspense>
+    </Dialog>
+  );
+}
+
+export default compose(withDialogRedux())(PaymentNumberDialog);