From d14a713ab9b0327e65da9f6849ff61dafe5c814e Mon Sep 17 00:00:00 2001
From: yenugukeerthana <keerthana.yenugu@thoughtworks.com>
Date: Fri, 29 Sep 2023 12:01:13 +0530
Subject: [PATCH 1/7] Add. Inward Api workflow

Co-authored-by: deeptirawat1510 <deepti.rawat@thoughtworks.com>
---
 src/inventory/aushada/aushada.jsx             | 98 ++++++++++++++++---
 .../aushada/eaushadha-response-mapper.js      | 28 +++++-
 src/service/save-receipt.js                   |  3 +-
 src/utils/api-utils.js                        |  6 +-
 4 files changed, 115 insertions(+), 20 deletions(-)

diff --git a/src/inventory/aushada/aushada.jsx b/src/inventory/aushada/aushada.jsx
index 5afbf57..0932356 100644
--- a/src/inventory/aushada/aushada.jsx
+++ b/src/inventory/aushada/aushada.jsx
@@ -3,6 +3,8 @@ import {
   ButtonSet,
   Column,
   DataTable,
+  DatePicker,
+  DatePickerInput,
   Grid,
   Loading,
   Row,
@@ -30,11 +32,15 @@ import saveReceipt from '../../service/save-receipt';
 import {
   fetcher,
   fetcherPost,
+  getRequest,
+  globalPropertyUrl,
+  stockInwardURL,
   stockReceiptURL,
   stockRoomURL
 } from '../../utils/api-utils';
 import {
   getCalculatedQuantity,
+  getInwardStockReceiptObj,
   getStockReceiptObj,
 } from './eaushadha-response-mapper';
 import styles from './aushada.module.scss';
@@ -55,18 +61,30 @@ const Aushada = (props) => {
   const [cookies] = useCookies();
   const { setReloadData } = props;
   const { itemStock} = useItemStockContext();
+  const [institutionId, setInstitutionId] = useState('');
+  const [isDateSelected, setIsDateSelected] = useState(false);
+  const [isInstitutionIdDisabled, setInstitutionIdDisabled] = useState(true);
+  const [selectedDate, setSelectedDate] = useState('');
+  const [enableEaushadhaInwardApi, setEnableEaushadhaInwardApi] = useState('');
 
   const { data: stockRoom, error: stockRoomError } = useSWR(
     stockRoomURL(cookies[locationCookieName]?.name.trim()),
     fetcher,
   );
 
+  useEffect(async ()=>{
+    const response=await getRequest(globalPropertyUrl('eAushadha.inward'))
+    if(response==true){
+      setEnableEaushadhaInwardApi(true);
+    }
+  },[enableEaushadhaInwardApi])
+
   useEffect(() => {
     if (stockIntakeButtonClick) {
     let outwardMatch = false;
      for (const result of itemStock) {
      for(const stockOperation of result.details){
-       if (stockOperation.batchOperation.outwardId === outwardNumber) {
+       if (stockOperation.batchOperation.outwardId && stockOperation.batchOperation.outwardId === outwardNumber ) {
             outwardMatch = true;
             break;
           }
@@ -84,9 +102,19 @@ const Aushada = (props) => {
 
       const fetchData = async () => {
         try {
-          const response = await fetcherPost(stockReceiptURL(), { ouid: outwardNumber });
+          let url, requestBody;
+
+          if (enableEaushadhaInwardApi) {
+            url = stockInwardURL();
+            const formattedDate = new Date(new Date(selectedDate).setDate(new Date(selectedDate).getDate() + 1)).toISOString().split('T')[0];
+            requestBody = { "inwardDate":formattedDate, "instituteId":institutionId};
+          } else {
+            url = stockReceiptURL();
+            requestBody = { ouid: outwardNumber };
+          }
+          const response = await fetcherPost(url, requestBody);
           if (response) {
-            setItems(getStockReceiptObj(response));
+            setItems(enableEaushadhaInwardApi ? getInwardStockReceiptObj(response) : getStockReceiptObj(response));
             setReceivedResponse(response);
             setStockEmptyResonseMessage(response.length === 0);
           }
@@ -98,7 +126,7 @@ const Aushada = (props) => {
       fetchData();
     }
     }
-  }, [stockIntakeButtonClick, outwardNumber]);
+  }, [stockIntakeButtonClick, outwardNumber,selectedDate,institutionId,items]);
 
   useEffect(() => {
     if (items.length > 0) {
@@ -113,19 +141,21 @@ const Aushada = (props) => {
   }, [items]);
 
   useEffect(() => {
-    if (outwardNumber.length > 0) {
+    if (outwardNumber.length > 0 || (institutionId.length > 0 && isDateSelected)) {
       setIsOutwardNumberDisabled(false);
       setIsFetchStockDisabled(false);
+      setInstitutionIdDisabled(false)
     } else {
       setIsOutwardNumberDisabled(false);
       setIsFetchStockDisabled(true);
+      setInstitutionIdDisabled(false)
     }
 
     if (items.length > 0) {
       setIsOutwardNumberDisabled(true);
       setIsFetchStockDisabled(true);
     }
-  }, [items, outwardNumber]);
+  }, [items, outwardNumber, institutionId, isDateSelected]);
 
   useEffect(() => {
     if (onSuccesful) {
@@ -184,6 +214,11 @@ const Aushada = (props) => {
     setOnFailure(status);
 
   };
+  
+  const handleDateChange = (date) => {
+    setSelectedDate(date[0]);
+    setIsDateSelected(true);
+  };
 
  return (
     <>
@@ -196,16 +231,47 @@ const Aushada = (props) => {
               ResponseNotification('error', 'Error', failureMessage, setOnSuccessAndFailure)}
                    </Column>
           <Row>
-            <Column sm={8} lg={4}>
-              <TextInput
-                id='stock-receipt'
-                labelText='Outward Number'
-                value={outwardNumber}
-                style={{ width: '80%' }}
-                onChange={(e) => setOutwardNumber(e.target.value)}
-                disabled={isOutwardNumberDisabled}
-              />
-            </Column>
+          {enableEaushadhaInwardApi ? (
+              <>
+                <Column sm={8} lg={4}>
+                  <TextInput
+                    id='stock-receipt'
+                    labelText='Institution ID'
+                    value={institutionId}
+                    style={{ width: '80%' }}
+                    onChange={(e) => setInstitutionId(e.target.value)}
+                    disabled={isInstitutionIdDisabled}
+                  />
+                </Column>
+                <Column sm={8} lg={4}>
+                  <DatePicker
+                    datePickerType='single'
+                    dateFormat='y-m-d'
+                    value={selectedDate}
+                    onChange={handleDateChange}
+                  >
+                    <DatePickerInput
+                      id='myDatePicker'
+                      labelText='Select a date'
+                      placeholder='yyyy/mm/dd'
+                      pattern='d{1,2}/d{1,2}/d{4}'
+                    />
+                  </DatePicker>
+                </Column>
+              </>) : (
+              <>
+                <Column sm={8} lg={4}>
+                  <TextInput
+                    id='stock-receipt'
+                    labelText='Outward Number'
+                    value={outwardNumber}
+                    style={{ width: '80%' }}
+                    onChange={(e) => setOutwardNumber(e.target.value)}
+                    disabled={isOutwardNumberDisabled}
+                  />
+                </Column>
+              </>
+            )}
             <Column sm={8} lg={4} style={{ paddingTop: '1.5rem' }}>
               <Button
                 onClick={() => setStockIntakeButtonClick(true)}
diff --git a/src/inventory/aushada/eaushadha-response-mapper.js b/src/inventory/aushada/eaushadha-response-mapper.js
index 0b27f01..04c8f87 100644
--- a/src/inventory/aushada/eaushadha-response-mapper.js
+++ b/src/inventory/aushada/eaushadha-response-mapper.js
@@ -43,4 +43,30 @@ export const getCalculatedQuantity = (quantity, unitPack) => {
 		unitPackQuantity *= element;
 	});
 	return parseInt(unitPackQuantity * quantity, 10);
-};
\ No newline at end of file
+};
+export const getInwardStockReceiptObj = (response) => {
+	const stockReceiptArray = [];
+	response?.forEach((element,index) => {
+		const dateString = element.exp_date;
+		const convertedDate = new Date(dateString.split("/").reverse().join("-"));
+		const itemName = element.drug_name.split(/\s+/).join(' ');
+		const rowObj = {
+			id: `${element.drug_id}-${index}}`,
+			itemId: element.drug_id,
+			item: itemName,
+			supplierName: element.supplier,
+			batchNumber: element.batch_number,
+			expiration: convertedDate
+				.toLocaleDateString("en-GB")
+				.split("/")
+				.join("-"),
+			quantity: element.quantity_In_Pack,
+			totalQuantity: element.quantity_In_Units,
+			unitPack: element.unitPack,
+			invalid: false,
+			inwardno: element.inwardno,
+		};
+		stockReceiptArray.push(rowObj);
+	})
+	return stockReceiptArray;
+}
\ No newline at end of file
diff --git a/src/service/save-receipt.js b/src/service/save-receipt.js
index 0aecd53..238b738 100644
--- a/src/service/save-receipt.js
+++ b/src/service/save-receipt.js
@@ -22,6 +22,7 @@ const saveReceipt = async (items, outwardNumber, destinationUuid) => {
         expiration: item.expiration,
         batchNumber: item.batchNumber,
         calculatedExpiration: true,
+        inwardNo: item.inwardno,
       });
     }),
   );
@@ -39,7 +40,7 @@ const saveReceipt = async (items, outwardNumber, destinationUuid) => {
     department: '',
     outwardId: outwardNumber,
   };
-
+  
   return postRequest(stockOperationURL, requestBody);
 };
 export default saveReceipt;
diff --git a/src/utils/api-utils.js b/src/utils/api-utils.js
index e63462d..b53c4b7 100644
--- a/src/utils/api-utils.js
+++ b/src/utils/api-utils.js
@@ -68,10 +68,12 @@ export const prescribedDrugOrders = (patientUuid) =>
 	`/openmrs/ws/rest/v1/bahmnicore/drugOrders/prescribedAndActive?getEffectiveOrdersOnly=false&getOtherActive=true&numberOfVisits=1&patientUuid=${patientUuid}&preferredLocale=en`;
 export const stockReceiptURL = () =>
 	"/openmrs/ws/rest/v1/eaushadha/stock-receipt";
-
+export const stockInwardURL = () =>
+    "/openmrs/ws/rest/v1/eaushadha/inward-stock-receipt";
 export const dispenseConceptURL = '/openmrs/ws/rest/v1/concept?q=Dispensed&limit=1'
 export const stockOperationURL = "/openmrs/ws/rest/v2/inventory/stockOperation"
 export const stockOperationTypeURL = (stockOperationType) => `/openmrs/ws/rest/v2/inventory/stockOperationType?v=full&q=${stockOperationType}`
 export const inventoryItemByNameURL = (itemName) => `/openmrs/ws/rest/v2/inventory/item?v=full&q=${itemName}`
 export const sessionURL = '/openmrs/ws/rest/v1/session?v=custom:(uuid)'
-export const getAllPatient = (locationUuid,inputValue) => `/openmrs/ws/rest/v1/bahmni/search/patient/lucene?filterOnAllIdentifiers=true&identifier=${inputValue}&loginLocationUuid=${locationUuid}&q=${inputValue}`
\ No newline at end of file
+export const getAllPatient = (locationUuid,inputValue) => `/openmrs/ws/rest/v1/bahmni/search/patient/lucene?filterOnAllIdentifiers=true&identifier=${inputValue}&loginLocationUuid=${locationUuid}&q=${inputValue}`
+export const globalPropertyUrl= (propertyName) => `/openmrs/ws/rest/v1/bahmnicore/sql/globalproperty?property=${propertyName}`;

From 550c06e526689b3929856dd8a66d0a9784fd3312 Mon Sep 17 00:00:00 2001
From: poojadeshpande01 <pooja.deshpande@thoughtworks.com>
Date: Fri, 29 Sep 2023 18:38:30 +0530
Subject: [PATCH 2/7] Mapping to correct variables from the API

---
 src/inventory/aushada/eaushadha-response-mapper.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/inventory/aushada/eaushadha-response-mapper.js b/src/inventory/aushada/eaushadha-response-mapper.js
index 04c8f87..913b3c5 100644
--- a/src/inventory/aushada/eaushadha-response-mapper.js
+++ b/src/inventory/aushada/eaushadha-response-mapper.js
@@ -47,15 +47,15 @@ export const getCalculatedQuantity = (quantity, unitPack) => {
 export const getInwardStockReceiptObj = (response) => {
 	const stockReceiptArray = [];
 	response?.forEach((element,index) => {
-		const dateString = element.exp_date;
+		const dateString = element.exp_Date;
 		const convertedDate = new Date(dateString.split("/").reverse().join("-"));
-		const itemName = element.drug_name.split(/\s+/).join(' ');
+		const itemName = element.drug_Name.split(/\s+/).join(' ');
 		const rowObj = {
-			id: `${element.drug_id}-${index}}`,
-			itemId: element.drug_id,
+			id: `${element.drug_Id}-${index}}`,
+			itemId: element.drug_Id,
 			item: itemName,
 			supplierName: element.supplier,
-			batchNumber: element.batch_number,
+			batchNumber: element.batch_Number,
 			expiration: convertedDate
 				.toLocaleDateString("en-GB")
 				.split("/")
@@ -64,7 +64,7 @@ export const getInwardStockReceiptObj = (response) => {
 			totalQuantity: element.quantity_In_Units,
 			unitPack: element.unitPack,
 			invalid: false,
-			inwardno: element.inwardno,
+			inwardNo: element.inwardNo,
 		};
 		stockReceiptArray.push(rowObj);
 	})

From 21b6754288f345a6b0f076f7ecbf1c1eeed6662f Mon Sep 17 00:00:00 2001
From: yenugukeerthana <keerthana.yenugu@thoughtworks.com>
Date: Wed, 4 Oct 2023 14:15:06 +0530
Subject: [PATCH 3/7] Refactor. Code

Co-authored-by: deeptirawat1510 <deepti.rawat@thoughtworks.com>
---
 src/inventory/aushada/aushada.jsx | 98 ++++++++++++++++++-------------
 src/service/save-receipt.js       | 58 +++++++++++++++++-
 src/utils/date-utils.js           | 16 ++++-
 3 files changed, 130 insertions(+), 42 deletions(-)

diff --git a/src/inventory/aushada/aushada.jsx b/src/inventory/aushada/aushada.jsx
index 0932356..8dea781 100644
--- a/src/inventory/aushada/aushada.jsx
+++ b/src/inventory/aushada/aushada.jsx
@@ -44,6 +44,8 @@ import {
   getStockReceiptObj,
 } from './eaushadha-response-mapper';
 import styles from './aushada.module.scss';
+import inwardSaveReceipt from '../../service/save-receipt';
+import { convertToDateTimeFormat } from '../../utils/date-utils';
 
 const Aushada = (props) => {
   const [items, setItems] = useState([]);
@@ -58,6 +60,7 @@ const Aushada = (props) => {
   const [stockEmptyResonseMessage, setStockEmptyResonseMessage] = useState(false);
   const [negativeError, setNegativeError] = useState(false);
   const [outwardNumberExists, setOutwardNumberExists] = useState(false);
+  const [inwardNumberExists, setInwardNumberExists] = useState(false);
   const [cookies] = useCookies();
   const { setReloadData } = props;
   const { itemStock} = useItemStockContext();
@@ -81,49 +84,54 @@ const Aushada = (props) => {
 
   useEffect(() => {
     if (stockIntakeButtonClick) {
-    let outwardMatch = false;
-     for (const result of itemStock) {
-     for(const stockOperation of result.details){
-       if (stockOperation.batchOperation.outwardId && stockOperation.batchOperation.outwardId === outwardNumber ) {
-            outwardMatch = true;
-            break;
+      let outwardMatch = false;
+      let inwardNumberMatch = false;
+      
+      for (const result of itemStock) {
+          for (const stockOperation of result.details) {
+            const formattedDate2 = convertToDateTimeFormat(selectedDate);
+              if (stockOperation.batchOperation.instituteId === institutionId && stockOperation.batchOperation.inwardDate === formattedDate2) {
+                  inwardNumberMatch = true;
+                  break;
+              }
+              if (stockOperation.batchOperation.outwardId === outwardNumber) {
+                  outwardMatch = true;
+                  break;
+              }
           }
-        }
-        if(outwardMatch){
-          break;
-        }
+          if (inwardNumberMatch || outwardMatch) break;
       }
-          if(outwardMatch){
-          setOutwardNumberExists(true);
-          setStockIntakeButtonClick(false);
-          }
-          else{
-            setOutwardNumberExists(false);
 
-      const fetchData = async () => {
-        try {
-          let url, requestBody;
+    setInwardNumberExists(inwardNumberMatch);
+    setOutwardNumberExists(outwardMatch);
+    setStockIntakeButtonClick(false);
 
-          if (enableEaushadhaInwardApi) {
-            url = stockInwardURL();
-            const formattedDate = new Date(new Date(selectedDate).setDate(new Date(selectedDate).getDate() + 1)).toISOString().split('T')[0];
-            requestBody = { "inwardDate":formattedDate, "instituteId":institutionId};
-          } else {
-            url = stockReceiptURL();
-            requestBody = { ouid: outwardNumber };
-          }
-          const response = await fetcherPost(url, requestBody);
-          if (response) {
-            setItems(enableEaushadhaInwardApi ? getInwardStockReceiptObj(response) : getStockReceiptObj(response));
-            setReceivedResponse(response);
-            setStockEmptyResonseMessage(response.length === 0);
-          }
-        } catch (error) {
-          setStockReceiptError(error);
-        }
-        setStockIntakeButtonClick(false);
-      };
-      fetchData();
+    if(!inwardNumberMatch && !outwardMatch)
+        {
+            const fetchData = async () => {
+              try {
+                let url, requestBody;
+
+                if (enableEaushadhaInwardApi) {
+                  url = stockInwardURL();
+                  const formattedDate= convertToDateTimeFormat(selectedDate);
+                  requestBody = { "inwardDate":formattedDate, "instituteId":institutionId};
+                } else {
+                  url = stockReceiptURL();
+                  requestBody = { ouid: outwardNumber };
+                }
+                const response = await fetcherPost(url, requestBody);
+                if (response) {
+                  setItems(enableEaushadhaInwardApi ? getInwardStockReceiptObj(response) : getStockReceiptObj(response));
+                  setReceivedResponse(response);
+                  setStockEmptyResonseMessage(response.length === 0);
+                }
+              } catch (error) {
+                setStockReceiptError(error);
+              }
+              setStockIntakeButtonClick(false);
+             };
+           fetchData();
     }
     }
   }, [stockIntakeButtonClick, outwardNumber,selectedDate,institutionId,items]);
@@ -197,7 +205,8 @@ const Aushada = (props) => {
   };
   const handleSave = async () => {
     try {
-      const response = await saveReceipt(items, outwardNumber, stockRoom.results[0]?.uuid);
+      const formattedDate = convertToDateTimeFormat(selectedDate);
+      const response = await inwardSaveReceipt(items, institutionId,formattedDate, stockRoom.results[0]?.uuid);
       if (response && response.ok) {
         setReloadData(true);
         setOnSuccesful(true);
@@ -300,6 +309,15 @@ const Aushada = (props) => {
               )}
             </div>
           )}
+            {inwardNumberExists && (
+              <h3 style={{ paddingTop: '1rem' }}>
+                {ResponseNotification(
+                  'error',
+                  'Error',
+                  'Institution Id with this Date already fetched. Please enter a new institute id and date',setInwardNumberExists
+                )}
+              </h3>
+            )}
             {outwardNumberExists && (
                       <h3 style={{ paddingTop: '1rem' }}>
                         {ResponseNotification(
diff --git a/src/service/save-receipt.js b/src/service/save-receipt.js
index 238b738..8b8ac03 100644
--- a/src/service/save-receipt.js
+++ b/src/service/save-receipt.js
@@ -43,4 +43,60 @@ const saveReceipt = async (items, outwardNumber, destinationUuid) => {
   
   return postRequest(stockOperationURL, requestBody);
 };
-export default saveReceipt;
+
+const inwardSaveReceipt = async (items, institutionId, inwardDate, destinationUuid) => {
+  const instanceTypeResponse = await getRequest(stockOperationTypeURL('Receipt'));
+  const instanceTypeUuids = instanceTypeResponse.results[0].uuid;
+  const itemsArray = [];
+  await Promise.all(
+    items.map(async (item) => {
+      const itemName = encodeURIComponent(item.item);
+      const response = await getRequest(`/openmrs/ws/rest/v2/inventory/item?v=full&q=${itemName}`);
+      const itemUuid = response.results[0]?.uuid;
+      itemsArray.push({
+        item: itemUuid,
+        quantity: item.totalQuantity,
+        expiration: item.expiration,
+        batchNumber: item.batchNumber,
+        calculatedExpiration: true,
+        inwardNo: item.inwardno,
+      });
+    }),
+  );
+
+  const requestBody = {
+    status: 'NEW',
+    attributes: [],
+    // items: itemsArray,
+   items: [
+      {
+          item: "37d4b9c8-635c-4de8-8929-805d3101232b",
+          quantity: 2,
+          expiration: "30-11-2024",
+          batchNumber: "A361",
+          calculatedExpiration: true,
+          inwardNumber: "INW-0000004"
+      },
+      {
+        item: "3093c9da-b362-473f-b699-05e7fdb52506",
+        quantity: 5,
+        expiration: "31-07-2025",
+        batchNumber: "EM981",
+        calculatedExpiration: true,
+        inwardNumber: "INW-0000005"
+      }
+    ],
+    operationNumber: '',
+    instanceType: instanceTypeUuids,
+    operationDate: getFormattedDate(),
+    source: '',
+    destination: destinationUuid,
+    institution: '',
+    department: '',
+    inwardDate: inwardDate,
+    instituteId: institutionId,
+  };
+  return postRequest(stockOperationURL, requestBody);
+};
+
+export default inwardSaveReceipt;
diff --git a/src/utils/date-utils.js b/src/utils/date-utils.js
index a419d23..268f0e4 100644
--- a/src/utils/date-utils.js
+++ b/src/utils/date-utils.js
@@ -8,9 +8,23 @@ const getFormattedDate = () => {
 
 };
 
+const convertToDateTimeFormat = (inputTime) => {
+  const dateObject = new Date(inputTime);
+  const year = dateObject.getFullYear();
+  const month = String(dateObject.getMonth() + 1).padStart(2, '0');
+  const day = String(dateObject.getDate()).padStart(2, '0');
+  const hours = String(dateObject.getHours()).padStart(2, '0');
+  const minutes = String(dateObject.getMinutes()).padStart(2, '0');
+  const seconds = String(dateObject.getSeconds()).padStart(2, '0');
+  const milliseconds = String(dateObject.getMilliseconds()).padStart(3, '0');
+  const timezoneOffset = '0000';
+
+  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}.${milliseconds}+${timezoneOffset}`;
+};
+
 const getDatePattern = () => {
   const datePattern = "(0[1-9]|[1-2][0-9]|3[0-1])/(0[1-9]|1[0-2])/\\d{4}"
   return datePattern;
 };
 
-export { getFormattedDate, getDatePattern };
\ No newline at end of file
+export { getFormattedDate,convertToDateTimeFormat, getDatePattern };
\ No newline at end of file

From b6ae14da1adc3cf1f23d56cb47fb0dac491780c5 Mon Sep 17 00:00:00 2001
From: yenugukeerthana <keerthana.yenugu@thoughtworks.com>
Date: Wed, 4 Oct 2023 17:39:25 +0530
Subject: [PATCH 4/7] Update. Date format and add serial number

Co-authored-by: deeptirawat1510 <deepti.rawat@thoughtworks.com>
---
 constants.js                      |  1 +
 src/inventory/aushada/aushada.jsx | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/constants.js b/constants.js
index 4200725..92c382a 100644
--- a/constants.js
+++ b/constants.js
@@ -49,6 +49,7 @@ export const dispenseHeaders = [
 ];
 
 export const stockReceiptHeaders = [
+	{ key: "serialNo", header: "S.No"},
 	{ key: "itemId", header: "Item Id" },
 	{ key: "item", header: "Item" },
 	{ key: "supplierName", header: "Supplier Name" },
diff --git a/src/inventory/aushada/aushada.jsx b/src/inventory/aushada/aushada.jsx
index 8dea781..17c1491 100644
--- a/src/inventory/aushada/aushada.jsx
+++ b/src/inventory/aushada/aushada.jsx
@@ -255,14 +255,14 @@ const Aushada = (props) => {
                 <Column sm={8} lg={4}>
                   <DatePicker
                     datePickerType='single'
-                    dateFormat='y-m-d'
+                    dateFormat='d-m-Y'
                     value={selectedDate}
                     onChange={handleDateChange}
                   >
                     <DatePickerInput
                       id='myDatePicker'
                       labelText='Select a date'
-                      placeholder='yyyy/mm/dd'
+                      placeholder='dd/mm/yyyy'
                       pattern='d{1,2}/d{1,2}/d{4}'
                     />
                   </DatePicker>
@@ -354,10 +354,17 @@ const Aushada = (props) => {
                             </TableRow>
                           </TableHead>
                           <TableBody>
-                            {rows.map((row) => (
+                            {rows.map((row,index) => (
                               <>
                                 <TableRow {...getRowProps({ row })} key='stock-fetch'>
                                   {row.cells.map((cell) => {
+                                    if(cell.id.includes('serialNo')){
+                                      return(
+                                        <TableCell key={cell.id}>
+                                          {++index}
+                                        </TableCell>
+                                      )
+                                    }
                                     if (
                                       cell.id.includes('totalQuantity') ||
                                       cell.id.includes('quantity')

From f9a4d8444b9510e16516c4076fa6e377de350ae9 Mon Sep 17 00:00:00 2001
From: yenugukeerthana <keerthana.yenugu@thoughtworks.com>
Date: Thu, 5 Oct 2023 18:36:41 +0530
Subject: [PATCH 5/7] WIP. Code Refactor

Co-authored-by: deeptirawat1510 <deepti.rawat@thoughtworks.com>
---
 src/inventory/aushada/aushada.jsx         |  5 ++---
 src/inventory/aushada/aushada.module.scss | 16 ++++++++++++++++
 src/service/save-receipt.js               |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/inventory/aushada/aushada.jsx b/src/inventory/aushada/aushada.jsx
index 17c1491..a100c7e 100644
--- a/src/inventory/aushada/aushada.jsx
+++ b/src/inventory/aushada/aushada.jsx
@@ -28,7 +28,6 @@ import {
 import '../../../index.scss';
 import { ResponseNotification } from '../../components/notifications/response-notification';
 import { useItemStockContext } from '../../context/item-stock-context';
-import saveReceipt from '../../service/save-receipt';
 import {
   fetcher,
   fetcherPost,
@@ -44,8 +43,8 @@ import {
   getStockReceiptObj,
 } from './eaushadha-response-mapper';
 import styles from './aushada.module.scss';
-import inwardSaveReceipt from '../../service/save-receipt';
 import { convertToDateTimeFormat } from '../../utils/date-utils';
+import { inwardSaveReceipt, saveReceipt } from '../../service/save-receipt';
 
 const Aushada = (props) => {
   const [items, setItems] = useState([]);
@@ -206,7 +205,7 @@ const Aushada = (props) => {
   const handleSave = async () => {
     try {
       const formattedDate = convertToDateTimeFormat(selectedDate);
-      const response = await inwardSaveReceipt(items, institutionId,formattedDate, stockRoom.results[0]?.uuid);
+      const response = await(enableEaushadhaInwardApi ? inwardSaveReceipt(items, institutionId,formattedDate, stockRoom.results[0]?.uuid) : saveReceipt(items, outwardNumber, stockRoom.results[0]?.uuid));
       if (response && response.ok) {
         setReloadData(true);
         setOnSuccesful(true);
diff --git a/src/inventory/aushada/aushada.module.scss b/src/inventory/aushada/aushada.module.scss
index b9824aa..a8edaef 100644
--- a/src/inventory/aushada/aushada.module.scss
+++ b/src/inventory/aushada/aushada.module.scss
@@ -3,6 +3,22 @@
 .stockReceiptTable {
   max-height: calc(100vh - 500px);
   overflow-y: scroll;
+  border: 1px solid #ccc;
+
+  &::-webkit-scrollbar {
+    width: 12px;
+    border-width: 1px;
+    border-radius: 6px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: darkgray;
+    border-radius: 6px; 
+  }
+
+  &::-webkit-scrollbar-track {
+    background-color: lightgray;
+  }
 }
 
 .buttonSet {
diff --git a/src/service/save-receipt.js b/src/service/save-receipt.js
index 8b8ac03..87129aa 100644
--- a/src/service/save-receipt.js
+++ b/src/service/save-receipt.js
@@ -99,4 +99,4 @@ const inwardSaveReceipt = async (items, institutionId, inwardDate, destinationUu
   return postRequest(stockOperationURL, requestBody);
 };
 
-export default inwardSaveReceipt;
+export { saveReceipt, inwardSaveReceipt };
\ No newline at end of file

From 3d102fd3da16fa74d5b2b701385b5baa70a0e7ea Mon Sep 17 00:00:00 2001
From: yenugukeerthana <keerthana.yenugu@thoughtworks.com>
Date: Thu, 5 Oct 2023 19:36:16 +0530
Subject: [PATCH 6/7] WIP. Code Refactor

Co-authored-by: deeptirawat1510 <deepti.rawat@thoughtworks.com>
---
 src/inventory/aushada/aushada.jsx | 50 +++++++++++++++++++------------
 src/utils/api-utils.js            |  1 +
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/inventory/aushada/aushada.jsx b/src/inventory/aushada/aushada.jsx
index a100c7e..d0a02c4 100644
--- a/src/inventory/aushada/aushada.jsx
+++ b/src/inventory/aushada/aushada.jsx
@@ -31,6 +31,7 @@ import { useItemStockContext } from '../../context/item-stock-context';
 import {
   fetcher,
   fetcherPost,
+  getLocationAttributes,
   getRequest,
   globalPropertyUrl,
   stockInwardURL,
@@ -63,11 +64,12 @@ const Aushada = (props) => {
   const [cookies] = useCookies();
   const { setReloadData } = props;
   const { itemStock} = useItemStockContext();
-  const [institutionId, setInstitutionId] = useState('');
   const [isDateSelected, setIsDateSelected] = useState(false);
-  const [isInstitutionIdDisabled, setInstitutionIdDisabled] = useState(true);
   const [selectedDate, setSelectedDate] = useState('');
   const [enableEaushadhaInwardApi, setEnableEaushadhaInwardApi] = useState('');
+  const [instituteId, setInstituteId] = useState([]);
+  const [instituteIdExists, setInstituteIdExists] = useState(false);
+  const locationUuid = cookies[locationCookieName].uuid;
 
   const { data: stockRoom, error: stockRoomError } = useSWR(
     stockRoomURL(cookies[locationCookieName]?.name.trim()),
@@ -81,6 +83,22 @@ const Aushada = (props) => {
     }
   },[enableEaushadhaInwardApi])
 
+  const fetchInstituteIdByLocation = async () => {
+    const response = await getRequest(getLocationAttributes(locationUuid));
+    response?.results?.forEach((result) => {
+      if (result?.attributeType?.display === "institutionId" && result?.value) {
+        setInstituteId(result?.value);
+        setInstituteIdExists(true)
+        return;
+      }
+      else{
+        setInstituteId("Contact Admin to set Institution Id")
+      }
+    });
+  };
+
+  fetchInstituteIdByLocation();
+
   useEffect(() => {
     if (stockIntakeButtonClick) {
       let outwardMatch = false;
@@ -88,8 +106,8 @@ const Aushada = (props) => {
       
       for (const result of itemStock) {
           for (const stockOperation of result.details) {
-            const formattedDate2 = convertToDateTimeFormat(selectedDate);
-              if (stockOperation.batchOperation.instituteId === institutionId && stockOperation.batchOperation.inwardDate === formattedDate2) {
+            const formattedDate = convertToDateTimeFormat(selectedDate);
+              if (stockOperation.batchOperation.inwardDate === formattedDate) {
                   inwardNumberMatch = true;
                   break;
               }
@@ -114,7 +132,7 @@ const Aushada = (props) => {
                 if (enableEaushadhaInwardApi) {
                   url = stockInwardURL();
                   const formattedDate= convertToDateTimeFormat(selectedDate);
-                  requestBody = { "inwardDate":formattedDate, "instituteId":institutionId};
+                  requestBody = { "inwardDate":formattedDate, "instituteId":instituteId};
                 } else {
                   url = stockReceiptURL();
                   requestBody = { ouid: outwardNumber };
@@ -133,7 +151,7 @@ const Aushada = (props) => {
            fetchData();
     }
     }
-  }, [stockIntakeButtonClick, outwardNumber,selectedDate,institutionId,items]);
+  }, [stockIntakeButtonClick, outwardNumber,selectedDate,instituteId,items]);
 
   useEffect(() => {
     if (items.length > 0) {
@@ -148,21 +166,19 @@ const Aushada = (props) => {
   }, [items]);
 
   useEffect(() => {
-    if (outwardNumber.length > 0 || (institutionId.length > 0 && isDateSelected)) {
+    if (outwardNumber.length > 0 || (isDateSelected && instituteIdExists)) {
       setIsOutwardNumberDisabled(false);
       setIsFetchStockDisabled(false);
-      setInstitutionIdDisabled(false)
     } else {
       setIsOutwardNumberDisabled(false);
       setIsFetchStockDisabled(true);
-      setInstitutionIdDisabled(false)
     }
 
     if (items.length > 0) {
       setIsOutwardNumberDisabled(true);
       setIsFetchStockDisabled(true);
     }
-  }, [items, outwardNumber, institutionId, isDateSelected]);
+  }, [items, outwardNumber, isDateSelected,instituteIdExists]);
 
   useEffect(() => {
     if (onSuccesful) {
@@ -205,7 +221,7 @@ const Aushada = (props) => {
   const handleSave = async () => {
     try {
       const formattedDate = convertToDateTimeFormat(selectedDate);
-      const response = await(enableEaushadhaInwardApi ? inwardSaveReceipt(items, institutionId,formattedDate, stockRoom.results[0]?.uuid) : saveReceipt(items, outwardNumber, stockRoom.results[0]?.uuid));
+      const response = await(enableEaushadhaInwardApi ? inwardSaveReceipt(items, instituteId,formattedDate, stockRoom.results[0]?.uuid) : saveReceipt(items, outwardNumber, stockRoom.results[0]?.uuid));
       if (response && response.ok) {
         setReloadData(true);
         setOnSuccesful(true);
@@ -242,14 +258,9 @@ const Aushada = (props) => {
           {enableEaushadhaInwardApi ? (
               <>
                 <Column sm={8} lg={4}>
-                  <TextInput
-                    id='stock-receipt'
-                    labelText='Institution ID'
-                    value={institutionId}
-                    style={{ width: '80%' }}
-                    onChange={(e) => setInstitutionId(e.target.value)}
-                    disabled={isInstitutionIdDisabled}
-                  />
+                <h4 style={{ paddingTop: '1.7rem', fontSize: '1.2rem', color: '#333' }}>
+                  Institution ID: {instituteId}
+                </h4>
                 </Column>
                 <Column sm={8} lg={4}>
                   <DatePicker
@@ -263,6 +274,7 @@ const Aushada = (props) => {
                       labelText='Select a date'
                       placeholder='dd/mm/yyyy'
                       pattern='d{1,2}/d{1,2}/d{4}'
+                      disabled={!instituteIdExists}
                     />
                   </DatePicker>
                 </Column>
diff --git a/src/utils/api-utils.js b/src/utils/api-utils.js
index b53c4b7..c18ec6b 100644
--- a/src/utils/api-utils.js
+++ b/src/utils/api-utils.js
@@ -77,3 +77,4 @@ export const inventoryItemByNameURL = (itemName) => `/openmrs/ws/rest/v2/invento
 export const sessionURL = '/openmrs/ws/rest/v1/session?v=custom:(uuid)'
 export const getAllPatient = (locationUuid,inputValue) => `/openmrs/ws/rest/v1/bahmni/search/patient/lucene?filterOnAllIdentifiers=true&identifier=${inputValue}&loginLocationUuid=${locationUuid}&q=${inputValue}`
 export const globalPropertyUrl= (propertyName) => `/openmrs/ws/rest/v1/bahmnicore/sql/globalproperty?property=${propertyName}`;
+export const getLocationAttributes=(locationUuid) => `/openmrs/ws/rest/v1/location/${locationUuid}/attribute`;
\ No newline at end of file

From 3a2ee72756baab700f65ab4501680074fdcf3624 Mon Sep 17 00:00:00 2001
From: yenugukeerthana <keerthana.yenugu@thoughtworks.com>
Date: Fri, 6 Oct 2023 14:40:15 +0530
Subject: [PATCH 7/7] Add. Inward API functionality for stock receipt

Co-authored-by: deeptirawat1510 <deepti.rawat@thoughtworks.com>
---
 src/inventory/aushada/aushada.jsx | 35 +++++++++++++++----------------
 src/service/save-receipt.js       | 20 +-----------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/src/inventory/aushada/aushada.jsx b/src/inventory/aushada/aushada.jsx
index d0a02c4..2dc6e87 100644
--- a/src/inventory/aushada/aushada.jsx
+++ b/src/inventory/aushada/aushada.jsx
@@ -81,24 +81,23 @@ const Aushada = (props) => {
     if(response==true){
       setEnableEaushadhaInwardApi(true);
     }
+    const fetchInstituteIdByLocation = async () => {
+      const response = await getRequest(getLocationAttributes(locationUuid));
+      response?.results?.forEach((result) => {
+        if (result?.attributeType?.display === "Institute Id" && result?.value) {
+          setInstituteId(result?.value);
+          setInstituteIdExists(true)
+          return;
+        }
+        else{
+          setInstituteId("Contact Admin to set Institute Id")
+        }
+      });
+    };
+  
+    fetchInstituteIdByLocation();
   },[enableEaushadhaInwardApi])
 
-  const fetchInstituteIdByLocation = async () => {
-    const response = await getRequest(getLocationAttributes(locationUuid));
-    response?.results?.forEach((result) => {
-      if (result?.attributeType?.display === "institutionId" && result?.value) {
-        setInstituteId(result?.value);
-        setInstituteIdExists(true)
-        return;
-      }
-      else{
-        setInstituteId("Contact Admin to set Institution Id")
-      }
-    });
-  };
-
-  fetchInstituteIdByLocation();
-
   useEffect(() => {
     if (stockIntakeButtonClick) {
       let outwardMatch = false;
@@ -259,7 +258,7 @@ const Aushada = (props) => {
               <>
                 <Column sm={8} lg={4}>
                 <h4 style={{ paddingTop: '1.7rem', fontSize: '1.2rem', color: '#333' }}>
-                  Institution ID: {instituteId}
+                  Institute ID: {instituteId}
                 </h4>
                 </Column>
                 <Column sm={8} lg={4}>
@@ -325,7 +324,7 @@ const Aushada = (props) => {
                 {ResponseNotification(
                   'error',
                   'Error',
-                  'Institution Id with this Date already fetched. Please enter a new institute id and date',setInwardNumberExists
+                  'Institute Id with this Date already fetched. Please enter a new institute id and date',setInwardNumberExists
                 )}
               </h3>
             )}
diff --git a/src/service/save-receipt.js b/src/service/save-receipt.js
index 87129aa..1e3a523 100644
--- a/src/service/save-receipt.js
+++ b/src/service/save-receipt.js
@@ -67,25 +67,7 @@ const inwardSaveReceipt = async (items, institutionId, inwardDate, destinationUu
   const requestBody = {
     status: 'NEW',
     attributes: [],
-    // items: itemsArray,
-   items: [
-      {
-          item: "37d4b9c8-635c-4de8-8929-805d3101232b",
-          quantity: 2,
-          expiration: "30-11-2024",
-          batchNumber: "A361",
-          calculatedExpiration: true,
-          inwardNumber: "INW-0000004"
-      },
-      {
-        item: "3093c9da-b362-473f-b699-05e7fdb52506",
-        quantity: 5,
-        expiration: "31-07-2025",
-        batchNumber: "EM981",
-        calculatedExpiration: true,
-        inwardNumber: "INW-0000005"
-      }
-    ],
+    items: itemsArray,
     operationNumber: '',
     instanceType: instanceTypeUuids,
     operationDate: getFormattedDate(),