|
@@ -112,7 +112,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { |
|
|
validationSchema: yup.object().shape({ |
|
|
validationSchema: yup.object().shape({ |
|
|
enCompanyName: yup.string().max(255, getMaxErrStr(255)).required(displayErrorMsg(intl.formatMessage({ id: 'userRequireEnglishName' }))), |
|
|
enCompanyName: yup.string().max(255, getMaxErrStr(255)).required(displayErrorMsg(intl.formatMessage({ id: 'userRequireEnglishName' }))), |
|
|
chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'userRequireChineseName' }))).nullable(), |
|
|
chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'userRequireChineseName' }))).nullable(), |
|
|
orgShortName: yup.string().max(24, getMaxErrStr(24)).required(getRequiredErrStr("Please enter ORG Short Name")), |
|
|
|
|
|
|
|
|
orgShortName: yup.string().max(24, getMaxErrStr(24)).required(getRequiredErrStr("Org. Short Name")), |
|
|
addressLine1: yup.string().max(40, getMaxErrStr(40)).required(displayErrorMsg(intl.formatMessage({ id: 'validateAddressLine1' }))), |
|
|
addressLine1: yup.string().max(40, getMaxErrStr(40)).required(displayErrorMsg(intl.formatMessage({ id: 'validateAddressLine1' }))), |
|
|
addressLine2: yup.string().max(40, getMaxErrStr(40)), |
|
|
addressLine2: yup.string().max(40, getMaxErrStr(40)), |
|
|
addressLine3: yup.string().max(40, getMaxErrStr(40)), |
|
|
addressLine3: yup.string().max(40, getMaxErrStr(40)), |
|
@@ -216,16 +216,16 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { |
|
|
let sentOrgShortName = ""; |
|
|
let sentOrgShortName = ""; |
|
|
if(data.orgShortName!=null && data.orgShortName!=""){ |
|
|
if(data.orgShortName!=null && data.orgShortName!=""){ |
|
|
sentOrgShortName = data.orgShortName |
|
|
sentOrgShortName = data.orgShortName |
|
|
if (sentOrgShortName.length <=12){ |
|
|
|
|
|
|
|
|
if (sentOrgShortName.length <=24){ |
|
|
const temp = { |
|
|
const temp = { |
|
|
orgShortName: sentOrgShortName, |
|
|
orgShortName: sentOrgShortName, |
|
|
}; |
|
|
}; |
|
|
markAsCreditor(temp); |
|
|
markAsCreditor(temp); |
|
|
}else{ |
|
|
}else{ |
|
|
alert("ORG Short Name Must not exceed 12 characters.") |
|
|
|
|
|
|
|
|
alert("Organisation Short Name must not exceed 24 characters.") |
|
|
} |
|
|
} |
|
|
}else{ |
|
|
}else{ |
|
|
alert("Please enter ORG Short Name.") |
|
|
|
|
|
|
|
|
alert("Please enter Organisation Short Name for Demand Note.") |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
}; |
|
|
}; |
|
@@ -505,7 +505,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { |
|
|
currentUserData.creditor ? |
|
|
currentUserData.creditor ? |
|
|
<Grid item xs={12} lg={4} > |
|
|
<Grid item xs={12} lg={4} > |
|
|
{FieldUtils.getTextField({ |
|
|
{FieldUtils.getTextField({ |
|
|
label: FieldUtils.notNullFieldLabel("Org Short Name:"), |
|
|
|
|
|
|
|
|
label: FieldUtils.notNullFieldLabel("Org. Short Name:"), |
|
|
valueName: "orgShortName", |
|
|
valueName: "orgShortName", |
|
|
disabled: (!editMode && !createMode), |
|
|
disabled: (!editMode && !createMode), |
|
|
form: formik |
|
|
form: formik |
|
@@ -550,7 +550,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { |
|
|
<Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Credit Client?</Typography> |
|
|
<Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Credit Client?</Typography> |
|
|
</Grid> |
|
|
</Grid> |
|
|
<Grid item> |
|
|
<Grid item> |
|
|
<Typography variant="h6" style={{ padding: '16px' }}>Please Enter ORG Short Name for Credit Client</Typography> |
|
|
|
|
|
|
|
|
<Typography variant="h6" style={{ padding: '16px' }}>Please Enter Organisation Short Name for Credit Client (Used for Demand Note)</Typography> |
|
|
</Grid> |
|
|
</Grid> |
|
|
<Grid item> |
|
|
<Grid item> |
|
|
<TextField |
|
|
<TextField |
|
@@ -558,7 +558,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { |
|
|
style={{ padding: '16px' }} |
|
|
style={{ padding: '16px' }} |
|
|
{...register("orgShortName")} |
|
|
{...register("orgShortName")} |
|
|
id='orgShortName' |
|
|
id='orgShortName' |
|
|
label="ORG Short Form" |
|
|
|
|
|
|
|
|
label="Organisation Short Name" |
|
|
defaultValue={currentUserData.orgShortName} |
|
|
defaultValue={currentUserData.orgShortName} |
|
|
InputLabelProps={{ |
|
|
InputLabelProps={{ |
|
|
shrink: true |
|
|
shrink: true |
|
|