From 5ba08139db2b2f7176adb518691ab84ad3c90c0b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 27 Mar 2024 23:27:20 +0800 Subject: [PATCH] update org --- .../Organization/DetailPage/OrganizationCard.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index 8bc742a..6146a11 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -112,7 +112,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { validationSchema: yup.object().shape({ enCompanyName: yup.string().max(255, getMaxErrStr(255)).required(displayErrorMsg(intl.formatMessage({ id: 'userRequireEnglishName' }))), 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' }))), addressLine2: 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 = ""; if(data.orgShortName!=null && data.orgShortName!=""){ sentOrgShortName = data.orgShortName - if (sentOrgShortName.length <=12){ + if (sentOrgShortName.length <=24){ const temp = { orgShortName: sentOrgShortName, }; markAsCreditor(temp); }else{ - alert("ORG Short Name Must not exceed 12 characters.") + alert("Organisation Short Name must not exceed 24 characters.") } }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 ? {FieldUtils.getTextField({ - label: FieldUtils.notNullFieldLabel("Org Short Name:"), + label: FieldUtils.notNullFieldLabel("Org. Short Name:"), valueName: "orgShortName", disabled: (!editMode && !createMode), form: formik @@ -550,7 +550,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { Are you sure mark as Credit Client? - Please Enter ORG Short Name for Credit Client + Please Enter Organisation Short Name for Credit Client (Used for Demand Note) { style={{ padding: '16px' }} {...register("orgShortName")} id='orgShortName' - label="ORG Short Form" + label="Organisation Short Name" defaultValue={currentUserData.orgShortName} InputLabelProps={{ shrink: true