Fix: PaymentReceive Number Dialog

client/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { DialogContent } from 'components';
 import { useQuery, queryCache } from 'react-query';
 
@@ -7,12 +7,12 @@ 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 withPaymentReceivesActions from 'containers/Sales/PaymentReceive/withPaymentReceivesActions';
 
 import { compose, optionsMapToArray } from 'utils';
 
 /**
- * payment number dialog's content.
+ * payment receive number dialog's content.
  */
 
 function PaymentNumberDialogContent({
@@ -26,37 +26,39 @@ function PaymentNumberDialogContent({
 
   // #withDialogActions
   closeDialog,
-  // #withPaymentMadeActions
-  setPaymentNumberChange,
+
+  // #withPaymentReceivesActions
+  setPaymentReceiveNumberChanged,
 }) {
   const fetchSettings = useQuery(['settings'], () => requestFetchOptions({}));
 
   const handleSubmitForm = (values, { setSubmitting }) => {
     const options = optionsMapToArray(values).map((option) => {
-      return { key: option.key, ...option, group: 'bill_payments' };
+      return { key: option.key, ...option, group: 'payment_receives' };
     });
 
     requestSubmitOptions({ options })
       .then(() => {
         setSubmitting(false);
-        closeDialog('payment-number-form');
-        setPaymentNumberChange(true);
+        closeDialog('payment-receive-number-form');
 
         setTimeout(() => {
           queryCache.invalidateQueries('settings');
+          setPaymentReceiveNumberChanged(true);
         }, 250);
       })
       .catch(() => {
         setSubmitting(false);
       });
   };
-  const handleClose = () => {
-    closeDialog('payment-number-form');
-  };
+
+  const handleClose = useCallback(() => {
+    closeDialog('payment-receive-number-form');
+  }, [closeDialog]);
+
+
   return (
-    <DialogContent
-     isLoading={fetchSettings.isFetching}
-    >
+    <DialogContent isLoading={fetchSettings.isFetching}>
       <ReferenceNumberForm
         initialNumber={nextNumber}
         initialPrefix={numberPrefix}
@@ -70,9 +72,9 @@ function PaymentNumberDialogContent({
 export default compose(
   withDialogActions,
   withSettingsActions,
-  withSettings(({ billPaymentSettings }) => ({
-    nextNumber: billPaymentSettings?.next_number,
-    numberPrefix: billPaymentSettings?.number_prefix,
+  withSettings(({ paymentReceiveSettings }) => ({
+    nextNumber: paymentReceiveSettings?.nextNumber,
+    numberPrefix: paymentReceiveSettings?.numberPrefix,
   })),
-  withPaymentMadeActions,
+  withPaymentReceivesActions,
 )(PaymentNumberDialogContent);

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

@@ -4,25 +4,30 @@ import { Dialog, DialogSuspense } from 'components';
 import withDialogRedux from 'components/DialogReduxConnect';
 import { compose } from 'utils';
 
-const PaymentNumbereDialogConetnet = lazy(() =>
-  import('./PaymentNumberDialogContent'),
+const PaymentReceiveNumbereDialogConetnet = lazy(() =>
+  import('./PaymentReceiveNumberDialogContent'),
 );
 
-function PaymentNumberDialog({ dialogName, payload = { id: null }, isOpen }) {
+function PaymentReceiveNumberDialog({
+  dialogName,
+  payload = { id: null },
+  isOpen,
+}) {
   return (
     <Dialog
-      name={dialogName}
-      name={dialogName}
       title={<T id={'payment_number_settings'} />}
+      name={dialogName}
       autoFocus={true}
       canEscapeKeyClose={true}
       isOpen={isOpen}
     >
       <DialogSuspense>
-        <PaymentNumbereDialogConetnet paymentNumberId={payload.id} />
+        <PaymentReceiveNumbereDialogConetnet
+          paymentReceiveNumberId={payload.id}
+        />
       </DialogSuspense>
     </Dialog>
   );
 }
 
-export default compose(withDialogRedux())(PaymentNumberDialog);
+export default compose(withDialogRedux())(PaymentReceiveNumberDialog);