Merge pull request #1267 from khoahp/rc-1.8-issues-fix

Rc 1.8 issues fix

.gitignore

@@ -37,7 +37,7 @@ ivy-settings.xml
 ivy.xml
 ivy.xml.MD5
 layouttpl/
-lib/
+lib/*
 misc/
 modules/
 osgi/
@@ -74,7 +74,6 @@ portlets/opencps-portlet/docroot/WEB-INF/.gitignore
 portlets/opencps-portlet/docroot/WEB-INF/classes/
 portlets/opencps-portlet/docroot/WEB-INF/service/
 portlets/opencps-portlet/docroot/WEB-INF/sql/
-portlets/opencps-portlet/docroot/WEB-INF/lib/
 portlets/opencps-portlet/docroot/css/.sass-cache/
 portlets/opencps-portlet/docroot/WEB-INF/src/META-INF
 portlets/opencps-portlet/docroot/WEB-INF/src/service.properties

hooks/opencps-hook/docroot/WEB-INF/src/content/Language_vi.properties

@@ -1142,4 +1142,29 @@ error-cus = L\u1ed7i x\u1eed l\u00fd
 denied-cus = \u0110\u00e3 t\u1eeb ch\u1ed1i	
 canceled-cus = \u0110\u00e3 h\u1ee7y h\u1ed3 s\u01a1
 please-add-note-before-send = H\u00e3y nh\u1eadp \u00fd ki\u1ebfn tr\u01b0\u1edbc khi chuy\u1ec3n b\u01b0\u1edbc 
-has-sign = K\u00fd s\u1ed1 
+has-sign = K\u00fd s\u1ed1
+## Language 28
+101=H\u1ed3 s\u01a1 m\u1edbi g\u1eedi ch\u1edd ti\u1ebfp nh\u1eadn
+102=H\u1ed3 s\u01a1 \u0111\u01b0\u1ee3c b\u1ed5 sung th\u00eam t\u00e0i li\u1ec7u
+103=H\u1ed3 s\u01a1 nh\u1eadn th\u00f4ng b\u00e1o thanh to\u00e1n m\u1edbi
+104=H\u1ed3 s\u01a1 c\u00f3 y\u00eau c\u1ea7u \u0111\u01b0\u1ee3c r\u00fat
+105=H\u1ed3 s\u01a1 c\u00f3 th\u00f4ng b\u00e1o l\u1ed7i k\u1ebft qu\u1ea3 tr\u1ea3 v\u1ec1
+106=H\u1ed3 s\u01a1 chuy\u1ec3n t\u1edbi c\u00e1n b\u1ed9 x\u1eed l\u00fd
+107=H\u1ed3 s\u01a1 s\u1eafp h\u1ebft h\u1ea1n x\u1eed l\u00fd
+108=H\u1ed3 s\u01a1 \u0111\u00e3 qu\u00e1 h\u1ea1n x\u1eed l\u00fd
+109=H\u1ed3 s\u01a1 c\u1ea7n tr\u1ea3 k\u1ebft qu\u1ea3 b\u1edfi b\u1ed9 ph\u1eadn m\u1ed9t c\u1eeda
+110=H\u1ed3 s\u01a1 c\u00f3 phi\u1ebfu thanh to\u00e1n \u0111\u00e3 ho\u00e0n th\u00e0nh
+
+201=H\u1ed3 s\u01a1 \u0111\u00e3 g\u1eedi ch\u1edd ti\u1ebfp nh\u1eadn
+202=H\u1ed3 s\u01a1 \u0111\u00e3 \u0111\u01b0\u1ee3c ti\u1ebfp nh\u1eadn x\u1eed l\u00fd
+203=H\u1ed3 s\u01a1 b\u1ecb t\u1eeb ch\u1ed1i ti\u1ebfp nh\u1eadn
+204=H\u1ed3 s\u01a1 c\u00f3 y\u00eau c\u1ea7u b\u1ed5 sung
+205=H\u1ed3 s\u01a1 c\u00f3 y\u00eau c\u1ea7u thanh to\u00e1n
+206=H\u1ed3 s\u01a1 \u0111\u00e3 ho\u00e0n th\u00e0nh x\u1eed l\u00fd
+207=H\u1ed3 s\u01a1 \u0111\u00e3 \u0111\u01b0\u1ee3c tr\u1ea3 k\u1ebft qu\u1ea3
+208=H\u1ed3 s\u01a1 \u0111\u01b0\u1ee3c ch\u1ea5p thu\u1eadn r\u00fat
+209=H\u1ed3 s\u01a1 \u0111\u01b0\u1ee3c x\u1eed l\u00fd c\u1ea5p l\u1ea1i k\u1ebft qu\u1ea3
+210=H\u1ed3 s\u01a1 c\u00f3 phi\u1ebfu thanh to\u00e1n \u0111\u00e3 ho\u00e0n th\u00e0nh
+
+301=H\u1ed3 s\u01a1 b\u1ecb l\u1ed7i x\u1eed l\u00fd
+302=H\u1ed3 s\u01a1 b\u1ecb delay trong h\u1ec7 th\u1ed1ng 

portlets/opencps-portlet/docroot/html/portlets/accountmgt/registration/businessregistration-ux.jsp

@@ -55,6 +55,8 @@
 		business = (Business) request.getAttribute(WebKeys.BUSINESS_ENTRY);
 	}
 
+	System.out.println("businessregistration-ux.jsp");
+
 	long businessId = business!=null ? business.getBusinessId() : 0L;
 	
 	DictCollection dictCollectionDomain = null;
@@ -239,6 +241,9 @@
 						name="<%=BusinessDisplayTerms.BUSINESS_NAME %>" 
 						cssClass="input100" 
 						placeholder="business-full-name"
+						maxLength="255"
+						type="text"
+						label=""
 					>
 						<aui:validator name="required" />
 						<aui:validator name="maxLength">255</aui:validator>
@@ -249,7 +254,10 @@
 					<aui:input 
 						name="<%=BusinessDisplayTerms.BUSINESS_IDNUMBER %>" 
 						cssClass="input100"
-						placeholder="<%=BusinessDisplayTerms.BUSINESS_IDNUMBER %>"	
+						placeholder="<%=BusinessDisplayTerms.BUSINESS_IDNUMBER %>"
+						maxLength="100"
+						type="text"
+						label=""	
 					>
 						<aui:validator name="required" />
 						<aui:validator name="maxLength">100</aui:validator>
@@ -261,6 +269,9 @@
 						name="<%= BusinessDisplayTerms.BUSINESS_ENNAME %>" 
 						cssClass="input100"
 						placeholder="<%=BusinessDisplayTerms.BUSINESS_ENNAME %>"
+						maxLength="255"
+						type="text"
+						label=""
 					>
 						<aui:validator name="maxLength">255</aui:validator>
 					</aui:input>
@@ -271,6 +282,9 @@
 						name="<%=BusinessDisplayTerms.BUSINESS_SHORTNAME %>" 
 						cssClass="input100"
 						placeholder="<%=BusinessDisplayTerms.BUSINESS_SHORTNAME %>"
+						maxLength="100"
+						type="text"
+						label=""
 					>
 						<aui:validator name="maxLength">100</aui:validator>
 					</aui:input>
@@ -281,6 +295,9 @@
 						cssClass="input100"
 						name="<%=BusinessDisplayTerms.BUSINESS_EMAIL %>"
 						placeholder="<%=BusinessDisplayTerms.BUSINESS_EMAIL %>"
+						maxLength="255"
+						type="text"
+						label=""
 					>
 						<aui:validator name="required" />
 						<aui:validator name="email" />
@@ -293,6 +310,9 @@
 						name="<%=BusinessDisplayTerms.BUSINESS_TELNO %>" 
 						cssClass="input100"
 						placeholder="<%=BusinessDisplayTerms.BUSINESS_TELNO %>"
+						maxLength="20"
+						type="text"
+						label=""
 					>
 						<aui:validator name="maxLength">20</aui:validator>
 					</aui:input>
@@ -333,6 +353,9 @@
 						name="<%=BusinessDisplayTerms.BUSINESS_ADDRESS %>" 
 						cssClass="input100"
 						placeholder="address-place-holder"
+						maxLength="500"
+						type="text"
+						label=""
 					>
 						<aui:validator name="required" />
 						<aui:validator name="maxLength">500</aui:validator>
@@ -402,6 +425,9 @@
 						name="<%=BusinessDisplayTerms.BUSINESS_REPRESENTATIVENAME %>" 
 						cssClass="input100"
 						placeholder="<%=BusinessDisplayTerms.BUSINESS_REPRESENTATIVENAME %>"
+						maxLength="255"
+						type="text"
+						label=""
 						>
 						<aui:validator name="maxLength">255</aui:validator>
 					</aui:input>
@@ -412,6 +438,9 @@
 						name="<%=BusinessDisplayTerms.BUSINESS_REPRESENTATIVEROLE %>" 
 						cssClass="input100"
 						placeholder="<%=BusinessDisplayTerms.BUSINESS_REPRESENTATIVEROLE %>"
+						maxLength="100"
+						type="text"
+						label=""
 						>
 						<aui:validator name="maxLength">100</aui:validator>
 					</aui:input>

portlets/opencps-portlet/docroot/html/portlets/accountmgt/registration/citizenregistration-ux.jsp

@@ -213,6 +213,9 @@
 	 					name="<%=CitizenDisplayTerms.CITIZEN_FULLNAME %>" 
 	 					cssClass="input100"
 	 					placeholder="citizen-full-name-require"
+	 					maxLength="255"
+						type="text"
+						label=""
 	 				>
 		 				<aui:validator name="required" />
 		 				<aui:validator name="maxLength">255</aui:validator>
@@ -224,6 +227,9 @@
 						name="<%=CitizenDisplayTerms.CITIZEN_EMAIL %>"
 						cssClass="input100"
 						placeholder="email-require"
+						maxLength="255"
+						type="text"
+						label=""
 					>
 						<aui:validator name="required" />
 						<aui:validator name="email" />
@@ -236,12 +242,24 @@
 	 					name="<%=CitizenDisplayTerms.CITIZEN_PERSONALID %>"
 	 					cssClass="input100"
 	 					placeholder="<%=CitizenDisplayTerms.CITIZEN_PERSONALID %>"
-	 				/>
+	 					maxLength="75"
+						type="text"
+						label=""
+	 				>
+						<aui:validator name="maxLength">75</aui:validator>	
+	 				</aui:input>
 				</aui:row>
 
 				<aui:row>
 					<div id = "<portlet:namespace/>def">
-					<aui:input name="<%=CitizenDisplayTerms.CITIZEN_TELNO %>" cssClass="input100" placeholder="<%=CitizenDisplayTerms.CITIZEN_TELNO %>" />
+					<aui:input name="<%=CitizenDisplayTerms.CITIZEN_TELNO %>" 
+						cssClass="input100" 
+						placeholder="<%=CitizenDisplayTerms.CITIZEN_TELNO %>" 
+						maxLength="20"
+						type="text"
+						label="">
+						<aui:validator name="maxLength">20</aui:validator>	
+					</aui:input>
 					</div>
 					<div  id="<portlet:namespace/>defErr" style="text-align: left; color: #b50303; margin-left:7px; margin-bottom: 10px; display: none;">
 						<liferay-ui:message key="Error_TelNo_message"/>
@@ -332,8 +350,11 @@
 						name="<%=CitizenDisplayTerms.CITIZEN_ADDRESS %>" 
 						cssClass="input100"
 						placeholder="address-place-holder"
+						maxLength="500"
+						type="text"
+						label=""
 					>
-						<aui:validator name="maxLength">255</aui:validator>
+						<aui:validator name="maxLength">500</aui:validator>
 						<aui:validator name="required"/>
 					</aui:input>
 				</aui:row>