From a91f303111ad7e3db4285738e497417611467f0f Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 15 Mar 2022 13:46:27 +0200
Subject: [PATCH] feat(warehouses transfer):  warehouse transfer
 auto-increment.

---
 src/containers/Settings/withSettings.js            |  2 +-
 .../WarehouseTransferForm/WarehouseTransferForm.js | 14 ++++++++++++--
 .../WarehouseTransferFormDialog.js                 |  5 +++--
 src/hooks/query/settings.js                        |  4 ++--
 src/hooks/query/types.js                           |  2 +-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/containers/Settings/withSettings.js b/src/containers/Settings/withSettings.js
index b712e4430..08e7fd6dc 100644
--- a/src/containers/Settings/withSettings.js
+++ b/src/containers/Settings/withSettings.js
@@ -21,7 +21,7 @@ export default (mapState) => {
       cashflowSetting: state.settings.data.cashflow,
       creditNoteSettings: state.settings.data.creditNote,
       vendorsCreditNoteSetting: state.settings.data.vendorCredit,
-      warehouseTransferSettings: state.settings.data.warehouseTransfer,
+      warehouseTransferSettings: state.settings.data.warehouseTransfers,
     };
     return mapState ? mapState(mapped, state, props) : mapped;
   };
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
index 86b4e5eb0..8b26dae0d 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
@@ -18,6 +18,7 @@ import WarehouseTransferFormFooter from './WarehouseTransferFormFooter';
 import WarehouseTransferFloatingActions from './WarehouseTransferFloatingActions';
 import WarehouseTransferFormDialog from './WarehouseTransferFormDialog';
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
+import withSettings from 'containers/Settings/withSettings';
 
 import { AppToaster } from 'components';
 import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider';
@@ -36,7 +37,7 @@ function WarehouseTransferForm({
   warehouseTransferIncrementMode,
 }) {
   const history = useHistory();
-
+  
   const {
     isNewMode,
     warehouseTransfer,
@@ -58,6 +59,9 @@ function WarehouseTransferForm({
         ? { ...transformToEditForm(warehouseTransfer) }
         : {
             ...defaultWarehouseTransfer,
+            ...(warehouseTransferIncrementMode && {
+              transaction_number: warehouseTransferNumber,
+            }),
             entries: orderingLinesIndexes(defaultWarehouseTransfer.entries),
           }),
     }),
@@ -142,4 +146,10 @@ function WarehouseTransferForm({
   );
 }
 
-export default compose(withDashboardActions)(WarehouseTransferForm);
+export default compose(withDashboardActions,
+  withSettings(({ warehouseTransferSettings }) => ({
+    warehouseTransferNextNumber: warehouseTransferSettings?.nextNumber,
+    warehouseTransferNumberPrefix: warehouseTransferSettings?.numberPrefix,
+    warehouseTransferIncrementMode: warehouseTransferSettings?.autoIncrement,
+  })),
+  )(WarehouseTransferForm);
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormDialog.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormDialog.js
index 0471ff6a3..a4c6932b5 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormDialog.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormDialog.js
@@ -8,9 +8,10 @@ import { useFormikContext } from 'formik';
 export default function WarehouseTransferFormDialog() {
   // Update the form once the credit number form submit confirm.
   const handleWarehouseNumberFormConfirm = ({ incrementNumber, manually }) => {
-    setFieldValue('transfer_no', incrementNumber || '');
-    setFieldValue('transfer_no_manually', manually);
+    setFieldValue('transaction_number', incrementNumber || '');
+    setFieldValue('transaction_no_manually', manually);
   };
+
   const { setFieldValue } = useFormikContext();
   return (
     <React.Fragment>
diff --git a/src/hooks/query/settings.js b/src/hooks/query/settings.js
index 7e56d6cac..269d74cf1 100644
--- a/src/hooks/query/settings.js
+++ b/src/hooks/query/settings.js
@@ -149,8 +149,8 @@ export function useSettingsVendorCredits(props) {
  */
 export function useSettingsWarehouseTransfers(props) {
   return useSettingsQuery(
-    [t.SETTING, t.SETTING_WAREHOUSE_TRANSFER],
-    { group: 'warehouse_transfer' },
+    [t.SETTING, t.SETTING_WAREHOUSE_TRANSFERS],
+    { group: 'warehouse_transfers' },
     props,
   );
 }
diff --git a/src/hooks/query/types.js b/src/hooks/query/types.js
index 62107f0ff..70c0fd04c 100644
--- a/src/hooks/query/types.js
+++ b/src/hooks/query/types.js
@@ -149,7 +149,7 @@ const SETTING = {
   SETTING_EDIT_SMS_NOTIFICATION: 'SETTING_EDIT_SMS_NOTIFICATION',
   SETTING_CREDIT_NOTES: 'SETTING_CREDIT_NOTES',
   SETTING_VENDOR_CREDITS: 'SETTING_VENDOR_CREDITS',
-  SETTING_WAREHOUSE_TRANSFER: 'SETTING_WAREHOUSE_TRANSFER',
+  SETTING_WAREHOUSE_TRANSFER: 'SETTING_WAREHOUSE_TRANSFERS',
 };
 
 const ORGANIZATIONS = {