Resolved conflicts
This commit is contained in:
@@ -391,6 +391,16 @@ public class GepafinConstant {
|
||||
public static final String NON_EMPTY_TABLES="nonEmptyTables";
|
||||
public static final String VALIDATION_IN_TABLE = "validation.table.message";
|
||||
public static final String CALL_EXPIRED="call.expired";
|
||||
public static final String PROTOCOL="protocol";
|
||||
public static final String PROTOCOL_NUMBER="protocolNumber";
|
||||
public static final String NOTE="note";
|
||||
public static final String INTERNAL_NOTE="internalNote";
|
||||
public static final String ACTION_TYPE="actionType";
|
||||
public static final String ACTION_CONTEXT="actionContext";
|
||||
public static final String METHOD_TYPE="methodType";
|
||||
|
||||
|
||||
|
||||
public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero";
|
||||
|
||||
|
||||
@@ -424,6 +434,34 @@ public class GepafinConstant {
|
||||
public static final String FORMULA_AMOUNT_NOT_MATCHED="formula.amount.not.matches.requested.amount";
|
||||
public static final String CRITERIA_TABLE_COLUMNS="criteria_table_columns";
|
||||
|
||||
public static final String COMPANY_DOCUMENT_NOT_FOUND = "company.document.not.found";
|
||||
public static final String COMPANY_DOCUMENT_UPDATED_SUCCESSFULLY = "company.document.updated.successfully";
|
||||
public static final String COMPANY_DOCUMENT_COPIED_SUCCESSFULLY = "company.document.copied.successfully";
|
||||
public static final String COMPANY_DOCUMENT_FETCHED_SUCCESSFULLY = "company.document.fetched.successfully";
|
||||
|
||||
public static final String DOCUMENT_CATEGORY_CREATE_SUCCESS = "document.category.success";
|
||||
public static final String DOCUMENT_CATEGORY_GET_SUCCESS = "document.category.get.success";
|
||||
public static final String DOCUMENT_CATEGORY_NOT_FOUND = "document.category.not.found";
|
||||
public static final String DOCUMENT_CATEGORY_DELETE_SUCCESS = "document.category.delete.success";
|
||||
public static final String DOCUMENT_CATEGORY_UPDATE_SUCCESS = "document.category.update.success";
|
||||
public static final String ERROR_MOVING_FILE_TO_DELETED_FOLDER = "error.moving.file.to.deleted.folder";
|
||||
|
||||
public static final String CATEGORY_CANNOT_BE_DELETED = "category.cannot.be.deleted";
|
||||
public static final String INVALID_EXPIRATION_DATE = "invalid.expiration.date";
|
||||
public static final String LABEL="label";
|
||||
public static final String FORMULA="formula";
|
||||
public static final String VARIABLE="variable";
|
||||
public static final String TOTAL="total";
|
||||
public static final String NUMBER_INPUT="numberinput";
|
||||
public static final String CHECK_BOXES="checkboxes";
|
||||
public static final String VALIDATION_FIELD_MAX = "validation.field.max_value";
|
||||
public static final String VALIDATION_FIELD_MIN = "validation.field.min_value";
|
||||
public static final String VALIDATION_FIELD_MAX_CHECK_BOX = "validation.field.max.checkbox";
|
||||
public static final String VALIDATION_FIELD_MIN_CHECK_BOX = "validation.field.min.checkbox";
|
||||
|
||||
|
||||
|
||||
|
||||
public static final String APPOINTMENT_CANNOT_BE_CREATED = "appointment.cannot.be.created";
|
||||
public static final String APPOINTMENT_NOT_CREATED = "appointment.not.created";
|
||||
|
||||
@@ -431,15 +469,22 @@ public class GepafinConstant {
|
||||
public static final String CALL_ID="callId";
|
||||
public static final String CALL_END_DATE="callEndDate";
|
||||
public static final String END_DATE="endDate";
|
||||
public static final String PROTOCOL="protocol";
|
||||
public static final String PROTOCOL_NUMBER="protocolNumber";
|
||||
|
||||
public static final String MODIFIED_DATE="modifiedDate";
|
||||
public static final String CALL_END_TIME="callEndTime";
|
||||
public static final String END_TIME="endTime";
|
||||
public static final String UPDATED_DATE="updatedDate";
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static final String SWITCH="switch";
|
||||
public static final String IS_CHECK_LIST_ITEM="isChecklistItem";
|
||||
public static final String VALIDATION_FAILED_FOR_CHECKLIST="validation.failed.checklist";
|
||||
public static final String PEC_SERVICE_URL="https://ws.pecmassiva.com";
|
||||
public static final String PEC_SERVICE_SEND_MAIL="/send";
|
||||
public static final String PEC_SERVICE_INBOX_MAIL="/quota/inbox";
|
||||
public static final String USAGE="usage";
|
||||
public static final String LIMIT="limit";
|
||||
public static final String DATA="data";
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user