2 changed files with 17 additions and 15 deletions
Unified View
Diff Options
+ 7
- 7
src/layout/MainLayout/Header/index.js
View File
| @@ -407,25 +407,25 @@ function Header(props) { | |||||
| </Link> | </Link> | ||||
| </li> | </li> | ||||
| <li> | <li> | ||||
| <Link className="manageUser" to={'/orgUser'}> | |||||
| <Link className="manageUser" to={'/org'}> | |||||
| <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | ||||
| {/* <FormattedMessage id="companyOrUserRecord" /> */} | {/* <FormattedMessage id="companyOrUserRecord" /> */} | ||||
| <FormattedMessage id="userProfile" /> | |||||
| <FormattedMessage id="organizationProfile" /> | |||||
| </Typography> | </Typography> | ||||
| </Link> | </Link> | ||||
| </li> | </li> | ||||
| <li> | <li> | ||||
| <Link className="manageUser" to={'/user/changePassword'}> | |||||
| <Link className="manageUser" to={'/orgUser'}> | |||||
| <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | ||||
| <FormattedMessage id="userChangePassword" /> | |||||
| {/* <FormattedMessage id="companyOrUserRecord" /> */} | |||||
| <FormattedMessage id="userProfile" /> | |||||
| </Typography> | </Typography> | ||||
| </Link> | </Link> | ||||
| </li> | </li> | ||||
| <li> | <li> | ||||
| <Link className="manageUser" to={'/org'}> | |||||
| <Link className="manageUser" to={'/user/changePassword'}> | |||||
| <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | <Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}> | ||||
| {/* <FormattedMessage id="companyOrUserRecord" /> */} | |||||
| <FormattedMessage id="organizationProfile" /> | |||||
| <FormattedMessage id="userChangePassword" /> | |||||
| </Typography> | </Typography> | ||||
| </Link> | </Link> | ||||
| </li> | </li> | ||||
+ 10
- 8
src/pages/Payment/FPS/FPS.js
View File
| @@ -70,14 +70,16 @@ const Index = () => { | |||||
| if(Object.keys(location.state).length > 0){ | if(Object.keys(location.state).length > 0){ | ||||
| // console.log (location.state) | // console.log (location.state) | ||||
| setLocationData(location.state) | setLocationData(location.state) | ||||
| if (/Android|webOS|iPhone|iPad|iPod|Opera Mini/i.test(navigator.userAgent)) { | |||||
| console.log('Mobile web browser'); | |||||
| setBrowserType(mobileBrowser) | |||||
| // setFpsqrcodeurl(openPASGUrl) | |||||
| } else { | |||||
| console.log('Desktop web browser'); | |||||
| setBrowserType(desktopBrowser) | |||||
| } | |||||
| setBrowserType(desktopBrowser) | |||||
| // if (/Android|webOS|iPhone|iPad|iPod|Opera Mini/i.test(navigator.userAgent)) { | |||||
| // // console.log('Mobile web browser'); | |||||
| // setBrowserType(mobileBrowser) | |||||
| // // setFpsqrcodeurl(openPASGUrl) | |||||
| // } else { | |||||
| // // console.log('Desktop web browser'); | |||||
| // setBrowserType(desktopBrowser) | |||||
| // } | |||||
| } | } | ||||
| }, []); | }, []); | ||||