IME-LONDON
/
WEB_CORE
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

mobile number length fixation

Ime-london-webcore
Leeza Baidar 1 year ago
parent
594e793d03
commit
06b9e28e36
6 changed files with 99 additions and 139 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 153
      Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx
  2. 10
      Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs
  3. 9
      Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.designer.cs
  4. 42
      Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx
  5. 6
      Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.cs
  6. 18
      Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.designer.cs

153
Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx
View File

@ -306,14 +306,7 @@
var countryCode = $('.dial-code').text();
var mobileNo = input.val();
var maxLength = input.attr('maxLength');
if (mobileNo.length > 10) {
alert('Mobile No. Can allow input maximum 10 digit only');
return false;
}
if (mobileNo.indexOf(countryCode) < 0) {
mobileNo = countryCode + mobileNo;
}
if (mobileNo.length > 13) {
alert('Mobile No. Can allow input maximum ' + maxLength + ' digit only');
return $(this).val('');
@ -325,8 +318,8 @@
$('#<%=countryList.ClientID%>').on('change', function () {
$("#<%=mobile.ClientID%>").val('');
var country = $("#<%=countryList.ClientID%> option:selected").text();
if (country.toLowerCase() == 'japan') {
$("#<%=mobile.ClientID%>").intlTelInput('setCountry', 'jp');
if (country.toLowerCase() == 'united kingdom') {
$("#<%=mobile.ClientID%>").intlTelInput('setCountry', 'gb');
}
});
@ -366,7 +359,7 @@
$('input[name=agreement]').prop("checked", true);
$('#<%=register.ClientID%>').removeAttr('disabled');
});
CustomerSignatureFromAdmin();
//CustomerSignatureFromAdmin();
});
@ -588,10 +581,10 @@
$('#<%=txtRegistrationNo.ClientID%>').val(dr[0].registerationNo);
$('#<%=txtDateOfIncorporation.ClientID%>').val(dr[0].dateofIncorporation);
$('#<%=txtNameofAuthoPerson.ClientID%>').val(dr[0].nameOfAuthorizedPerson);
//$('#<%=txtStreet.ClientID%>').val(dr[0].street);
<%--$('#<%=txtStreet.ClientID%>').val(dr[0].street);--%>
$('#<%=txtAdditionalAddress.ClientID%>').val(dr[0].additionalAddress);
$('#<%=txtsenderCityjapan.ClientID%>').val(dr[0].cityUnicode);
$('#<%=txtstreetJapanese.ClientID%>').val(dr[0].streetUnicode);
<%--$('#<%=txtstreetJapanese.ClientID%>').val(dr[0].streetUnicode);--%>
$('#<%=txtNameofEmployeer.ClientID%>').val(dr[0].nameOfEmployeer);
$('#<%=rbRemitanceAllowed.ClientID%> input[value=' + (dr[0].remittanceAllowed == true ? "Enabled" : "Disabled") + ']').attr('checked', 'checked');
@ -657,6 +650,7 @@
}
function CheckFormValidation() {
debugger
var reqField = "";
var val = $("#<% =hdnCustomerId.ClientID%>").val();
var customerType = $("#<% =ddlCustomerType.ClientID%>").val();
@ -666,9 +660,6 @@
var countryCode = $('.dial-code').text();
var maxLength = input.attr('maxLength');
if (mobileNo.indexOf(countryCode) < 0) {
mobileNo = countryCode + mobileNo;
}
if (mobileNo.length > 13) {
alert('Mobile No. Can allow input maximum ' + maxLength + ' digit only');
return $(this).val('');
@ -873,68 +864,68 @@
});
}--%>
function PopulateAreaDDL(data, selectedValue) {
var option, selValue = '';
var editable = false;
if (selectedValue) {
selValue = selectedValue;
}
if (editable) {
$(".es-list").empty();
if (data.length > 1) {
$(".es-list").append('<li class="es-visible">Select Area</li>');
}
for (var i = 0; i < data.length; i++) {
if (data[i].SELECTED === 'Y') {
option = '<li value=' + data[i].ROW_ID + ' class="selected es-visible">' + data[i].STREET_NAME + '</li>';
}
else
option = '<li value=' + data[i].ROW_ID + ' class="es-visible" ">' + data[i].STREET_NAME + '</li>';
try {
$(".es-list").append(option);
}
catch (e) {
alert(e);
}
}
}
else {
var ddl = document.getElementById("ContentPlaceHolder1_txtStreet");
$(ddl).empty();
if (data.length > 1) {
option = document.createElement("option");
option.text = 'Select Area';
option.value = '';
ddl.options.add(option);
}
for (var i = 0; i < data.length; i++) {
option = document.createElement("option");
option.text = data[i].STREET_NAME;
option.value = data[i].ROW_ID;
if (data[i].SELECTED === 'Y') {
$('#ContentPlaceHolder1_hf_editable_townArea').val(data[i].STREET_NAME);
option.classList.add("selected");
option.selected = true;
}
else if (data.length == 1) {
$('#ContentPlaceHolder1_hf_editable_townArea').val(data[i].STREET_NAME);
}
try {
ddl.options.add(option);
}
catch (e) {
alert(e);
}
}
}
}
//function PopulateAreaDDL(data, selectedValue) {
// var option, selValue = '';
// var editable = false;
// if (selectedValue) {
// selValue = selectedValue;
// }
// if (editable) {
// $(".es-list").empty();
// if (data.length > 1) {
// $(".es-list").append('<li class="es-visible">Select Area</li>');
// }
// for (var i = 0; i < data.length; i++) {
// if (data[i].SELECTED === 'Y') {
// option = '<li value=' + data[i].ROW_ID + ' class="selected es-visible">' + data[i].STREET_NAME + '</li>';
// }
// else
// option = '<li value=' + data[i].ROW_ID + ' class="es-visible" ">' + data[i].STREET_NAME + '</li>';
// try {
// $(".es-list").append(option);
// }
// catch (e) {
// alert(e);
// }
// }
// }
// else {
// var ddl = document.getElementById("ContentPlaceHolder1_txtStreet");
// $(ddl).empty();
// if (data.length > 1) {
// option = document.createElement("option");
// option.text = 'Select Area';
// option.value = '';
// ddl.options.add(option);
// }
// for (var i = 0; i < data.length; i++) {
// option = document.createElement("option");
// option.text = data[i].STREET_NAME;
// option.value = data[i].ROW_ID;
// if (data[i].SELECTED === 'Y') {
// $('#ContentPlaceHolder1_hf_editable_townArea').val(data[i].STREET_NAME);
// option.classList.add("selected");
// option.selected = true;
// }
// else if (data.length == 1) {
// $('#ContentPlaceHolder1_hf_editable_townArea').val(data[i].STREET_NAME);
// }
// try {
// ddl.options.add(option);
// }
// catch (e) {
// alert(e);
// }
// }
// }
//}
function CheckRequiredOrNot() {
var previousVerificationId = $("#<%=hddVerificationTypeNo.ClientID%>").val().toLowerCase();
@ -1165,12 +1156,12 @@
</div>
</div>
<div class="col-md-4 col-sm-4" style="display: none;">
<%--<div class="col-md-4 col-sm-4" style="display: none;">
<div class="form-group">
<label>Street/Street[Japanese]:</label>
<asp:TextBox ID="txtstreetJapanese" autocomplete="stopdoingthat" runat="server" placeholder="Street[Japanese]" CssClass="form-control" />
</div>
</div>
</div>--%>
<div class="col-md-4 col-sm-4">
<div class="form-group">
<label>City:<span class="errormsg">*</span></label>
@ -1358,7 +1349,7 @@
<div class="form-group">
<label id="otherVerificationType">Other Verification Id Type:<span class="errormsg">*</span></label>
<div class="input-group input-append date dpYears">
<asp:TextBox ID="otherVerificationTypeNo" runat="server" placeholder="Other Verification Id Type" MaxLength="30" CssClass="form-control required" />
<asp:TextBox ID="otherVerificationTypeNo" runat="server" placeholder="Other Verification Id Type" MaxLength="30" CssClass="form-control" />
<div class="input-group-addon" onclick="ShowIdTypeInfo();"><i class="fa fa-info"></i></div>
</div>
</div>

10
Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.cs
View File

@ -140,10 +140,10 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
txtRegistrationNo.Text = dr["registerationNo"].ToString();
txtDateOfIncorporation.Text = dr["dateofIncorporation"].ToString();
txtNameofAuthoPerson.Text = dr["nameOfAuthorizedPerson"].ToString();
txtStreet.Text = dr["street"].ToString();
//txtStreet.Text = dr["street"].ToString();
txtAdditionalAddress.Text = dr["additionalAddress"].ToString();
txtsenderCityjapan.Text = dr["cityUnicode"].ToString();
txtstreetJapanese.Text = dr["streetUnicode"].ToString();
//txtstreetJapanese.Text = dr["streetUnicode"].ToString();
txtNameofEmployeer.Text = dr["nameOfEmployeer"].ToString();
rbRemitanceAllowed.SelectedValue = (dr["remittanceAllowed"].ToString().ToLower() == "true" ? "Enabled" : "Disabled");
rbOnlineLogin.SelectedValue = (dr["onlineUser"].ToString() == "Y" ? "Enabled" : "Disabled");
@ -271,7 +271,7 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
string trimmedlastName = lastName.Text.Trim() == "" ? null : lastName.Text.Trim();
string occupationVal = occupationHidden.Value;
string street = Request.Form["ctl00$ContentPlaceHolder1$txtStreet"];
//string street = Request.Form["ctl00$ContentPlaceHolder1$txtStreet"];
OnlineCustomerModel customerModel = new OnlineCustomerModel()
{
@ -284,8 +284,8 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
country = countryList.Text,
address = addressLine1.Text,
zipCode = zipCode.Text,
streetJapanese = hf_editable_townArea.Value,
street = Request.Form["ctl00$ContentPlaceHolder1$txtStreet"],
//streetJapanese = hf_editable_townArea.Value,
//street = Request.Form["ctl00$ContentPlaceHolder1$txtStreet"],
AdditionalAddress = txtAdditionalAddress.Text,
city = cityHidden.Value,
state = ddlStateHidden.Value,

9
Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx.designer.cs
View File

@ -365,15 +365,6 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlState;
/// <summary>
/// txtstreetJapanese control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtstreetJapanese;
/// <summary>
/// city control.
/// </summary>

42
Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx
View File

@ -325,13 +325,13 @@
var countryCode = $('.dial-code').text();
var mobileNo = input.val();
var maxLength = input.attr('maxLength');
if (mobileNo.length > 10) {
alert('Mobile No. Can allow input maximum 10 digit only');
return $(this).val('');
}
if (mobileNo.indexOf(countryCode) < 0) {
mobileNo = countryCode + mobileNo;
}
//if (mobileNo.length > 10) {
// alert('Mobile No. Can allow input maximum 10 digit only');
// return $(this).val('');
//}
//if (mobileNo.indexOf(countryCode) < 0) {
// mobileNo = countryCode + mobileNo;
//}
if (mobileNo.length > 13) {
alert('Mobile No. Can allow input maximum ' + maxLength + ' digit only');
return $(this).val('');
@ -343,8 +343,8 @@
$('#<%=countryList.ClientID%>').on('change', function () {
$("#<%=mobile.ClientID%>").val('');
var country = $("#<%=countryList.ClientID%> option:selected").text();
if (country.toLowerCase() == 'japan') {
$("#<%=mobile.ClientID%>").intlTelInput('setCountry', 'jp');
if (country.toLowerCase() == 'united kingdom') {
$("#<%=mobile.ClientID%>").intlTelInput('setCountry', 'gb');
}
});
@ -537,10 +537,10 @@
$('#<%=txtRegistrationNo.ClientID%>').val(dr[0].registerationNo);
$('#<%=txtDateOfIncorporation.ClientID%>').val(dr[0].dateofIncorporation);
$('#<%=txtNameofAuthoPerson.ClientID%>').val(dr[0].nameOfAuthorizedPerson);
//$('#<%=txtStreet.ClientID%>').val(dr[0].street);
<%--$('#<%=txtStreet.ClientID%>').val(dr[0].street);--%>
$('#<%=txtAdditionalAddress.ClientID%>').val(dr[0].additionalAddress);
$('#<%=txtsenderCityjapan.ClientID%>').val(dr[0].cityUnicode);
$('#<%=txtstreetJapanese.ClientID%>').val(dr[0].streetUnicode);
<%--$('#<%=txtstreetJapanese.ClientID%>').val(dr[0].streetUnicode);--%>
$('#<%=txtNameofEmployeer.ClientID%>').val(dr[0].nameOfEmployeer);
$('#<%=rbRemitanceAllowed.ClientID%> input[value=' + (dr[0].remittanceAllowed == true ? "Enabled" : "Disabled") + ']').attr('checked', 'checked');
@ -617,6 +617,7 @@
}
function CheckFormValidation() {
debugger
var reqField = "";
if ($('#<%=occupation.ClientID%>').val() !== '11383') {
reqField = reqField.replace(",<%=occupationText.ClientID%>,", ",");
@ -629,10 +630,6 @@
var countryCode = $('.dial-code').text();
var maxLength = input.attr('maxLength');
if (mobileNo.indexOf(countryCode) < 0) {
mobileNo = countryCode + mobileNo;
}
if (mobileNo.length > 13) {
alert('Mobile No. Can allow input maximum ' + maxLength + ' digit only');
return $(this).val('');
@ -750,7 +747,7 @@
parent.AgreementModalPopup();
}
function PopulateAreaDDL(data, selectedValue) {
<%--function PopulateAreaDDL(data, selectedValue) {
var option, selValue = '';
var editable = $("#<%=txtStreet.ClientID%>").next('ul').hasClass('es-list');
@ -807,7 +804,7 @@
}
}
}
}
}--%>
function CheckRequiredOrNot() {
var previousVerificationId = $("#<%=hddVerificationTypeNo.ClientID%>").val().toLowerCase();
var currentVerificationId = $("#<%=verificationTypeNo.ClientID%>").val().toLowerCase();
@ -1110,25 +1107,24 @@
</div>
</div>--%>
<div class="col-md-4 col-sm-4" style="display: none;">
<%--<div class="col-md-4 col-sm-4" style="display: none;">
<div class="form-group">
<label>Street/Street[Japanese]:</label>
<asp:TextBox ID="txtstreetJapanese" runat="server" placeholder="Street[Japanese]" CssClass="form-control" />
</div>
</div>
</div>--%>
<div class="col-md-4 col-sm-4">
<div class="form-group">
<label>City:<span class="errormsg">*</span></label>
<asp:TextBox ID="city" ReadOnly="true" runat="server" disabled="disabled" placeholder="City" CssClass="form-control required" />
</div>
</div>
<div class="col-md-4 col-sm-4" style="display: none;">
<%--<div class="col-md-4 col-sm-4" style="display: none;">
<div class="form-group">
<label>Town Area:<span class="errormsg">*</span></label>
<asp:DropDownList ID="txtStreet" runat="server" placeholder="Street" CssClass="form-control required" />
<%--<asp:TextBox ID="txtStreet" runat="server" placeholder="Street" CssClass="form-control required" />--%>
</div>
</div>
</div>--%>
<div class="col-md-4 col-sm-4" style="display: none;">
<div class="form-group">
<label>Sender City-Japan:</label>
@ -1294,7 +1290,7 @@
<div class="form-group">
<label id="otherVerificationType">Other Verification ID Type.:<span class="errormsg">*</span></label>
<div class="input-group input-append date dpYears">
<asp:TextBox ID="otherVerificationTypeNo" runat="server" placeholder="Other Verification Id Type" MaxLength="14" CssClass="form-control required" />
<asp:TextBox ID="otherVerificationTypeNo" runat="server" placeholder="Other Verification Id Type" MaxLength="14" CssClass="form-control" />
<div class="input-group-addon" onclick="ShowIdTypeInfo();"><i class="fa fa-info"></i></div>
</div>
</div>

6
Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.cs
View File

@ -164,9 +164,9 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
txtAdditionalAddress.Text = dr["additionalAddress"].ToString();
txtDateOfIncorporation.Text = dr["dateofIncorporation"].ToString();
txtNameofAuthoPerson.Text = dr["nameOfAuthorizedPerson"].ToString();
txtStreet.Text = dr["street"].ToString();
//txtStreet.Text = dr["street"].ToString();
txtsenderCityjapan.Text = dr["cityUnicode"].ToString();
txtstreetJapanese.Text = dr["streetUnicode"].ToString();
//txtstreetJapanese.Text = dr["streetUnicode"].ToString();
txtNameofEmployeer.Text = dr["nameOfEmployeer"].ToString();
rbRemitanceAllowed.SelectedValue = (dr["remittanceAllowed"].ToString().ToLower() == "true" ? "Enabled" : "Disabled");
rbOnlineLogin.SelectedValue = (dr["onlineUser"].ToString() == "Y" ? "Enabled" : "Disabled");
@ -268,7 +268,7 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
GetStatic.AlertMessage(this, "Customer signature or customer password is required!");
return;
}
string a = Request.Form["txtStreet"];
string trimmedfirstName = firstName.Text.Trim() == "" ? null : firstName.Text.Trim();
string trimmedMiddleName = middleName.Text.Trim() == "" ? null : middleName.Text.Trim();
string trimmedlastName = lastName.Text.Trim() == "" ? null : lastName.Text.Trim();

18
Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.designer.cs
View File

@ -329,15 +329,6 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox zipCode;
/// <summary>
/// txtstreetJapanese control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtstreetJapanese;
/// <summary>
/// city control.
/// </summary>
@ -347,15 +338,6 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox city;
/// <summary>
/// txtStreet control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList txtStreet;
/// <summary>
/// txtsenderCityjapan control.
/// </summary>

Write Preview
Loading…
Cancel
Save