anchor.diff:  	PortletURL iteratorURL = renderResponse.createRenderURL();
   	iteratorURL.setParameter("mvcPath", templatePath + "backofficepaymentlist.jsp");	
   	Format dateFormatDate = FastDateFormatFactoryUtil.getDate(locale, timeZone);
  -	String soHoSo = StringPool.BLANK;
  -	String chuHoSo = StringPool.BLANK;
  +	String dossierNo = StringPool.BLANK;
  +	String dossierOwnerName = StringPool.BLANK;
   %>
   <div class="payment-ld">
  -<div class="content">
  -<aui:form name="payForm" action="#">
  -<div class="opcs-serviceinfo-list-label">
  -	<div class="title_box">
  -           <p class="file_manage_title"><liferay-ui:message key="danh-sach-ho-so-thu-phi" /></p>
  -           <p class="count"></p>
  -    </div>
  +	<div class="content">
  +		<aui:form name="payForm" action="#">
  +			<div class="opcs-serviceinfo-list-label">
  +				<div class="title_box">
  +					<p class="file_manage_title"><liferay-ui:message key="danh-sach-ho-so-thu-phi" /></p>
  +					<p class="count"></p>
  +				</div>
  +			</div>
  +			
  +			<liferay-ui:search-container searchContainer="<%= new PaymentFileSearch(renderRequest, SearchContainer.DEFAULT_DELTA, iteratorURL) %>">
  +			
  +				<liferay-ui:search-container-results>
  +					<%
  +						PaymentFileSearchTerms searchTerms = (PaymentFileSearchTerms)searchContainer.getSearchTerms();
  +						
  +						String[] keywordArrs = null;
  +						
  +						if(Validator.isNotNull(searchTerms.getKeywords())){
  +							keywordArrs = CustomSQLUtil.keywords(searchTerms.getKeywords());
  +						}
  +						List<PaymentFile> paymentFiles = null;
  +						
  +						Integer totalCount = 0;
  +						
  +						AccountBean accountBean = AccountUtil.getAccountBean(request);
  +						
  +						long govOrganizationId = accountBean.getOwnerOrganizationId();
  +						
  +						try {
  +							paymentFiles = PaymentFileLocalServiceUtil.searchPaymentFiles(themeDisplay.getScopeGroupId(), paymentStatus, govOrganizationId, keywords, searchContainer.getStart(), searchContainer.getEnd());
  +							totalCount = PaymentFileLocalServiceUtil.countPaymentFiles(themeDisplay.getScopeGroupId(), paymentStatus, govOrganizationId, keywords);
  +						} catch(Exception e){
  +							_log.error(e);
  +						}
  +						
  +						total = totalCount;
  +						results = paymentFiles;
  +						
  +						pageContext.setAttribute("results", results);
  +						pageContext.setAttribute("total", total);
  +					%>
  +				</liferay-ui:search-container-results>	
  +					<liferay-ui:search-container-row 
  +						className="org.opencps.paymentmgt.model.PaymentFile" 
  +						modelVar="paymentFile" 
  +						keyProperty="paymentFileId"
  +					>
  +						<%				
  +							 
  +							Dossier dossier = null;
  +							try {
  +								dossier = DossierLocalServiceUtil.fetchDossier(paymentFile.getDossierId());
  +								dossierNo =  dossier.getReceptionNo();
  +							} catch (Exception e) {
  +								//nothing to do
  +							}
  +							
  +							if(paymentFile.getOwnerUserId() > 0){
  +								Citizen owner = null;
  +								
  +								try {
  +									owner = CitizenLocalServiceUtil.getByMappingUserId(paymentFile.getOwnerUserId());
  +									dossierOwnerName = owner.getFullName();
  +								} catch (Exception e) {
  +									
  +								}
  +							} else {
  +								Business owner = null;
  +								
  +								try {
  +									owner = BusinessLocalServiceUtil.getBymappingOrganizationId(paymentFile.getOwnerOrganizationId());
  +									dossierOwnerName = owner.getName();
  +								} catch (Exception e) {
  +									
  +								}
  +								
  +							}
  +							String paymentMothodLabel = StringPool.BLANK;
  +							if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_APPROVED){
  +								paymentMothodLabel = LanguageUtil.get(pageContext, PortletUtil.getPaymentMethodLabel(paymentFile.getPaymentMethod(), locale)); 
  +							}
  +							PortletURL detailURL = renderResponse.createRenderURL();
  +							detailURL.setParameter("mvcPath", templatePath + "backofficepaymentdetail.jsp");
  +							detailURL.setParameter("paymentFileId", String.valueOf(paymentFile.getPaymentFileId()));
  +							detailURL.setParameter("redirect", currentURL);
  +							
  +							String classColor = "chothanhtoan";
  +							if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_REQUESTED ){
  +								classColor = "chothanhtoan";
  +							}else if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_CONFIRMED){
  +								classColor = "datiepnhan";
  +							}else if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_APPROVED){
  +								classColor = "hoanthanh";
  +							}else if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_REJECTED){
  +								classColor = "loi";
  +							}
  +							
  +							// no column
  +							row.addText(String.valueOf(row.getPos() + 1));		
  +						
  +						row.addText("<p><b style=\"margin-left: -20px; padding-right: 20px;\" class=\"mamau "+classColor+"\"></b><span style=\"width: 95px; display: inline-block;\">"+LanguageUtil.get(pageContext, "reception-no")+":</span> "+dossierNo+"</p><p><span>"+LanguageUtil.get(pageContext, "payment-name")+":</span> "+paymentFile.getPaymentName()+" <a href=\""+detailURL.toString()+"\" class=\"chitiet\">"+LanguageUtil.get(pageContext, "xem-detail")+"</a></p><p><span>"+LanguageUtil.get(pageContext, "subject-name")+":</span>"+dossierOwnerName+"</p>");
  +						
  +						row.addText("<p><span>"+LanguageUtil.get(pageContext, "payment-status")+":</span> <span class=\""+classColor+"\">"+LanguageUtil.get(pageContext, PortletUtil.getPaymentStatusLabel(paymentFile.getPaymentStatus(), locale))+"</span></p><p><span>"+LanguageUtil.get(pageContext, "amount")+":</span> <span class=\"sotien\">"+String.valueOf(NumberFormat.getInstance(new Locale("vi", "VN")).format(paymentFile.getAmount()))+"</span></p><p><span>"+LanguageUtil.get(pageContext, "payment-method")+":</span>"+paymentMothodLabel+"</p>");	
  +						
  +						row.addJSP("center", SearchEntry.DEFAULT_VALIGN, templatePath + "payment_actions.jsp", config.getServletContext(), request, response);
  +						
  +					%>	
  +					
  +					<liferay-ui:search-container-column-text>
  +						
  +						
  +					</liferay-ui:search-container-column-text>
  +				</liferay-ui:search-container-row> 
  +			
  +			<liferay-ui:search-iterator type="opencs_page_iterator"/>
  +		</liferay-ui:search-container>
  +		
  +		</aui:form>
  +	</div>
   </div>
  -<liferay-ui:search-container searchContainer="<%= new PaymentFileSearch(renderRequest, SearchContainer.DEFAULT_DELTA, iteratorURL) %>">
  -
  -	<liferay-ui:search-container-results>
  -		<%
  -			PaymentFileSearchTerms searchTerms = (PaymentFileSearchTerms)searchContainer.getSearchTerms();
  -			
  -			String[] keywordArrs = null;
  -			
  -			if(Validator.isNotNull(searchTerms.getKeywords())){
  -				keywordArrs = CustomSQLUtil.keywords(searchTerms.getKeywords());
  -			}
  -			List<PaymentFile> dossierFiles = null;
  -			Integer totalCount = 0;
  -			
  -			AccountBean accBean = AccountUtil.getAccountBean(request);
  -			
  -			long govOrganizationId = accBean.getOwnerOrganizationId();
  -			
  -			try {
  -				dossierFiles = PaymentFileLocalServiceUtil.searchPaymentFiles(themeDisplay.getScopeGroupId(), paymentStatus, govOrganizationId, keywords, searchContainer.getStart(), searchContainer.getEnd());
  -				totalCount = PaymentFileLocalServiceUtil.countPaymentFiles(themeDisplay.getScopeGroupId(), paymentStatus, govOrganizationId, keywords);
  -			} catch(Exception e){
  -				_log.error(e);
  -			}
  -			
  -			total = totalCount;
  -			results = dossierFiles;
  -			
  -			pageContext.setAttribute("results", results);
  -			pageContext.setAttribute("total", total);
  -		%>
  -	</liferay-ui:search-container-results>	
  -		<liferay-ui:search-container-row 
  -			className="org.opencps.paymentmgt.model.PaymentFile" 
  -			modelVar="paymentFile" 
  -			keyProperty="paymentFileId"
  -		>
  -			<%				
  -				 
  -				Dossier doss = null;
  -				try {
  -					doss = DossierLocalServiceUtil.fetchDossier(paymentFile.getDossierId());
  -					soHoSo =  doss.getReceptionNo();
  -				} catch (Exception e) {
  -					//nothing to do
  -				}
  -				
  -				if(paymentFile.getOwnerUserId() > 0){
  -					Citizen owner = null;
  -					
  -					try {
  -						owner = CitizenLocalServiceUtil.getByMappingUserId(paymentFile.getOwnerUserId());
  -						chuHoSo = owner.getFullName();
  -					} catch (Exception e) {
  -						
  -					}
  -				} else {
  -					Business owner = null;
  -					
  -					try {
  -						owner = BusinessLocalServiceUtil.getBymappingOrganizationId(paymentFile.getOwnerOrganizationId());
  -						chuHoSo = owner.getName();
  -					} catch (Exception e) {
  -						
  -					}
  -					
  -				}
  -				String paymentMothodLabel = StringPool.BLANK;
  -				if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_APPROVED){
  -					paymentMothodLabel = LanguageUtil.get(pageContext, PortletUtil.getPaymentMethodLabel(paymentFile.getPaymentMethod(), locale)); 
  -				}
  -				PortletURL detailURL = renderResponse.createRenderURL();
  -				detailURL.setParameter("mvcPath", templatePath + "backofficepaymentdetail.jsp");
  -				detailURL.setParameter("paymentFileId", String.valueOf(paymentFile.getPaymentFileId()));
  -				detailURL.setParameter("redirect", currentURL);
  -				
  -				String classColor = "chothanhtoan";
  -				if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_REQUESTED ){
  -					classColor = "chothanhtoan";
  -				}else if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_CONFIRMED){
  -					classColor = "datiepnhan";
  -				}else if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_APPROVED){
  -					classColor = "hoanthanh";
  -				}else if(paymentFile.getPaymentStatus() == PaymentMgtUtil.PAYMENT_STATUS_REJECTED){
  -					classColor = "loi";
  -				}
  -				
  -				// no column
  -				row.addText(String.valueOf(row.getPos() + 1));		
  -			
  -				row.addText("<p><b style=\"margin-left: -20px; padding-right: 20px;\" class=\"mamau "+classColor+"\"></b><span style=\"width: 95px; display: inline-block;\">"+LanguageUtil.get(pageContext, "reception-no")+":</span> "+soHoSo+"</p><p><span>"+LanguageUtil.get(pageContext, "payment-name")+":</span> "+paymentFile.getPaymentName()+" <a href=\""+detailURL.toString()+"\" class=\"chitiet\">"+LanguageUtil.get(pageContext, "xem-detail")+"</a></p><p><span>"+LanguageUtil.get(pageContext, "subject-name")+":</span>"+chuHoSo+"</p>");
  -				
  -				row.addText("<p><span>"+LanguageUtil.get(pageContext, "payment-status")+":</span> <span class=\""+classColor+"\">"+LanguageUtil.get(pageContext, PortletUtil.getPaymentStatusLabel(paymentFile.getPaymentStatus(), locale))+"</span></p><p><span>"+LanguageUtil.get(pageContext, "amount")+":</span> <span class=\"sotien\">"+String.valueOf(NumberFormat.getInstance(new Locale("vi", "VN")).format(paymentFile.getAmount()))+"</span></p><p><span>"+LanguageUtil.get(pageContext, "payment-method")+":</span>"+paymentMothodLabel+"</p>");	
  -				
  -				row.addJSP("center", SearchEntry.DEFAULT_VALIGN, templatePath + "payment_actions.jsp", config.getServletContext(), request, response);
  -				
  -			%>	
  -			
  -			<liferay-ui:search-container-column-text>
  -				
  -				
  -			</liferay-ui:search-container-column-text>
  -		</liferay-ui:search-container-row> 
  -	
  -	<liferay-ui:search-iterator type="opencs_page_iterator"/>
  -</liferay-ui:search-container>
  -
  -</aui:form>
  -</div>
  -</div>
  +
   <style>
   .table.payment tr td:nth-child(2){
      max-width: 600px;
  
positive.code: <%@page import="org.opencps.util.AccountUtil"%>
  <%@page import="org.opencps.dossiermgt.bean.AccountBean"%>
  <%@page import="org.opencps.paymentmgt.util.PaymentMgtUtil"%>
  
negative.code: <%@page import="com.liferay.util.dao.orm.CustomSQLUtil"%>
  <%@page import="com.liferay.portal.kernel.log.LogFactoryUtil"%>
  <%@page import="com.liferay.portal.kernel.log.Log"%>
  <%@ include file="../init.jsp"%>
  
  <liferay-util:include 
  	page="/html/portlets/paymentmgt/backoffice/toolbar.jsp" 
  	servletContext="<%=application %>" 
  />
  
  <%
  	int paymentStatus = ParamUtil.getInteger(request, "paymentStatus",-1);
  
  