From f894a3b3e8878d7a1114309f1c0631d2d91a22da Mon Sep 17 00:00:00 2001 From: Leeza Baidar Date: Tue, 12 Sep 2023 16:48:17 +0545 Subject: [PATCH] #17305 changes for zipcode --- Swift.DAL/OnlineAgent/OnlineCustomerDao.cs | 2 +- .../CustomerRegistrationNew.aspx.cs | 7 +- .../AgentNew/Customer/CustomerDetails.aspx | 8 +- .../AddCustomerFromAgent.aspx.cs | 8 +- .../EditCustomer.aspx | 89 ++++---- .../EditCustomer.aspx.cs | 21 +- .../EditCustomer.aspx.designer.cs | 72 ------- .../EditCustomerForActivation.aspx.cs | 3 +- .../Operation/EditCustomerForApproval.aspx | 191 +++++++++--------- .../Operation/EditCustomerForApproval.aspx.cs | 17 +- .../EditCustomerForApproval.aspx.designer.cs | 72 ------- .../EditCustomerFromMobile.aspx.cs | 4 +- .../Agent/ApproveCustomer/Manage.aspx.cs | 8 +- Swift.web/Remit/OFACManagement/Import.aspx.cs | 7 - 14 files changed, 188 insertions(+), 321 deletions(-) diff --git a/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs b/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs index 1eca0e6..6c86dc5 100644 --- a/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs +++ b/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs @@ -567,7 +567,7 @@ namespace Swift.DAL.OnlineAgent return ExecuteDataRow(sql); } - public DataTable GetAddressByZipCodeNew(string zipCode, string user, string rowId, string customerId = null, string action = "") + public DataTable GetAddressByZipCodeNew(string zipCode, string user, string rowId, string customerId, string action = "") { string sql = "exec proc_customerBankModify"; sql += " @flag ='customerZip'"; diff --git a/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/CustomerRegistrationNew.aspx.cs b/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/CustomerRegistrationNew.aspx.cs index 3d9d940..1cd6475 100644 --- a/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/CustomerRegistrationNew.aspx.cs +++ b/Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/CustomerRegistrationNew.aspx.cs @@ -216,7 +216,8 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration { string zipCode = Request.Form["zipCode"]; string rowID = Request.Form["RowID"]; - var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID); + string customerId = GetCustomerId(); + var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID, customerId); var json = GetStatic.DataTableToJson(dr); GetStatic.JsonResponse(json, this); Response.End(); @@ -231,6 +232,10 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.CustomerRegistration Response.Write(json); Response.End(); } + protected string GetCustomerId() + { + return GetStatic.ReadQueryString("customerId", ""); + } public static string DataTableToJson(DataTable table) { diff --git a/Swift.web/AgentNew/Customer/CustomerDetails.aspx b/Swift.web/AgentNew/Customer/CustomerDetails.aspx index 612cf3c..5da471a 100644 --- a/Swift.web/AgentNew/Customer/CustomerDetails.aspx +++ b/Swift.web/AgentNew/Customer/CustomerDetails.aspx @@ -255,13 +255,13 @@ - + --%>
- - + +
-
--%> +
diff --git a/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/AddCustomerFromAgent.aspx.cs b/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/AddCustomerFromAgent.aspx.cs index 82d8ac0..fc94ec8 100644 --- a/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/AddCustomerFromAgent.aspx.cs +++ b/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/AddCustomerFromAgent.aspx.cs @@ -218,12 +218,16 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent { string zipCode = Request.Form["zipCode"]; string rowID = Request.Form["RowID"]; - var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID); + string customerId = GetCustomerId(); + var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID, customerId); var json = GetStatic.DataTableToJson(dr); GetStatic.JsonResponse(json, this); Response.End(); } - + protected string GetCustomerId() + { + return GetStatic.ReadQueryString("customerId", ""); + } private void GetCustomerDetails() { string eId = Request.Form["Id"]; diff --git a/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx b/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx index e589c75..652a29e 100644 --- a/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx +++ b/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx @@ -278,7 +278,7 @@ $('#<%=txtCompanyName.ClientID%>').val(dr[0].firstName); $('#<%=genderList.ClientID%>').val(dr[0].gender); $('#<%=countryList.ClientID%>').val(dr[0].country); - $('#<%=addressLine1.ClientID%>').val(dr[0].address); + <%--$('#<%=addressLine1.ClientID%>').val(dr[0].address);--%> $('#<%=zipCode.ClientID%>').val(dr[0].zipCode); $('#<%=city.ClientID%>').val(dr[0].city); $('#<%=email.ClientID%>').val(dr[0].email); @@ -301,25 +301,25 @@ $('#<%=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); + <%-- $('#<%=txtsenderCityjapan.ClientID%>').val(dr[0].cityUnicode); + $('#<%=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'); $('#<%=rbOnlineLogin.ClientID%> [value= ' + (dr[0].onlineUser == "Y" ? "Enabled" : "Disabled") + ']').attr('checked', 'checked'); $('#<%=rbMobileLogin.ClientID%> [value= ' + (dr[0].mobileUser == "Y" ? "Enabled" : "Disabled") + ']').attr('checked', 'checked'); $('#<%=txtRemarks.ClientID%>').val(dr[0].remarks); - $('#<%=ddlSalary.ClientID%>').val(dr[0].monthlyIncome); + <%--$('#<%=ddlSalary.ClientID%>').val(dr[0].monthlyIncome);--%> $('#<%=ddlCustomerType.ClientID%>').val(dr[0].customerType); $('#<%=ddlEmployeeBusType.ClientID%>').val(dr[0].employeeBusinessType); $('#<%=ddlnatureOfCompany.ClientID%>').val(dr[0].natureOfCompany); $('#<%=ddlOrganizationType.ClientID%>').val(dr[0].organizationType); $('#<%=ddlPosition.ClientID%>').val(dr[0].position); - $('#<%=ddlVisaStatus.ClientID%>').val(dr[0].visaStatus); + <%-- $('#<%=ddlVisaStatus.ClientID%>').val(dr[0].visaStatus); $('#<%=ddSourceOfFound.ClientID%>').val(dr[0].sourceOfFund); - $('#<%=ddlState.ClientID%>').val(dr[0].state); + $('#<%=ddlState.ClientID%>').val(dr[0].state);--%> $('#<%=ddlStateHidden.ClientID%>').val(dr[0].state); $('#<%=cityHidden.ClientID%>').val(dr[0].city); @@ -458,10 +458,10 @@ function GetAddressByZipCode() { var zipCodeValue = $("#<%=zipCode.ClientID%>").val(); $("#txtState").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%--$("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); - $("#<%=txtsenderCityjapan.ClientID%>").val(''); - $("#<%=txtstreetJapanese.ClientID%>").val(''); + <%--$("#<%=txtsenderCityjapan.ClientID%>").val(''); + $("#<%=txtstreetJapanese.ClientID%>").val('');--%> var zipCodePattern = /^\d{7}?$/; test = zipCodePattern.test(zipCodeValue); if (!test) { @@ -475,8 +475,8 @@ if (erd !== null) { var dr = jQuery.parseJSON(erd); if (erd == false) { - $("#<%=ddlState.ClientID%>").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%-- $("#<%=ddlState.ClientID%>").val(''); + $("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); $("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); @@ -485,16 +485,16 @@ //$("#tempAddress").html(erd); if (dr[0].errorCode == '0') { - $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID); + <%--$("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID);--%> $("#<%=ddlStateHidden.ClientID%>").val(dr[0].STATE_ID); $("#<%=cityHidden.ClientID%>").val(dr[0].CITY_NAME); - //$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME); + <%--$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME);--%> $("#<%=city.ClientID%>").val(dr[0].CITY_NAME); PopulateAreaDDL(dr); } else { - $("#<%=ddlState.ClientID%>").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%--$("#<%=ddlState.ClientID%>").val(''); + $("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); $("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); @@ -522,8 +522,8 @@ if (erd !== null) { var dr = jQuery.parseJSON(erd); if (erd == false) { - $("#<%=ddlState.ClientID%>").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%--$("#<%=ddlState.ClientID%>").val(''); + $("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); $("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); @@ -532,16 +532,16 @@ //$("#tempAddress").html(erd); if (dr[0].errorCode == '0') { - $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID); + <%--$("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID);--%> $("#<%=ddlStateHidden.ClientID%>").val(dr[0].STATE_ID); $("#<%=cityHidden.ClientID%>").val(dr[0].CITY_NAME); - //$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME); + <%--$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME);--%> $("#<%=city.ClientID%>").val(dr[0].CITY_NAME); PopulateAreaDDL(dr, rowId); } else { - $("#<%=ddlState.ClientID%>").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%--$("#<%=ddlState.ClientID%>").val(''); + $("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); $("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); @@ -769,47 +769,46 @@
- - + +
-
+ <%--
-
+
--%> - --%>
- - + +
-
+ <%--
- <%----%>
-
- --%> + <%-- +
--%>
- - + +
@@ -850,12 +849,12 @@ ControlToValidate="email">
- --%>
@@ -870,13 +869,13 @@
-
+ <%--
-
+
--%>
@@ -902,13 +901,13 @@
-
+ <%--
-
-
+
--%> + <%--
@@ -919,7 +918,7 @@ Above JPY1,300,000
-
+
--%>
diff --git a/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx.cs b/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx.cs index bf1c59f..966768a 100644 --- a/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx.cs +++ b/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx.cs @@ -112,7 +112,8 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent { string zipCode = Request.Form["zipCode"]; string rowID = Request.Form["RowID"]; - var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID); + string customerId = GetCustomerId(); + var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID, customerId); //CustomerAddress _cAddress = new CustomerAddress(); //if (dr != null) @@ -171,11 +172,11 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent _sl.SetDDL(ref ddlCustomerType, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=4700", "valueId", "detailTitle", ddlCustomerType.SelectedValue, ""); _sl.SetDDL(ref ddlOrganizationType, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7002", "valueId", "detailTitle", "", "Select.."); _sl.SetDDL(ref ddlnatureOfCompany, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7003", "valueId", "detailTitle", "", "Select.."); - _sl.SetDDL(ref ddSourceOfFound, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=3900", "valueId", "detailTitle", "", "Select.."); + //_sl.SetDDL(ref ddSourceOfFound, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=3900", "valueId", "detailTitle", "", "Select.."); _sl.SetDDL(ref ddlEmployeeBusType, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7004", "valueId", "detailTitle", "", ""); - _sl.SetDDL(ref ddlVisaStatus, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7005", "valueId", "detailTitle", "", "Select.."); + // _sl.SetDDL(ref ddlVisaStatus, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7005", "valueId", "detailTitle", "", "Select.."); _sl.SetDDL(ref ddlPosition, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7006", "valueId", "detailTitle", "", "Select.."); - _sl.SetDDL(ref ddlState, "EXEC proc_online_dropDownList @flag='state',@countryId='" + countryList.SelectedValue + "'", "stateId", "stateName", "", "Select.."); + //_sl.SetDDL(ref ddlState, "EXEC proc_online_dropDownList @flag='state',@countryId='" + countryList.SelectedValue + "'", "stateId", "stateName", "", "Select.."); _sdd.SetDDL(ref ddlSearchBy, "exec proc_sendPageLoadData @flag='search-cust-by'", "VALUE", "TEXT", "", ""); _sdd.SetStaticDdl(ref ddlDocType, "7009", "", "Select"); } @@ -230,22 +231,22 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent gender = genderList.SelectedValue, customerType = ddlCustomerType.SelectedValue, country = countryList.Text, - address = addressLine1.Text, + // address = addressLine1.Text, zipCode = zipCode.Text, street = Request.Form["ctl00$ContentPlaceHolder1$txtStreet"], AdditionalAddress = txtAdditionalAddress.Text, city = cityHidden.Value, state = ddlStateHidden.Value, - senderCityjapan = txtsenderCityjapan.Text, + //senderCityjapan = txtsenderCityjapan.Text, email = email.Text, - streetJapanese = txtstreetJapanese.Text, + //streetJapanese = txtstreetJapanese.Text, homePhone = phoneNumber.Text, mobile = mobile.Text, - visaStatus = ddlVisaStatus.SelectedValue, + //visaStatus = ddlVisaStatus.SelectedValue, employeeBusinessType = ddlEmployeeBusType.SelectedValue, nativeCountry = nativeCountry.SelectedValue, dob = dob.Text, - sourceOfFound = ddSourceOfFound.SelectedValue, + //sourceOfFound = ddSourceOfFound.SelectedValue, occupation = occupation.Text, telNo = phoneNumber.Text, ipAddress = GetStatic.GetIp(), @@ -267,7 +268,7 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent nameofAuthoPerson = txtNameofAuthoPerson.Text, nameofEmployeer = txtNameofEmployeer.Text, companyName = txtCompanyName.Text, - MonthlyIncome = ddlSalary.SelectedValue, + //MonthlyIncome = ddlSalary.SelectedValue, IsCounterVisited = customerCounterVisit.Checked ? "Y" : "N", customerPassword = customerPassword.Text, agentId = GetStatic.GetAgent().ToInt(), diff --git a/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx.designer.cs b/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx.designer.cs index 4e19980..2790e62 100644 --- a/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx.designer.cs +++ b/Swift.web/AgentNew/Transaction/ApproveCustomerFromAgent/EditCustomer.aspx.designer.cs @@ -302,24 +302,6 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent /// protected global::System.Web.UI.WebControls.TextBox zipCode; - /// - /// ddlState control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlState; - - /// - /// txtstreetJapanese control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtstreetJapanese; - /// /// city control. /// @@ -329,24 +311,6 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent /// protected global::System.Web.UI.WebControls.TextBox city; - /// - /// txtStreet control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList txtStreet; - - /// - /// txtsenderCityjapan control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtsenderCityjapan; - /// /// txtAdditionalAddress control. /// @@ -410,15 +374,6 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent /// protected global::System.Web.UI.WebControls.RegularExpressionValidator rev1; - /// - /// addressLine1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox addressLine1; - /// /// phoneNumber control. /// @@ -437,15 +392,6 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent /// protected global::System.Web.UI.WebControls.TextBox mobile; - /// - /// ddlVisaStatus control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlVisaStatus; - /// /// ddlEmployeeBusType control. /// @@ -482,24 +428,6 @@ namespace Swift.web.AgentNew.Transaction.ApproveCustomerFromAgent /// protected global::System.Web.UI.WebControls.TextBox occupationText; - /// - /// ddSourceOfFound control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddSourceOfFound; - - /// - /// ddlSalary control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlSalary; - /// /// idType control. /// diff --git a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs index a70a668..14eb5e8 100644 --- a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs +++ b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs @@ -111,7 +111,8 @@ namespace Swift.web.MobileRemit.Admin.Operation { string zipCode = Request.Form["zipCode"]; string rowID = Request.Form["RowID"]; - var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID); + string customerId = GetCustomerId(); + var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID, customerId); var json = GetStatic.DataTableToJson(dr); diff --git a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx index 087438d..fd719d3 100644 --- a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx +++ b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx @@ -121,12 +121,12 @@ } }); - $("#<%=zipCode.ClientID%>").keyup(function () { + <%--$("#<%=zipCode.ClientID%>").keyup(function () { var len = $(this).val().length; if (len == '7') { GetAddressByZipCode(); } - }); + });--%> $('#<%=ddlSearchBy.ClientID%>').change(function () { @@ -557,6 +557,7 @@ function ParseCustomerData(response) { var dr = jQuery.parseJSON(response); if (dr != null) { + debugger; <%-- $('#<%=firstName.ClientID%>').attr('readonly', 'readonly'); $('#<%=middleName.ClientID%>').attr('readonly', 'readonly'); $('#<%=lastName.ClientID%>').attr('readonly', 'readonly'); @@ -576,7 +577,7 @@ $('#<%=txtCompanyName.ClientID%>').val(dr[0].firstName); $('#<%=genderList.ClientID%>').val(dr[0].gender); $('#<%=countryList.ClientID%>').val(dr[0].country); - $('#<%=addressLine1.ClientID%>').val(dr[0].address); + <%--$('#<%=addressLine1.ClientID%>').val(dr[0].address);--%> $('#<%=zipCode.ClientID%>').val(dr[0].zipCode); $('#<%=city.ClientID%>').val(dr[0].city); $('#<%=email.ClientID%>').val(dr[0].email); @@ -619,28 +620,28 @@ $('#<%=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); + <%--$('#<%=txtsenderCityjapan.ClientID%>').val(dr[0].cityUnicode); + $('#<%=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'); $('#<%=rbOnlineLogin.ClientID%> [value= ' + (dr[0].onlineUser == "Y" ? "Enabled" : "Disabled") + ']').attr('checked', 'checked'); $('#<%=rbMobileLogin.ClientID%> [value= ' + (dr[0].mobileUser == "Y" ? "Enabled" : "Disabled") + ']').attr('checked', 'checked'); $('#<%=txtRemarks.ClientID%>').val(dr[0].remarks); - $('#<%=ddlSalary.ClientID%>').val(dr[0].monthlyIncome); + <%--$('#<%=ddlSalary.ClientID%>').val(dr[0].monthlyIncome);--%> $('#<%=ddlCustomerType.ClientID%>').val(dr[0].customerType); $('#<%=ddlEmployeeBusType.ClientID%>').val(dr[0].employeeBusinessType); $('#<%=ddlnatureOfCompany.ClientID%>').val(dr[0].natureOfCompany); $('#<%=ddlOrganizationType.ClientID%>').val(dr[0].organizationType); $('#<%=ddlPosition.ClientID%>').val(dr[0].position); - $('#<%=ddlVisaStatus.ClientID%>').val(dr[0].visaStatus); - $('#<%=ddlState.ClientID%>').val(dr[0].state); + <%--$('#<%=ddlVisaStatus.ClientID%>').val(dr[0].visaStatus);--%> + <%-- $('#<%=ddlState.ClientID%>').val(dr[0].state);--%> $('#<%=ddlStateHidden.ClientID%>').val(dr[0].state); $('#<%=cityHidden.ClientID%>').val(dr[0].city); $('#<%=verifyRemarks.ClientID%>').val(dr[0].verifyRemarks); - $('#<%=txtIntroducer.ClientID%>').val(dr[0].introducer); + <%--$('#<%=txtIntroducer.ClientID%>').val(dr[0].introducer);--%> $('#<%=email.ClientID%>').Enabled = (dr[0].isTxnMade == "Y") ? false : true; $('#<%=emailConfirm.ClientID%>').Enabled = (dr[0].isTxnMade == "Y") ? false : true; @@ -882,47 +883,51 @@ } function GetAddressByZipCode() { + debugger var zipCodeValue = $("#<%=zipCode.ClientID%>").val(); $("#txtState").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%--$("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); - $("#<%=txtsenderCityjapan.ClientID%>").val(''); - $("#<%=txtstreetJapanese.ClientID%>").val(''); - var zipCodePattern = /^\d{7}?$/; + <%--$("#<%=txtsenderCityjapan.ClientID%>").val(''); + $("#<%=txtstreetJapanese.ClientID%>").val('');--%> + <%--var zipCodePattern = /^\d{7}?$/; test = zipCodePattern.test(zipCodeValue); if (!test) { $("#<%=zipCode.ClientID%>").val(''); $("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); return alert("Please Enter Valid Zip Code(XXXXXXX)"); - } + }--%> var dataToSend = { MethodName: 'GetAddressDetailsByZipCode', zipCode: zipCodeValue }; // $.post('/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx', dataToSend, function (erd) { $.post('/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx', dataToSend, function (erd) { if (erd !== null) { var dr = jQuery.parseJSON(erd); if (erd == false) { - $("#<%=ddlState.ClientID%>").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%-- $("#<%=ddlState.ClientID%>").val(''); + $("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); - $("#<%=zipCode.ClientID%>").focus(); + $("#<%=zipCode.ClientID%>").val(dr[0].ZIP_CODE); + $("#<%=txtAdditionalAddress.ClientID%>").val(dr[0].STREET_NAME); + <%-- $("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); - return alert("Please Enter Valid Zip Code(XXXXXXX)"); + return alert("Please Enter Valid Zip Code(XXXXXXX)");--%> } //$("#tempAddress").html(erd); if (dr[0].errorCode == '0') { /* debugger;*/ - $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID); + <%-- $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID);--%> $("#<%=ddlStateHidden.ClientID%>").val(dr[0].STATE_ID); $("#<%=cityHidden.ClientID%>").val(dr[0].CITY_NAME); - //$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME); $("#<%=city.ClientID%>").val(dr[0].CITY_NAME); - PopulateAreaDDL(dr); + $("#<%=zipCode.ClientID%>").val(dr[0].ZIP_CODE); + $("#<%=txtAdditionalAddress.ClientID%>").val(dr[0].STREET_NAME); + /*PopulateAreaDDL(dr);*/ } else { - $("#<%=ddlState.ClientID%>").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%-- $("#<%=ddlState.ClientID%>").val(''); + $("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); $("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); @@ -945,31 +950,34 @@ } function GetAddressByRowID(rowId, zipCode) { + debugger var dataToSend = { MethodName: 'GetAddressDetailsByZipCode', zipCode: zipCode, RowID: rowId }; $.post('', dataToSend, function (erd) { if (erd !== null) { var dr = jQuery.parseJSON(erd); if (erd == false) { - $("#<%=ddlState.ClientID%>").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%--$("#<%=ddlState.ClientID%>").val(''); + $("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); - $("#<%=zipCode.ClientID%>").focus(); + $("#<%=txtAdditionalAddress.ClientID%>").val(dr[0].STREET_NAME); + <%--$("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); - return alert("Please Enter Valid Zip Code(XXXXXXX)"); + return alert("Please Enter Valid Zip Code(XXXXXXX)");--%> } //$("#tempAddress").html(erd); if (dr[0].errorCode == '0') { - $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID); + <%-- $("#<%=ddlState.ClientID%>").val(dr[0].STATE_ID);--%> $("#<%=ddlStateHidden.ClientID%>").val(dr[0].STATE_ID); $("#<%=cityHidden.ClientID%>").val(dr[0].CITY_NAME); - //$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME); + <%--$("#<%=txtStreet.ClientID%>").val(dr[0].STREET_NAME);--%> $("#<%=city.ClientID%>").val(dr[0].CITY_NAME); - PopulateAreaDDL(dr, rowId); + $("#<%=txtAdditionalAddress.ClientID%>").val(dr[0].STREET_NAME); + /*PopulateAreaDDL(dr, rowId);*/ } else { - $("#<%=ddlState.ClientID%>").val(''); - $("#<%=txtStreet.ClientID%>").val(''); + <%-- $("#<%=ddlState.ClientID%>").val(''); + $("#<%=txtStreet.ClientID%>").val('');--%> $("#<%=city.ClientID%>").val(''); $("#<%=zipCode.ClientID%>").focus(); $("#<%=zipCode.ClientID%>").attr("style", "display:block; background:#FFCCD2"); @@ -981,42 +989,42 @@ }); } - function PopulateAreaDDL(data, selectedValue) { - //debugger; - var ddl = document.getElementById("txtStreet"); - $(ddl).empty(); - - var option, selValue = ''; - - if (selectedValue) { - selValue = selectedValue; - } - - 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; - $('#txtstreetJapanese').val(data[i].STREET_NAME); - - if (selValue.toString() === option.value) { - option.selected = true; - } - - try { - ddl.options.add(option); - } - catch (e) { - alert(e); - } - } - } + //function PopulateAreaDDL(data, selectedValue) { + // //debugger; + // var ddl = document.getElementById("txtStreet"); + // $(ddl).empty(); + + // var option, selValue = ''; + + // if (selectedValue) { + // selValue = selectedValue; + // } + + // 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; + // $('#txtstreetJapanese').val(data[i].STREET_NAME); + + // if (selValue.toString() === option.value) { + // option.selected = true; + // } + + // try { + // ddl.options.add(option); + // } + // catch (e) { + // alert(e); + // } + // } + //} @@ -1211,48 +1219,47 @@
- - + +
-
+ <%--
-
+
--%> - --%>
- - + +
-
+ <%--
- <%----%>
-
- --%> + <%-- +
--%>
- + - +
@@ -1293,13 +1300,7 @@ ControlToValidate="email"> - - +
@@ -1313,13 +1314,13 @@
-
+ <%--
-
+
--%>
@@ -1351,7 +1352,7 @@
-
+ <%--
@@ -1362,7 +1363,7 @@
-
+
--%>
diff --git a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.cs b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.cs index 86cf433..669125c 100644 --- a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.cs +++ b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.cs @@ -189,7 +189,8 @@ namespace Swift.web.MobileRemit.Admin.Operation { string zipCode = Request.Form["zipCode"]; string rowID = Request.Form["RowID"]; - var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID); + string customerId = GetCustomerId(); + var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID, customerId); //CustomerAddress _cAddress = new CustomerAddress(); //if (dr != null) @@ -296,9 +297,9 @@ namespace Swift.web.MobileRemit.Admin.Operation _sl.SetDDL(ref ddlOrganizationType, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7002", "valueId", "detailTitle", "", "Select.."); _sl.SetDDL(ref ddlnatureOfCompany, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7003", "valueId", "detailTitle", "", "Select.."); _sl.SetDDL(ref ddlEmployeeBusType, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7004", "valueId", "detailTitle", "", ""); - _sl.SetDDL(ref ddlVisaStatus, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7005", "valueId", "detailTitle", "", "Select.."); + //_sl.SetDDL(ref ddlVisaStatus, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7005", "valueId", "detailTitle", "", "Select.."); _sl.SetDDL(ref ddlPosition, "EXEC proc_online_dropDownList @flag='dropdownList',@user='" + GetStatic.GetUser() + "',@parentId=7006", "valueId", "detailTitle", "", "Select.."); - _sl.SetDDL(ref ddlState, "EXEC proc_online_dropDownList @flag='state',@countryId='" + countryList.SelectedValue + "'", "stateId", "stateName", "", "Select.."); + //_sl.SetDDL(ref ddlState, "EXEC proc_online_dropDownList @flag='state',@countryId='" + countryList.SelectedValue + "'", "stateId", "stateName", "", "Select.."); _sdd.SetDDL(ref ddlSearchBy, "exec proc_sendPageLoadData @flag='search-cust-by'", "VALUE", "TEXT", "", ""); _sdd.SetStaticDdl(ref ddlDocType, "7009", "", "Select"); } @@ -356,18 +357,18 @@ namespace Swift.web.MobileRemit.Admin.Operation gender = genderList.SelectedValue, customerType = ddlCustomerType.SelectedValue, country = countryList.Text, - address = addressLine1.Text, + //address = addressLine1.Text, zipCode = zipCode.Text, street = Request.Form["txtStreet"], AdditionalAddress = txtAdditionalAddress.Text, city = cityHidden.Value, state = ddlStateHidden.Value, - senderCityjapan = txtsenderCityjapan.Text, + //senderCityjapan = txtsenderCityjapan.Text, email = email.Text, - streetJapanese = txtstreetJapanese.Text, + //streetJapanese = txtstreetJapanese.Text, homePhone = phoneNumber.Text, mobile = mobile.Text, - visaStatus = ddlVisaStatus.SelectedValue, + //visaStatus = ddlVisaStatus.SelectedValue, employeeBusinessType = ddlEmployeeBusType.SelectedValue, nativeCountry = nativeCountry.SelectedValue, dob = dob.Text, @@ -392,7 +393,7 @@ namespace Swift.web.MobileRemit.Admin.Operation nameofAuthoPerson = txtNameofAuthoPerson.Text, nameofEmployeer = txtNameofEmployeer.Text, companyName = txtCompanyName.Text, - MonthlyIncome = ddlSalary.Text, + //MonthlyIncome = ddlSalary.Text, IsCounterVisited = customerCounterVisit.Checked ? "Y" : "N", customerPassword = customerPassword.Text, agentId = GetStatic.GetAgent().ToInt(), diff --git a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.designer.cs b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.designer.cs index 7b675fd..84fa4bb 100644 --- a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.designer.cs +++ b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx.designer.cs @@ -365,24 +365,6 @@ namespace Swift.web.MobileRemit.Admin.Operation /// protected global::System.Web.UI.WebControls.TextBox zipCode; - /// - /// ddlState control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlState; - - /// - /// txtstreetJapanese control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtstreetJapanese; - /// /// city control. /// @@ -392,24 +374,6 @@ namespace Swift.web.MobileRemit.Admin.Operation /// protected global::System.Web.UI.WebControls.TextBox city; - /// - /// txtStreet control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList txtStreet; - - /// - /// txtsenderCityjapan control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtsenderCityjapan; - /// /// txtAdditionalAddress control. /// @@ -473,15 +437,6 @@ namespace Swift.web.MobileRemit.Admin.Operation /// protected global::System.Web.UI.WebControls.RegularExpressionValidator rev1; - /// - /// addressLine1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox addressLine1; - /// /// phoneNumber control. /// @@ -500,15 +455,6 @@ namespace Swift.web.MobileRemit.Admin.Operation /// protected global::System.Web.UI.WebControls.TextBox mobile; - /// - /// ddlVisaStatus control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlVisaStatus; - /// /// ddlEmployeeBusType control. /// @@ -554,24 +500,6 @@ namespace Swift.web.MobileRemit.Admin.Operation /// protected global::System.Web.UI.WebControls.DropDownList ddSourceOfFound; - /// - /// ddlSalary control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox ddlSalary; - - /// - /// txtIntroducer control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtIntroducer; - /// /// idType control. /// diff --git a/Swift.web/MobileRemit/Agent/ApproveCustomer/EditCustomerFromMobile.aspx.cs b/Swift.web/MobileRemit/Agent/ApproveCustomer/EditCustomerFromMobile.aspx.cs index a3d1527..25e4a57 100644 --- a/Swift.web/MobileRemit/Agent/ApproveCustomer/EditCustomerFromMobile.aspx.cs +++ b/Swift.web/MobileRemit/Agent/ApproveCustomer/EditCustomerFromMobile.aspx.cs @@ -114,11 +114,13 @@ namespace Swift.web.MobileRemit.Agent.ApproveCustomer { return (GetStatic.GetUserType() == "HO") ? functionIdAdmin : functionIdAgent; } + private void GetAddressDetailsByZipCode() { string zipCode = Request.Form["zipCode"]; string rowID = Request.Form["RowID"]; - var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID); + string customerId = GetCustomerId(); + var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID, customerId); //CustomerAddress _cAddress = new CustomerAddress(); //if (dr != null) diff --git a/Swift.web/MobileRemit/Agent/ApproveCustomer/Manage.aspx.cs b/Swift.web/MobileRemit/Agent/ApproveCustomer/Manage.aspx.cs index db3e1db..346b40f 100644 --- a/Swift.web/MobileRemit/Agent/ApproveCustomer/Manage.aspx.cs +++ b/Swift.web/MobileRemit/Agent/ApproveCustomer/Manage.aspx.cs @@ -218,12 +218,16 @@ namespace Swift.web.MobileRemit.Agent.ApproveCustomer { string zipCode = Request.Form["zipCode"]; string rowID = Request.Form["RowID"]; - var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID); + string customerId = GetCustomerId(); + var dr = _cd.GetAddressByZipCodeNew(zipCode, GetStatic.GetUser(), rowID, customerId); var json = GetStatic.DataTableToJson(dr); GetStatic.JsonResponse(json, this); Response.End(); } - + protected string GetCustomerId() + { + return GetStatic.ReadQueryString("customerId", ""); + } private void GetCustomerDetails() { string eId = Request.Form["Id"]; diff --git a/Swift.web/Remit/OFACManagement/Import.aspx.cs b/Swift.web/Remit/OFACManagement/Import.aspx.cs index a483ef7..cf6a4e2 100644 --- a/Swift.web/Remit/OFACManagement/Import.aspx.cs +++ b/Swift.web/Remit/OFACManagement/Import.aspx.cs @@ -339,13 +339,6 @@ namespace Swift.web.Remit.OFACManagement } } catch (Exception ex) - { - GetStatic.AlertMessage(this, $"Technical Error: { GetStatic.LogError(ex).Id}"); - } - } - } - } - catch (Exception ex) { GetStatic.AlertMessage(this, $"Technical Error: { GetStatic.LogError(ex).Id}"); }