From a57ed4808cef8bce4cb45905f2326ce7aafe3e36 Mon Sep 17 00:00:00 2001 From: gagan Date: Mon, 17 Aug 2020 05:28:46 +0000 Subject: [PATCH] --- .../Sp/proc_jme_agent_system_customer.sql | 5 +++-- .../PublishProfiles/FolderProfile.pubxml.user | 20 +++++++++---------- .../Scripts/Customer/CustomerRegistration.js | 2 ++ .../Scripts/Receiver/ReceiverRegistation.js | 12 ++++++++++- .../Receiver/ReceiverRegistrationNew.js | 9 ++++++++- .../BenificiaryRegistration/Manage.aspx.cs | 3 +++ .../PrintBeneficiaryDetails.aspx | 10 +++++++++- .../PrintBeneficiaryDetails.aspx.cs | 1 + .../PrintBeneficiaryDetails.aspx.designer.cs | 9 +++++++++ .../WebPages/CustomerRegistration/Manage.aspx | 8 +++++++- .../CustomerRegistration/Manage.aspx.cs | 1 + .../Manage.aspx.designer.cs | 9 +++++++++ .../CustomerRegistration/PrintDetails.aspx | 6 +++++- .../CustomerRegistration/PrintDetails.aspx.cs | 1 + .../PrintDetails.aspx.designer.cs | 9 +++++++++ .../WebPages/SendTxn/SendTxnRequest.aspx | 2 +- 16 files changed, 89 insertions(+), 18 deletions(-) diff --git a/Database/Sp/proc_jme_agent_system_customer.sql b/Database/Sp/proc_jme_agent_system_customer.sql index 27315be..1c80a2f 100644 --- a/Database/Sp/proc_jme_agent_system_customer.sql +++ b/Database/Sp/proc_jme_agent_system_customer.sql @@ -127,6 +127,7 @@ alter PROC [dbo].[proc_jme_agent_system_customer] @recReceiverAccountNo VARCHAR(40) = NULL, @recRemarks NVARCHAR(800) = NULL, @recPurposeOfRemit VARCHAR(100) = NULL, + @purposeOfRemitanceOther VARCHAR(100) = NULL, @recFromDate NVARCHAR(20) = NULL, @recToDate NVARCHAR(20) = NULL, @recOtherRelationDesc VARCHAR(20) = NULL, @@ -331,12 +332,12 @@ BEGIN (fullname ,membershipId ,customerId ,firstName ,middleName ,lastName1 ,lastName2 ,country ,NativeCountry,[address] ,[state] ,zipCode ,city ,email , homePhone ,workPhone ,mobile ,relationship ,receiverType ,idType ,idNumber ,placeOfIssue ,paymentMode ,bankLocation ,payOutPartner , - bankName ,receiverAccountNo ,remarks ,purposeOfRemit ,createdBy ,createdDate,otherRelationDesc,agentId + bankName ,receiverAccountNo ,remarks ,purposeOfRemit ,createdBy ,createdDate,otherRelationDesc,agentId,purposeOther ) SELECT ISNULL(@firstName,'') + ISNULL(' ' + @middleName,'') +ISNULL(' ' + @lastName1,''), @membershipId ,@customerId ,@recFirstName ,@recMiddleName ,@recLastName1 ,@recLastName2 ,@recCountry ,@recNativeCountry,@recAddress ,@recState ,@recZipCode ,@recCity ,@recEmail , @recHomePhone ,@recWorkPhone ,@recmobile ,@RELATION ,@recReceiverType ,@recIdType ,@recIdNumber ,@recPlaceOfIssue ,@recPaymentMode ,@recBankLocation ,@recPayOutPartner , - @recBankName ,@recReceiverAccountNo ,@recRemarks ,@PURPOSEID ,@user ,GETDATE(),@recOtherRelationDesc,@loginBranchId + @recBankName ,@recReceiverAccountNo ,@recRemarks ,@PURPOSEID ,@user ,GETDATE(),@recOtherRelationDesc,@loginBranchId ,@purposeOfRemitanceOther SET @receiverId=SCOPE_IDENTITY(); diff --git a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user index ca5a400..240e85c 100644 --- a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -55,10 +55,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:02 - 08/17/2020 08:56:24 + 08/17/2020 10:06:54 - 08/17/2020 08:56:24 + 08/17/2020 10:06:54 08/11/2020 16:56:02 @@ -784,7 +784,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:08 - 08/16/2020 13:04:38 + 08/17/2020 10:05:18 08/12/2020 14:27:30 @@ -853,10 +853,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:08 - 08/16/2020 13:01:09 + 08/17/2020 10:05:23 - 08/16/2020 13:03:22 + 08/17/2020 09:31:45 08/11/2020 16:56:08 @@ -1309,10 +1309,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/12/2020 15:58:42 - 08/14/2020 10:02:20 + 08/17/2020 09:30:35 - 08/14/2020 09:31:14 + 08/17/2020 09:57:44 08/11/2020 16:56:08 @@ -1321,7 +1321,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/16/2020 11:01:08 - 08/16/2020 11:14:22 + 08/17/2020 09:53:41 08/11/2020 16:56:09 @@ -1339,10 +1339,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt 08/11/2020 16:56:09 - 08/16/2020 12:33:59 + 08/17/2020 09:52:49 - 08/14/2020 08:18:55 + 08/17/2020 08:59:55 07/31/2020 10:42:21 diff --git a/JMEAgentSystem/Scripts/Customer/CustomerRegistration.js b/JMEAgentSystem/Scripts/Customer/CustomerRegistration.js index 95f877f..148a03f 100644 --- a/JMEAgentSystem/Scripts/Customer/CustomerRegistration.js +++ b/JMEAgentSystem/Scripts/Customer/CustomerRegistration.js @@ -2,8 +2,10 @@ $("#" + mId + "occupation").prop("disabled", true); $("#" + mId + "recReceiverAccountNo").hide(); $("#" + mId + "agentBankBranchDiv").hide(); + //PopulateCustomerData(); //PopulateBenifiairyData(); + $("#" + mId + "ExpireDate").click(function () { $("#" + mId + "ExpireDate").val(""); }); diff --git a/JMEAgentSystem/Scripts/Receiver/ReceiverRegistation.js b/JMEAgentSystem/Scripts/Receiver/ReceiverRegistation.js index e38aaf8..bb2a20e 100644 --- a/JMEAgentSystem/Scripts/Receiver/ReceiverRegistation.js +++ b/JMEAgentSystem/Scripts/Receiver/ReceiverRegistation.js @@ -3,11 +3,21 @@ $("#" + mId + "register").prop("disabled", true); $("#" + mId + "otherRelationDiv").hide(); $("#divOccupation").hide(); - divOccupation + + //divOccupation if (a == "true") { $("#" + mId + "hideSearchDivVal").hide(); $(".main-nav").hide(); } + $("#" + mId + "recDdlPurposeOfRemitance").on("change", function () { + debugger + let purposeValue = $("#" + mId + "recDdlPurposeOfRemitance option:selected").val(); + if (purposeValue == '11347') { + $("#purposeOtherDiv").show(); + } else { + $("#purposeOtherDiv").hide(); + } + }); $("#" + mId + "register").click(function () { debugger diff --git a/JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js b/JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js index 083f07b..c93d699 100644 --- a/JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js +++ b/JMEAgentSystem/Scripts/Receiver/ReceiverRegistrationNew.js @@ -20,7 +20,7 @@ $(document).ready(function () { }); $("#" + mId + "ddlPurposeOfRemitance").on("change", function () { debugger - let purposeValue = $("#" + mId + "purpose option:selected").val(); + let purposeValue = $("#" + mId + "ddlPurposeOfRemitance option:selected").val(); if (purposeValue == '11347') { $("#purposeOtherDiv").show(); } else { @@ -291,6 +291,12 @@ function CheckFormValidation(e) { if (idTypeVal !== null && idTypeVal !== "" && idTypeVal !== "0") { reqField += "ddlIdType,txtIdValue,"; } + let purposeValue = $("#" + mId + "ddlPurposeOfRemitance option:selected").val(); + if (purposeValue == '11347') { + reqField += "purposeOther,"; + } + + if (ValidRequiredField(reqField) === false) { return false; } @@ -322,6 +328,7 @@ function save() { TypeId: $("#" + mId + "ddlIdType option:selected").val(), TypeValue: $("#" + mId + "txtIdValue").val(), PurposeOfRemitance: $("#" + mId + "ddlPurposeOfRemitance").val(), + OtherPrupose: $("#" + mId + "purposeOther").val(), BankLocation: $("#" + mId + "DDLBankLocation").val(), BankName: $("#" + mId + "txtBankName").val(), BenificaryAc: $("#" + mId + "txtBenificaryAc").val(), diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs index 9ac4317..c232925 100644 --- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs +++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs @@ -161,6 +161,7 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration benificiar.TypeId = Request.Form["TypeId"].ToString(); benificiar.TypeValue = Request.Form["TypeValue"].ToString(); benificiar.PurposeOfRemitance = Request.Form["PurposeOfRemitance"].ToString(); + benificiar.OtherPurpose = Request.Form["OtherPrupose"].ToString(); benificiar.PaymentMode = Request.Form["PaymentMode"].ToString(); benificiar.PayoutPatner = Request.Form["PayoutPatner"].ToString(); benificiar.BenificaryAc = Request.Form["BenificaryAc"].ToString(); @@ -309,6 +310,7 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration ddlIdType.SelectedValue = dr["idType"].ToString(); txtIdValue.Text = dr["idNumber"].ToString(); ddlPurposeOfRemitance.SelectedValue = dr["purposeOfRemit"].ToString(); + purposeOther.Text = dr["otherPurpose"].ToString(); DDLBankLocation.SelectedValue = dr["bankLocation"].ToString(); txtBankName.Text = dr["bankName"].ToString(); txtBenificaryAc.Text = dr["receiverAccountNo"].ToString(); @@ -362,6 +364,7 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration TypeId = ddlIdType.SelectedValue, TypeValue = txtIdValue.Text, PurposeOfRemitance = ddlPurposeOfRemitance.SelectedItem.Text, + OtherPurpose = purposeOther.Text, PaymentMode = ddlPaymentMode.SelectedValue, PayoutPatner = ddlPayoutPatner.SelectedValue, BankLocation = DDLBankLocation.SelectedValue, diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx index c3212bf..241c68d 100644 --- a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx +++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx @@ -65,8 +65,13 @@ Purpose Of Remittance: + Other Purpose of Remittance: + + + + Payment Mode: - + Agent/Bank: @@ -232,6 +237,9 @@ .table-borderless th { border: 0; } + .detailInfo{ + font-size:11px; + } } diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.cs b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.cs index 004cb79..20a06cf 100644 --- a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.cs +++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.cs @@ -69,6 +69,7 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration recRelationship.InnerText = dr["relationship"].ToString(); recOtherRelationDescription.InnerText = dr["otherRelationDesc"].ToString(); recPurposeOfRemittance.InnerText = dr["purposeOfRemit"].ToString(); + otherPurpose.InnerText = dr["otherPurpose"].ToString(); recPaymentMode.InnerText = dr["paymentMode"].ToString(); pagent.InnerText = dr["payOutPartner"].ToString(); recAccountNumber.InnerText = dr["receiverAccountNo"].ToString(); diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.designer.cs b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.designer.cs index 57dbec4..ef5747c 100644 --- a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.designer.cs +++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.designer.cs @@ -147,6 +147,15 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration { /// protected global::System.Web.UI.HtmlControls.HtmlTableCell recPurposeOfRemittance; + /// + /// otherPurpose control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlTableCell otherPurpose; + /// /// recPaymentMode control. /// diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx index a1b41c8..232d088 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx +++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx @@ -428,6 +428,12 @@ +
@@ -783,7 +789,7 @@ - + diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs index 0eb539c..e9e1ebe 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs +++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs @@ -493,6 +493,7 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration benificiar.TypeId = recDdlIdType.SelectedValue; benificiar.TypeValue = recTxtIdValue.Text; benificiar.PurposeOfRemitance = recDdlPurposeOfRemitance.SelectedValue; + benificiar.OtherPurpose = purposeOther.Text; benificiar.PaymentMode = hddPaymentMode.Value; benificiar.PayoutPatner = hddBankId.Value; benificiar.BenificaryAc = recTxtBenificaryAc.Text; diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs index ec88217..0213b9b 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs +++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs @@ -561,6 +561,15 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { /// protected global::System.Web.UI.WebControls.DropDownList recDdlPurposeOfRemitance; + /// + /// purposeOther control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox purposeOther; + /// /// recDdlPaymentMode control. /// diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx index 37edbf9..5229dd5 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx +++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx @@ -169,8 +169,12 @@ Purpose Of Remittance: + Other Purpose Of Remittance: + + + Payment Mode: - + Agent/Bank: diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs index d913a0a..f41f818 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs +++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs @@ -105,6 +105,7 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration recRelationship.InnerText = dr["relationship"].ToString(); recOtherRelationDescription.InnerText = dr["otherRelationDesc"].ToString(); recPurposeOfRemittance.InnerText = dr["purposeOfRemit"].ToString(); + otherPurpose.InnerText = dr["otherPurpose"].ToString(); recPaymentMode.InnerText = dr["paymentMode"].ToString(); pagent.InnerText = dr["payOutPartner"].ToString(); recAccountNumber.InnerText = dr["receiverAccountNo"].ToString(); diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs index bd8b775..298cb9f 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs +++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs @@ -399,6 +399,15 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration { /// protected global::System.Web.UI.HtmlControls.HtmlTableCell recPurposeOfRemittance; + /// + /// otherPurpose control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlTableCell otherPurpose; + /// /// recPaymentMode control. /// diff --git a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx index 8019514..1bb82d7 100644 --- a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx +++ b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx @@ -39,7 +39,7 @@
- +