Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

src/components/AutoLogoutProvider.js

@@ -68,10 +68,10 @@ const AutoLogoutProvider = ({ children }) => {
             getRemainingTime();
             if(state !== "Active" && lastActiveTab){
                 const timeElapsed = currentTime - lastRequestTime;
-                console.log(timeElapsed);
+                // console.log(timeElapsed);
                 if (timeElapsed >= logoutInterval * 60 * 1000) {
                     //TODO: auto logout here
-                    console.log("logout");
+                    // console.log("logout");
                     //await dispatch(handleLogoutFunction());
                     //await navigate('/login');
                     //await window.location.reload();

src/pages/Organization/DetailPage/OrganizationCard.js

@@ -17,7 +17,7 @@ const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingCo
 import Loadable from 'components/Loadable';
 import { lazy } from 'react';
 import { notifySaveSuccess } from 'utils/CommonFunction';
-import {useIntl} from "react-intl";
+import { useIntl } from "react-intl";
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
@@ -48,17 +48,17 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
         enableReinitialize: true,
         initialValues: currentUserData,
         validationSchema: yup.object().shape({
-            enCompanyName: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'userRequireEnglishName'}))),
-            chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'userRequireChineseName'}))).nullable(),
-            addressLine1: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'validateAddressLine1'}))),
-            addressLine2: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'noMoreThen255Words'}))),
-            addressLine3: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'noMoreThen255Words'}))),
-            fax_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))).nullable(),
-            tel_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))),
-            phoneNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'requiredValidNumber'}))).required(displayErrorMsg(intl.formatMessage({id: 'requireContactNumber'}))),
-            faxNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'require8Number'}))).nullable(),
-            brExpiryDate: yup.string().min(8).required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertValidityDate'}))),
-            brNo: yup.string().required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertNumber'}))).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInValidBusinessRegCertNumber'}))), function (value) {
+            enCompanyName: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({ id: 'userRequireEnglishName' }))),
+            chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'userRequireChineseName' }))).nullable(),
+            addressLine1: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({ id: 'validateAddressLine1' }))),
+            addressLine2: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'noMoreThen255Words' }))),
+            addressLine3: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'noMoreThen255Words' }))),
+            fax_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({ id: 'requireDialingCode' }))).nullable(),
+            tel_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({ id: 'requireDialingCode' }))),
+            phoneNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({ id: 'requiredValidNumber' }))).required(displayErrorMsg(intl.formatMessage({ id: 'requireContactNumber' }))),
+            faxNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({ id: 'require8Number' }))).nullable(),
+            brExpiryDate: yup.string().min(8).required(displayErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' }))),
+            brNo: yup.string().required(displayErrorMsg(intl.formatMessage({ id: 'pleaseFillInBusinessRegCertNumber' }))).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(intl.formatMessage({ id: 'pleaseFillInValidBusinessRegCertNumber' }))), function (value) {
                 var brNo_pattern = /[0-9]{8}/
                 if (value !== undefined) {
                     if (value.match(brNo_pattern)) {
@@ -109,9 +109,9 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
         }
     });
 
-    useEffect(()=>{
+    useEffect(() => {
         setEditModeFun(editMode);
-    },[editMode]);
+    }, [editMode]);
 
     useEffect(() => {
         if (Object.keys(userData).length > 0) {
@@ -230,34 +230,39 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                         <Typography variant="h5">Edit</Typography>
                                     </Button>
                                 </Grid>
-                                <Grid item sx={{ ml: 3, mr: 3 }}>
-                                    <Button
-                                        size="large"
-                                        variant="contained"
-                                        color="orange"
-                                        onClick={()=>setCreditorConfirmPopUp(true)}
-                                        sx={{
-                                            textTransform: 'capitalize',
-                                            alignItems: 'end'
-                                        }}
-                                    >
-                                        <Typography variant="h5">Mark as Creditor</Typography>
-                                    </Button>
-                                </Grid>
-                                <Grid item sx={{ ml: 3, mr: 3 }}>
-                                    <Button
-                                        size="large"
-                                        variant="contained"
-                                        color="error"
-                                        onClick={()=>setNonCreditorConfirmPopUp(true)}
-                                        sx={{
-                                            textTransform: 'capitalize',
-                                            alignItems: 'end'
-                                        }}
-                                    >
-                                        <Typography variant="h5">Mark as Non-Creditor</Typography>
-                                    </Button>
-                                </Grid>
+
+                                {
+                                    currentUserData.creditor ?
+                                        <Grid item sx={{ ml: 3, mr: 3 }}>
+                                            <Button
+                                                size="large"
+                                                variant="contained"
+                                                color="error"
+                                                onClick={() => setNonCreditorConfirmPopUp(true)}
+                                                sx={{
+                                                    textTransform: 'capitalize',
+                                                    alignItems: 'end'
+                                                }}
+                                            >
+                                                <Typography variant="h5">Mark as Non-Creditor</Typography>
+                                            </Button>
+                                        </Grid>
+                                        :
+                                        <Grid item sx={{ ml: 3, mr: 3 }}>
+                                            <Button
+                                                size="large"
+                                                variant="contained"
+                                                color="orange"
+                                                onClick={() => setCreditorConfirmPopUp(true)}
+                                                sx={{
+                                                    textTransform: 'capitalize',
+                                                    alignItems: 'end'
+                                                }}
+                                            >
+                                                <Typography variant="h5">Mark as Creditor</Typography>
+                                            </Button>
+                                        </Grid>
+                                }
                             </>
                         }
                     </Grid>
@@ -363,7 +368,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                 valueName: "country",
                                 disabled: (!editMode && !createMode),
                                 dataList: ComboData.country,
-                                getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
+                                getOptionLabel: (option) => option.type ? intl.formatMessage({ id: option.type }) : "",
                                 form: formik
                             })}
                         </Grid>
@@ -374,7 +379,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                 valueName: "district",
                                 disabled: (!editMode && !createMode),
                                 dataList: ComboData.district,
-                                getOptionLabel: (option) => option.type? intl.formatMessage({ id: option.type }) : "",
+                                getOptionLabel: (option) => option.type ? intl.formatMessage({ id: option.type }) : "",
                                 form: formik
                             })}
                         </Grid>
@@ -401,7 +406,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Creditor?</Typography>
                     </DialogContent>
                     <DialogActions>
-                    <Button onClick={() => setCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
+                        <Button onClick={() => setCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
                         <Button onClick={() => markAsCreditor()}><Typography variant="h5">Confirm</Typography></Button>
                     </DialogActions>
                 </Dialog>
@@ -413,7 +418,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Non-Creditor?</Typography>
                     </DialogContent>
                     <DialogActions>
-                    <Button onClick={() => setNonCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
+                        <Button onClick={() => setNonCreditorConfirmPopUp(false)}><Typography variant="h5">Cancel</Typography></Button>
                         <Button onClick={() => markAsNonCreditor()}><Typography variant="h5">Confirm</Typography></Button>
                     </DialogActions>
                 </Dialog>

src/pages/Organization/DetailPage/index.js

@@ -61,6 +61,7 @@ const OrganizationDetailPage = () => {
                 HttpUtils.get({
                     url: UrlUtils.GET_ORG_PATH + "/" + params.id,
                     onSuccess: function (response) {
+                        console.log(response)
                         response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.address?.country);
                         response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.address?.district);
                         response.data["addressLine1"] = response.data.addressTemp?.addressLine1;
@@ -81,28 +82,27 @@ const OrganizationDetailPage = () => {
             }
         }
         if(isPrimaryLoggedIn()){
-            if (params.id > 0) {
-                HttpUtils.get({
-                    url: UrlUtils.GET_PUB_ORG_PATH,
-                    onSuccess: function (response) {
-                        response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.address?.country);
-                        response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.address?.district);
-                        response.data["addressLine1"] = response.data.addressTemp?.addressLine1;
-                        response.data["addressLine2"] = response.data.addressTemp?.addressLine2;
-                        response.data["addressLine3"] = response.data.addressTemp?.addressLine3;
-    
-                        response.data["phoneNumber"] = response.data.contactTel?.phoneNumber;
-                        response.data["tel_countryCode"] = response.data.contactTel?.countryCode;
-    
-                        response.data["faxNumber"] = response.data.faxNo?.faxNumber;
-                        response.data["fax_countryCode"] = response.data.faxNo?.countryCode;
-    
-                        response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateStr(response.data.brExpiryDate) : "";
-                        setFormData(response.data)
-                        setList(response.historyList)
-                    }
-                });
-            }
+            HttpUtils.get({
+                url: UrlUtils.GET_PUB_ORG_PATH,
+                onSuccess: function (response) {
+                    console.log(response)
+                    response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.address?.country);
+                    response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.address?.district);
+                    response.data["addressLine1"] = response.data.addressTemp?.addressLine1;
+                    response.data["addressLine2"] = response.data.addressTemp?.addressLine2;
+                    response.data["addressLine3"] = response.data.addressTemp?.addressLine3;
+
+                    response.data["phoneNumber"] = response.data.contactTel?.phoneNumber;
+                    response.data["tel_countryCode"] = response.data.contactTel?.countryCode;
+
+                    response.data["faxNumber"] = response.data.faxNo?.faxNumber;
+                    response.data["fax_countryCode"] = response.data.faxNo?.countryCode;
+
+                    response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateStr(response.data.brExpiryDate) : "";
+                    setFormData(response.data)
+                    setList(response.historyList)
+                }
+            });
         }
     };
 

src/pages/Payment/Card/index.js

@@ -77,7 +77,7 @@ const Index = () => {
             url: paymentPath+loadPaymentUrl+(paymentData.type=="PPS"?"pps":"creditcard"),
             params:{
                 "transactionid": paymentData.transactionid,
-                "apprefid:": paymentData.transactionid,
+                //"apprefid:": paymentData.transactionid,
                 "webtoken": paymentData.webtoken,
                 "paymentmethod":paymentData.paymentMethod,
                 "order": { 

src/pages/Payment/FPS/AckPage.js

@@ -100,7 +100,7 @@ const AckPage = () => {
                     params: {
                         id: localStorage.getItem("paymentId"),
                         transNo: responseData.transactionid,
-                        transDateTime: responseData.paymentdetail.time.replace("[UTC]", ""),
+                        transDateTime: new Date(responseData.paymentdetail.time).toISOString(),
                         egisRefNo: responseData.paymentdetail.paymentid,
                         status: responseData.paymentdetail.result.paymentstatuscode,
                         payload: responseData

src/pages/Payment/FPS/fpscallback.js

@@ -99,7 +99,7 @@ const Fpscallback = () => {
                     params: {
                         id: paymentId,
                         transNo: responseData.transactionid,
-                        transDateTime: responseData.paymentdetail.time.replace("[UTC]", ""),
+                        transDateTime: new Date(responseData.paymentdetail.time).toISOString(),
                         egisRefNo: responseData.paymentdetail.paymentid,
                         status: responseData.paymentdetail.result.paymentstatuscode,
                         payload: responseData

src/pages/Payment/PaymentCallback.js

@@ -122,7 +122,7 @@ const Index = () => {
                             params: {
                                 id: localStorage.getItem("paymentId"),
                                 transNo: responseData.transactionid,
-                                transDateTime: responseData.paymentdetail.time.replace("[UTC]", ""),
+                                transDateTime: new Date(responseData.paymentdetail.time).toISOString(),
                                 egisRefNo: responseData.paymentdetail.paymentid,
                                 status: responseData.paymentdetail.result.paymentstatuscode,
                                 payload: responseData

src/utils/ApiPathConst.js

@@ -29,7 +29,6 @@ export const GET_PUB_ORG_USER_PATH = apiPath+'/user/pubOrg';
 export const POST_PUB_ORG_USER = apiPath+'/user/pubOrg';
 
 export const GET_ORG_PATH = apiPath+'/org';
-export const GET_PUB_ORG_PATH = apiPath+'/org/pub';
 export const GET_ORG_FROM_USER_PATH = apiPath+'/org/from-user';
 export const POST_ORG_SAVE_PATH = apiPath+'/org/save';
 export const GET_ORG_COMBO = apiPath+'/org/combo';
@@ -38,6 +37,12 @@ export const GET_ORG_MARK_AS_CREDITOR = apiPath+'/org/mark-as-creditor';
 export const GET_ORG_MARK_AS_NON_CREDITOR = apiPath+'/org/mark-as-non-creditor';
 export const GET_ORG_EXPORT = apiPath+'/org/export';
 
+//public
+export const GET_PUB_ORG_PATH = apiPath+'/org/pub';
+export const POST_PUB_ORG_SAVE_PATH = apiPath+'/org/pub/save';
+export const GET_PUB_ORG_MARK_AS_CREDITOR = apiPath+'/org/pub/mark-as-creditor';
+export const GET_PUB_ORG_MARK_AS_NON_CREDITOR = apiPath+'/org/pub/mark-as-non-creditor';
+
 export const GET_MSG_DETAILS = apiPath+'/msg/details';
 export const GET_MSG_LIST = apiPath+'/msg/list';
 export const GET_MSG_DESHBOARD = apiPath+'/msg/list/deshboard';