jason.lam
1 year ago
3 changed files with 15 additions and 7 deletions
Unified View
Diff Options
-
+2 -2src/pages/authentication/auth-forms/BusCustomFormWizard.js
-
+4 -2src/pages/authentication/auth-forms/CustomFormWizard.js
-
+9 -3src/pages/authentication/auth-forms/IAmSmartFormWizard.js
+ 2
- 2
src/pages/authentication/auth-forms/BusCustomFormWizard.js
View File
| @@ -1536,13 +1536,13 @@ const BusCustomFormWizard = (props) => { | |||||
| {formik.values.address3} | {formik.values.address3} | ||||
| </Typography> | </Typography> | ||||
| : null} | : null} | ||||
| {selectedAddress5.label === "hongKong" ? | |||||
| {selectedAddress5.type === "hongKong" ? | |||||
| <Stack direction="row"> | <Stack direction="row"> | ||||
| <Typography variant="pnspsFormHeader" color={theme.palette.grey[600]} id="preview-address4-signup"> | <Typography variant="pnspsFormHeader" color={theme.palette.grey[600]} id="preview-address4-signup"> | ||||
| <FormattedMessage id="region"/>: | <FormattedMessage id="region"/>: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="pnspsFormHeader"> | <Typography variant="pnspsFormHeader"> | ||||
| {selectedAddress4} | |||||
| {!selectedAddress4? "" : intl.formatMessage({id: selectedAddress4.type})} | |||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| : null} | : null} | ||||
+ 4
- 2
src/pages/authentication/auth-forms/CustomFormWizard.js
View File
| @@ -1713,7 +1713,9 @@ const CustomFormWizard = (props) => { | |||||
| <Typography variant="pnspsFormHeader" color={theme.palette.grey[600]} id="preview-address4-signup"> | <Typography variant="pnspsFormHeader" color={theme.palette.grey[600]} id="preview-address4-signup"> | ||||
| <FormattedMessage id="region"/>: | <FormattedMessage id="region"/>: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="pnspsFormHeader">{selectedAddress4}</Typography> | |||||
| <Typography variant="pnspsFormHeader"> | |||||
| {!selectedAddress4? "" : intl.formatMessage({id: selectedAddress4.type})} | |||||
| </Typography> | |||||
| </Stack> | </Stack> | ||||
| : null} | : null} | ||||
| <Stack direction="row"> | <Stack direction="row"> | ||||
| @@ -1721,7 +1723,7 @@ const CustomFormWizard = (props) => { | |||||
| <FormattedMessage id="regionOrCountry"/>: | <FormattedMessage id="regionOrCountry"/>: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="pnspsFormHeader"> | <Typography variant="pnspsFormHeader"> | ||||
| {intl.formatMessage({id: selectedAddress5.label})} | |||||
| {intl.formatMessage({id: selectedAddress5.type})} | |||||
| </Typography> | </Typography> | ||||
| </Stack> | </Stack> | ||||
| </Stack> | </Stack> | ||||
+ 9
- 3
src/pages/authentication/auth-forms/IAmSmartFormWizard.js
View File
| @@ -507,6 +507,7 @@ const CustomFormWizard = (props) => { | |||||
| value={selectedAddress4} | value={selectedAddress4} | ||||
| options={address4ComboList} | options={address4ComboList} | ||||
| disabled={checkCountry} | disabled={checkCountry} | ||||
| getOptionLabel={(option) => option.type? intl.formatMessage({ id: option.type }) : ""} | |||||
| onChange={(event, newValue) => { | onChange={(event, newValue) => { | ||||
| setSelectedAddress4(newValue); | setSelectedAddress4(newValue); | ||||
| }} | }} | ||||
| @@ -519,6 +520,7 @@ const CustomFormWizard = (props) => { | |||||
| id="address5-combo" | id="address5-combo" | ||||
| value={selectedAddress5} | value={selectedAddress5} | ||||
| options={address5ComboList} | options={address5ComboList} | ||||
| getOptionLabel={(option) => option.type? intl.formatMessage({ id: option.type }) : ""} | |||||
| onChange={(event, newValue) => { | onChange={(event, newValue) => { | ||||
| if (newValue !== null) { | if (newValue !== null) { | ||||
| setSelectedAddress5(newValue); | setSelectedAddress5(newValue); | ||||
| @@ -959,19 +961,23 @@ const CustomFormWizard = (props) => { | |||||
| {formik.values.address3} | {formik.values.address3} | ||||
| </Typography> | </Typography> | ||||
| : null} | : null} | ||||
| {selectedAddress5 == ("香港") ? | |||||
| {selectedAddress5.type === "hongKong" ? | |||||
| <Stack direction="row"> | <Stack direction="row"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]} id="preview-address4-signup"> | <Typography variant="h5" color={theme.palette.grey[600]} id="preview-address4-signup"> | ||||
| <FormattedMessage id="region"/>: | <FormattedMessage id="region"/>: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5">{selectedAddress4}</Typography> | |||||
| <Typography variant="h5"> | |||||
| {!selectedAddress4? "" : intl.formatMessage({id: selectedAddress4.type})} | |||||
| </Typography> | |||||
| </Stack> | </Stack> | ||||
| : null} | : null} | ||||
| <Stack direction="row"> | <Stack direction="row"> | ||||
| <Typography variant="h5" color={theme.palette.grey[600]} id="preview-address5-signup"> | <Typography variant="h5" color={theme.palette.grey[600]} id="preview-address5-signup"> | ||||
| <FormattedMessage id="regionOrCountry"/>: | <FormattedMessage id="regionOrCountry"/>: | ||||
| </Typography> | </Typography> | ||||
| <Typography variant="h5">{selectedAddress5}</Typography> | |||||
| <Typography variant="h5"> | |||||
| {intl.formatMessage({id: selectedAddress5.type})} | |||||
| </Typography> | |||||
| </Stack> | </Stack> | ||||
| </Stack> | </Stack> | ||||
| </Stack> | </Stack> | ||||