diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js
index 72d521a..bdb4c56 100644
--- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js
@@ -141,6 +141,7 @@ const BusCustomFormWizard = (props) => {
data.address1 !==""&&
data.email !==""&&
data.emailConfirm !==""&&
+ data.email == data.emailConfirm&&
data.phone !==""&&
data.phoneCountryCode !==""&&
termsAndConAccept == true&&
@@ -389,13 +390,12 @@ const BusCustomFormWizard = (props) => {
}
function handleEmail(email) {
- var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
- // var result = reg.test(email);
- var result = email.match(validRegex);
- if (result == false) {
+ var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+ if (!email.match(validRegex)) {
return false;
+ }else{
+ return true;
}
- return true;
}
const formik = useFormik({
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js
index b0d3895..452dda1 100644
--- a/src/pages/authentication/auth-forms/CustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/CustomFormWizard.js
@@ -136,6 +136,7 @@ const CustomFormWizard = (props) => {
data.address1 !==""&&
data.email !==""&&
data.emailConfirm !==""&&
+ data.email == data.emailConfirm&&
data.phone !==""&&
data.phoneCountryCode !==""&&
termsAndConAccept == true&&
@@ -409,13 +410,11 @@ const CustomFormWizard = (props) => {
function handleEmail(email) {
var validRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
- // var result = reg.test(email);
- var result = email.match(validRegex);
- if (result == false) {
+ if (!email.match(validRegex)) {
return false;
+ }else{
+ return true;
}
- console.log("email true")
- return true;
}
const formik = useFormik({
diff --git a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
index 3958686..3c9803e 100644
--- a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
@@ -58,31 +58,31 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
}),
onSubmit: (values) => {
HttpUtils.post({
- url: UrlUtils.POST_IND_USER + "/" + userData.id,
+ url: UrlUtils.POST_ORG_USER + "/" + userData.id,
params: {
contactTel: {
countryCode: values.tel_countryCode,
phoneNumber: values.phoneNumber
},
- faxNo: {
- countryCode: values.fax_countryCode,
- faxNumber: values.faxNumber
- },
- addressBus: {
- country: values.country,
- district: values.district,
- addressLine1: values.addressLine1,
- addressLine2: values.addressLine2,
- addressLine3: values.addressLine3,
- },
+ // faxNo: {
+ // countryCode: values.fax_countryCode,
+ // faxNumber: values.faxNumber
+ // },
+ // addressBus: {
+ // country: values.country,
+ // district: values.district,
+ // addressLine1: values.addressLine1,
+ // addressLine2: values.addressLine2,
+ // addressLine3: values.addressLine3,
+ // },
identification: values.identification,
emailBus: values.emailBus,
contactPerson: values.contactPerson,
- enCompanyName: values.enCompanyName,
- chCompanyName: values.chCompanyName,
+ // enCompanyName: values.enCompanyName,
+ // chCompanyName: values.chCompanyName,
orgId: values.orgId,
- brNo: values.brNo,
- brExpiryDate: values.brExpiryDate,
+ // brNo: values.brNo,
+ // brExpiryDate: values.brExpiryDate,
},
onSuccess: function () {
@@ -307,7 +307,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
);
return displayOptions;
},
- getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? item["brNo"] + "-" + item["enCompanyName"] : "") : "",
+ getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? item["brNo"] + "-" + item["enCompanyName"]: "") : "",
isOptionEqualToValue: (option, newValue, setValue, setInputValue) => {
if (option.id == newValue) {
setValue(option);
@@ -463,13 +463,16 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
Organization
-
-
-
+ {currentUserData.orgId==null?
+
+
+
+ :null
+ }
@@ -477,7 +480,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{FieldUtils.getTextField({
label: "Org.Name (English):",
valueName: "enCompanyName",
- disabled: (!editMode),
+ disabled: true,
form: formik
})}
@@ -486,7 +489,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{FieldUtils.getTextField({
label: "Org.Name (Chinese):",
valueName: "chCompanyName",
- disabled: (!editMode),
+ disabled: true,
form: formik
})}
@@ -495,7 +498,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{FieldUtils.getTextField({
label: "BR No.:",
valueName: "brNo",
- disabled: (!editMode),
+ disabled: true,
form: formik
})}
@@ -505,7 +508,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
label: "Country:",
valueName: "country",
dataList: ComboData.country,
- disabled: (!editMode),
+ disabled: true,
form: formik
})}
@@ -517,7 +520,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
code: "fax_countryCode",
num: "faxNumber"
},
- disabled: (!editMode),
+ disabled: true,
form: formik
})}
@@ -526,7 +529,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{FieldUtils.getDateField({
label: "BR Expiry Date.:",
valueName: "brExpiryDate",
- disabled: (!editMode),
+ disabled: true,
form: formik
})}
@@ -535,7 +538,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
{FieldUtils.getAddressField({
label: "Address:",
valueName: ["addressLine1", "addressLine2", "addressLine3"],
- disabled: (!editMode),
+ disabled: true,
form: formik
})}
@@ -545,7 +548,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
label: "District:",
valueName: "district",
dataList: ComboData.district,
- disabled: (!editMode),
+ disabled: true,
form: formik
})}
diff --git a/src/pages/pnspsUserDetailPage_Organization/index.js b/src/pages/pnspsUserDetailPage_Organization/index.js
index a03c6b6..0adfcf7 100644
--- a/src/pages/pnspsUserDetailPage_Organization/index.js
+++ b/src/pages/pnspsUserDetailPage_Organization/index.js
@@ -27,7 +27,7 @@ const UserMaintainPage_Organization = () => {
useEffect(()=>{
- console.log(userData);
+ // console.log(userData);
loadData();
},[]);
@@ -40,9 +40,24 @@ const UserMaintainPage_Organization = () => {
HttpUtils.get({
url: `${UrlUtils.GET_ORG_USER_PATH}/${params.id}`,
onSuccess: function(response){
- response.data["addressBus"] = JSON.parse(response.data["addressBus"]);
- response.data["contactTel"] = JSON.parse(response.data["contactTel"]);
- response.data["faxNo"] = JSON.parse(response.data["faxNo"]);
+ console.log(response)
+ if(response.data.orgId !=null){
+ response.data["addressBus"] = response.orgDetail.data["addressTemp"];
+ response.data["contactTel"] = response.orgDetail.data["contactTel"];
+ response.data["faxNo"] = response.orgDetail.data["faxNo"];
+
+ response.data["brExpiryDate"] = response.orgDetail.data.brExpiryDate?DateUtils.dateStr(response.orgDetail.data.brExpiryDate):"";
+ response.data["brNo"] = response.orgDetail.data.brNo;
+ response.data["enCompanyName"] = response.orgDetail.data.enCompanyName;
+ response.data["chCompanyName"] = response.orgDetail.data.chCompanyName;
+ response.data["chCompanyName"] = response.orgDetail.data.chCompanyName;
+ }else{
+ response.data["addressBus"] = JSON.parse(response.data["addressBus"]);
+ response.data["contactTel"] = JSON.parse(response.data["contactTel"]);
+ response.data["faxNo"] = JSON.parse(response.data["faxNo"]);
+
+ response.data["brExpiryDate"] = response.data.brExpiryDate?DateUtils.dateStr(response.data.brExpiryDate):"";
+ }
let createDate = DateUtils.datetimeStr(response.data.created);
let modifiedBy = DateUtils.datetimeStr(response.data.modified)+", "+response.data.modifiedBy;
@@ -64,10 +79,9 @@ const UserMaintainPage_Organization = () => {
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):"";
-
//response.data["orgId"] = response.data.brExpiryDate?DateUtils.dateStr(response.data.brExpiryDate):"";
-
+
+
setUserData(response.data);
setOrgData(response.orgList);
}
diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js
index c9da639..3418085 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -20,6 +20,7 @@ export const GET_IND_USER_VERIFY = apiPath+'/user/verify';
export const POST_IND_USER = apiPath+'/user/ind';
export const GET_ORG_USER_PATH = apiPath+'/user/org';
+export const POST_ORG_USER = apiPath+'/user/org';
export const GET_ORG_PATH = apiPath+'/org';
export const GET_ORG_FROM_USER_PATH = apiPath+'/org/from-user';