Revision 101:92abf59c3a68

View differences:

WebContent/WEB-INF/config/ss112_user/validation.xml
95 95
		    <field depends="required" property="userAlias">
96 96
			    <arg0 key="user.id"/>
97 97
			</field>
98
			<field depends="required" property="onlineStockIdNo">
98
			<!-- <field depends="required" property="onlineStockIdNo">
99 99
			    <arg0 key="user.id.no"/>
100
			</field>
100
			</field> -->
101 101
		</form>
102 102
		
103 103
		<form name="ss112RetailUserTicketingCreateResultValidation">
......
199 199
			</field>
200 200
		</form>
201 201
		
202
		<form name="ss112RetailUserOnlineStockEditResultValidation">
202
		<!-- <form name="ss112RetailUserOnlineStockEditResultValidation">
203 203
			<field depends="required" property="onlineStockIdNo">
204 204
			    <arg0 key="user.id.no"/>
205 205
			</field>
206
		</form>
206
		</form> -->
207 207
		
208 208
		<form name="ss112RetailUserTicketingEditResultValidation">
209 209
			<field depends="required" 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
	<c:if test="${ibssUserForm.map.selectedAppId eq 3}">
100 100
	
101 101
	<tr>
WebContent/jsp/ss112_user/ibssRetailUserDetails.jsp
123 123
			onclick="overlay();">
124 124
			<bean:message key="general.button.back" />
125 125
		</htmlEL:cancel>
126
		
127
		<c:if test="${detailBean.map.userApplicationKey ne '2'}">
126 128
		<htmlEL:submit property="action" styleClass="button"
127 129
			onclick="overlay();">
128 130
			<bean:message key="general.button.edit" />
129 131
		</htmlEL:submit>
132
		</c:if>
130 133
		
131 134
		<c:if test="${detailBean.map.userStatusKey eq 1}">
132 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>
resource/com/ib/ibss/resources/exception/IBSSBusinessExceptionResources.properties
370 370
#ss223 application user maintenance
371 371
error.app.user.create.1=error.app.user.username.already.exist
372 372

  
373
error.user.id.not.exist.inm2u=error.user.id.not.exist.inm2u.2
373
error.user.id.not.exist.inm2u.2=error.user.id.not.exist.inm2u.2
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
91 91
			{
92 92
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_ONLINE_STOCK_EDIT_RESULT_VALIDATION), request);
93 93
			}
94
			else if(appId.equals(ClientApp.APP_ID_ONLINE_TICKETING))
95
			{
96
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_TICKETING_EDIT_RESULT_VALIDATION), request);
97
			}
94
//			else if(appId.equals(ClientApp.APP_ID_ONLINE_TICKETING))
95
//			{
96
//				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_TICKETING_EDIT_RESULT_VALIDATION), request);
97
//			}
98 98
			else if(appId.equals(ClientApp.APP_ID_CCPP))
99 99
			{
100 100
				error = form.validate(createNewActionMapping(mapping, JSPValidator.SS112_RETAIL_USER_CCPP_EDIT_RESULT_VALIDATION), request);
src/com/ib/ibss/enterprise/services/ss112_user/IBSSRetailUserCreateResultServices.java
95 95
			//online stock
96 96
			else if(selectedAppId.equals(ClientApp.APP_ID_ONLINE_STOCK))
97 97
			{
98
				idNo   	= getBeanMessage (IBSSUserConstants.ONLINE_STOCK_ID_NO);
98
//				idNo   	= getBeanMessage (IBSSUserConstants.ONLINE_STOCK_ID_NO);
99 99
				rc 	= impl.newStockUser(adminUserAlias, adminPassword, userAlias, idNo);
100 100
			}
101 101
			//ticketing

Also available in: Unified diff