Revision 109:2efc2738dd11

View differences:

WebContent/WEB-INF/config/ss112_user/validation.xml
105 105
		    <field depends="required, alphaNumeric" property="userAlias">
106 106
			    <arg0 key="user.id"/>
107 107
			</field>
108
			<!-- <field depends="required" property="onlineStockIdNo">
108
			<field depends="required" property="onlineStockIdNo">
109 109
			    <arg0 key="user.id.no"/>
110
			</field> -->
110
			</field>
111 111
		</form>
112 112
		
113 113
		<form name="ss112RetailUserTicketingCreateResultValidation">
......
229 229
			</field>
230 230
		</form>
231 231
		
232
		<!-- <form name="ss112RetailUserOnlineStockEditResultValidation">
232
		<form name="ss112RetailUserOnlineStockEditResultValidation">
233 233
			<field depends="required" property="onlineStockIdNo">
234 234
			    <arg0 key="user.id.no"/>
235 235
			</field>
236
		</form> -->
236
		</form>
237 237
		
238 238
		<form name="ss112RetailUserTicketingEditResultValidation">
239 239
			<field depends="required, customerFullNameVal" property="ticketingFullName">
WebContent/jsp/ss112_user/ibssRetailUserCreateConfirm.jsp
85 85
	</tr>
86 86
	
87 87
	</c:if>
88
	<%-- <c:if test="${ibssUserForm.map.selectedAppId eq 2}">
88
	<c:if test="${ibssUserForm.map.selectedAppId eq 2}">
89 89
	
90 90
	<tr>
91 91
		<td width="72">&nbsp;</td>
......
95 95
   		<td width="44">&nbsp;</td>
96 96
	</tr>
97 97
	
98
	</c:if> --%>
98
	</c:if>
99
	
99 100
	<c:if test="${ibssUserForm.map.selectedAppId eq 3}">
100 101
	
101 102
	<tr>
WebContent/jsp/ss112_user/ibssRetailUserDetails.jsp
124 124
			<bean:message key="general.button.back" />
125 125
		</htmlEL:cancel>
126 126
		
127
		<c:if test="${detailBean.map.userApplicationKey ne '2'}">
127
		<%-- <c:if test="${detailBean.map.userApplicationKey ne '2'}"> --%>
128 128
		<htmlEL:submit property="action" styleClass="button"
129 129
			onclick="overlay();">
130 130
			<bean:message key="general.button.edit" />
131 131
		</htmlEL:submit>
132
		</c:if>
132
		<%-- </c:if> --%>
133 133
		
134 134
		<c:if test="${detailBean.map.userStatusKey eq 1}">
135 135
		<htmlEL:submit property="action" styleClass="button"
WebContent/jsp/ss112_user/ibssRetailUserEdit.jsp
77 77
	</tr>
78 78
	
79 79
	</c:if>
80
	<%-- <c:if test="${ibssUserForm.map.userApplicationKey eq '2'}">
80
	<c:if test="${ibssUserForm.map.userApplicationKey eq '2'}">
81 81
	
82 82
	<tr>
83 83
		<td width="72">&nbsp;</td>
......
87 87
   		<td width="44">&nbsp;</td>
88 88
	</tr>
89 89
	
90
	</c:if> --%>
90
	</c:if>
91 91
	<c:if test="${ibssUserForm.map.userApplicationKey eq '3'}">
92 92
	
93 93
	<tr>
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserCreateConfirmAction.java
59 59
					ibDynaBean.set(IBSSUserConstants.CONFIRM_PASS, null);
60 60
					ibDynaBean.set(IBSSUserConstants.M2U_PAN1, null);
61 61
					ibDynaBean.set(IBSSUserConstants.M2U_PAN2, null);
62
//					ibDynaBean.set(IBSSUserConstants.ONLINE_STOCK_ID_NO, null);
62
					ibDynaBean.set(IBSSUserConstants.ONLINE_STOCK_ID_NO, null);
63 63
					ibDynaBean.set(IBSSUserConstants.TICKETING_FULL_NAME, null);
64 64
					ibDynaBean.set(IBSSUserConstants.TICKETING_FIRST_NAME, null);
65 65
					ibDynaBean.set(IBSSUserConstants.TICKETING_LAST_NAME, null);
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserCreateResultAction.java
73 73
			{
74 74
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_M2U_CREATE_RESULT_VALIDATION), request);
75 75
			}
76
			/*else if(appId.equals(ClientApp.APP_ID_ONLINE_STOCK))
76
			else if(appId.equals(ClientApp.APP_ID_ONLINE_STOCK))
77 77
			{
78 78
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_ONLINE_STOCK_CREATE_RESULT_VALIDATION), request);
79
			}*/
79
			}
80 80
			else if(appId.equals(ClientApp.APP_ID_ONLINE_TICKETING))
81 81
			{
82 82
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_TICKETING_CREATE_RESULT_VALIDATION), request);
src/com/ib/ibss/controller/actions/ss112_user/IBSSRetailUserEnquiryEditResultAction.java
87 87
			{
88 88
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_M2U_EDIT_RESULT_VALIDATION), request);
89 89
			}
90
//			else if(appId.equals(ClientApp.APP_ID_ONLINE_STOCK))
91
//			{
92
//				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_ONLINE_STOCK_EDIT_RESULT_VALIDATION), request);
93
//			}
90
			else if(appId.equals(ClientApp.APP_ID_ONLINE_STOCK))
91
			{
92
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_ONLINE_STOCK_EDIT_RESULT_VALIDATION), request);
93
			}
94 94
			else if(appId.equals(ClientApp.APP_ID_ONLINE_TICKETING))
95 95
			{
96 96
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_TICKETING_EDIT_RESULT_VALIDATION), request);
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserCreateResultServices.java
101 101
			//online stock
102 102
			else if(selectedAppId.equals(ClientApp.APP_ID_ONLINE_STOCK))
103 103
			{
104
//				idNo   	= getBeanMessage (IBSSUserConstants.ONLINE_STOCK_ID_NO);
104
				idNo   	= getBeanMessage (IBSSUserConstants.ONLINE_STOCK_ID_NO);
105 105
				rc 	= impl.newStockUser(adminUserAlias, adminPassword, userAlias, idNo);
106 106
			}
107 107
			//ticketing

Also available in: Unified diff