Skip to content

Commit 9dc12ee

Browse files
authored
Merge pull request #1162 from Puli-shilpa/Dev-2.0
added date in payload for permit order details
2 parents 6413379 + cbca1d5 commit 9dc12ee

File tree

2 files changed

+6
-1
lines changed
  • frontend/micro-ui/web/micro-ui-internals/packages/modules

2 files changed

+6
-1
lines changed

frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/response/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Banner, Card, CardText, SubmitBar, ActionBar, DownloadPrefixIcon, Loade
33
import { useHistory, useParams, Link, LinkLabel } from "react-router-dom";
44
import { useTranslation } from "react-i18next";
55
import { useQueryClient } from "react-query";
6+
import { format } from "date-fns";
67

78
export const convertEpochToDate = (dateEpoch) => {
89
// Returning NA in else case because new Date(null) returns Current date from calender
@@ -198,8 +199,12 @@ export const SuccessfulPayment = (props) => {
198199

199200
let count=0;
200201
for(let i=0;i<workflowDetails?.data?.processInstances?.length;i++){
202+
const newDate=new Date(workflowDetails?.data?.processInstances[i]?.auditDetails?.createdTime);
203+
const formattedDate=format(newDate, 'dd-MM-yyyy HH:mm:ss');
204+
console.log("formatteddate2", formattedDate)
201205
if((workflowDetails?.data?.processInstances[i]?.action==="POST_PAYMENT_APPLY" ||workflowDetails?.data?.processInstances[i]?.action==="PAY" ) && (workflowDetails?.data?.processInstances?.[i]?.state?.applicationStatus==="APPROVAL_INPROGRESS") && count==0 ){
202206
reqData.additionalDetails.submissionDate=workflowDetails?.data?.processInstances[i]?.auditDetails?.createdTime;
207+
reqData.additionalDetails.formattedSubmissionDate=formattedDate;
203208
count=1;
204209
}
205210
}

frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => {
373373
if (formData?.owners?.purchasedFAR?.code) payload.additionalDetails.purchasedFAR = formData?.owners?.purchasedFAR?.code;
374374
if (formData?.owners?.restrictedArea?.code) payload.additionalDetails.restrictedArea = formData?.owners?.restrictedArea?.code;
375375
if (formData?.owners?.schemes?.i18nKey) payload.additionalDetails.schemes = formData?.owners?.schemes?.i18nKey;
376-
if (formData?.owners?.UlbName?.code) payload.additionalDetails.UlbName = formData?.owners?.UlbName?.code;
376+
if (formData?.owners?.UlbName?.code) payload.additionalDetails.UlbName = formData?.owners?.UlbName?.code.toLowerCase().replace(/^\w/, c=>c.toUpperCase());
377377
if (formData?.owners?.District?.code) payload.additionalDetails.District = formData?.owners?.District?.code;
378378
if (formData?.owners?.nameofApprovedcolony) payload.additionalDetails.nameofApprovedcolony = formData?.owners?.nameofApprovedcolony;
379379
if (formData?.owners?.NocNumber) payload.additionalDetails.NocNumber = formData?.owners?.NocNumber;

0 commit comments

Comments
 (0)