diff --git a/src/pages/EmailTemplate/Detail_GLD/index.js b/src/pages/EmailTemplate/Detail_GLD/index.js index 78cf80f..3471fa6 100644 --- a/src/pages/EmailTemplate/Detail_GLD/index.js +++ b/src/pages/EmailTemplate/Detail_GLD/index.js @@ -129,7 +129,7 @@ const Index = () => { - { navigate("/emailTemplate") }}> + { navigate(-1) }}> diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js index 64f8e92..7e0d8c5 100644 --- a/src/pages/Organization/DetailPage/index.js +++ b/src/pages/Organization/DetailPage/index.js @@ -126,7 +126,7 @@ const OrganizationDetailPage = () => { isLoading ? : - + @@ -143,7 +143,7 @@ const OrganizationDetailPage = () => { - { navigate("/org") }}> + { navigate(-1)}}> diff --git a/src/pages/Organization/SearchPage/OrganizationSearchForm.js b/src/pages/Organization/SearchPage/OrganizationSearchForm.js index 93295a4..c29e940 100644 --- a/src/pages/Organization/SearchPage/OrganizationSearchForm.js +++ b/src/pages/Organization/SearchPage/OrganizationSearchForm.js @@ -1,6 +1,6 @@ // material-ui import { - CButton, + Button, Grid, TextField, Typography, Autocomplete, diff --git a/src/pages/Payment/Details_Public/index.js b/src/pages/Payment/Details_Public/index.js index f6cd8b3..fa0960c 100644 --- a/src/pages/Payment/Details_Public/index.js +++ b/src/pages/Payment/Details_Public/index.js @@ -19,7 +19,7 @@ const PaymentDetails = Loadable(React.lazy(() => import('./PaymentDetails'))); const DataGrid = Loadable(React.lazy(() => import('./DataGrid'))); import ForwardIcon from '@mui/icons-material/Forward'; import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' -import {FormattedMessage} from "react-intl"; +import {FormattedMessage,useIntl} from "react-intl"; const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', @@ -101,7 +101,7 @@ const Index = () => { - + { isLoading ? : - + @@ -139,7 +139,7 @@ const UserMaintainPage_Individual = () => { { navigate("/indUser") }} + variant="outlined" onClick={() => { navigate(-1) }} > diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js index 0831cb9..023a69c 100644 --- a/src/pages/User/DetailsPage_Organization/index.js +++ b/src/pages/User/DetailsPage_Organization/index.js @@ -181,7 +181,7 @@ const UserMaintainPage_Organization = () => { isLoading ? : - + @@ -198,7 +198,7 @@ const UserMaintainPage_Organization = () => { - { navigate("/orgUser") }}> + { navigate(-1) }}> diff --git a/src/themes/buttonConst.js b/src/themes/buttonConst.js index 49df81a..7d74ea4 100644 --- a/src/themes/buttonConst.js +++ b/src/themes/buttonConst.js @@ -42,6 +42,10 @@ export const PNSPS_BUTTON_THEME = createTheme({ exportExcel:{ main: '#6A8B9E', contrastText: '#FFFFFF', + }, + success:{ + main: '#6A8B9E', + contrastText: '#FFFFFF', } }, components: {