4 years ago · a57ed4808c
16 changed files with 89 additions and 18 deletions
--- 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();						

--- 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
      <publishTime>08/11/2020 16:56:02</publishTime>
    </File>
    <File Include="bin/JMEAgentSystem.dll">
-      <publishTime>08/17/2020 08:56:24</publishTime>
+      <publishTime>08/17/2020 10:06:54</publishTime>
    </File>
    <File Include="bin/JMEAgentSystem.pdb">
-      <publishTime>08/17/2020 08:56:24</publishTime>
+      <publishTime>08/17/2020 10:06:54</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNet.FriendlyUrls.dll">
      <publishTime>08/11/2020 16:56:02</publishTime>
@ -784,7 +784,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
      <publishTime>08/11/2020 16:56:08</publishTime>
    </File>
    <File Include="Scripts/Customer/CustomerRegistration.js">
-      <publishTime>08/16/2020 13:04:38</publishTime>
+      <publishTime>08/17/2020 10:05:18</publishTime>
    </File>
    <File Include="Scripts/Customer/Document.js">
      <publishTime>08/12/2020 14:27:30</publishTime>
@ -853,10 +853,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt
      <publishTime>08/11/2020 16:56:08</publishTime>
    </File>
    <File Include="Scripts/Receiver/ReceiverRegistation.js">
-      <publishTime>08/16/2020 13:01:09</publishTime>
+      <publishTime>08/17/2020 10:05:23</publishTime>
    </File>
    <File Include="Scripts/Receiver/ReceiverRegistrationNew.js">
-      <publishTime>08/16/2020 13:03:22</publishTime>
+      <publishTime>08/17/2020 09:31:45</publishTime>
    </File>
    <File Include="Scripts/ReferralReports/DashBoard.js">
      <publishTime>08/11/2020 16:56:08</publishTime>
@ -1309,10 +1309,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt
      <publishTime>08/12/2020 15:58:42</publishTime>
    </File>
    <File Include="WebPages/BenificiaryRegistration/Manage.aspx">
-      <publishTime>08/14/2020 10:02:20</publishTime>
+      <publishTime>08/17/2020 09:30:35</publishTime>
    </File>
    <File Include="WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx">
-      <publishTime>08/14/2020 09:31:14</publishTime>
+      <publishTime>08/17/2020 09:57:44</publishTime>
    </File>
    <File Include="WebPages/Contact.aspx">
      <publishTime>08/11/2020 16:56:08</publishTime>
@ -1321,7 +1321,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
      <publishTime>08/16/2020 11:01:08</publishTime>
    </File>
    <File Include="WebPages/CustomerRegistration/PrintDetails.aspx">
-      <publishTime>08/16/2020 11:14:22</publishTime>
+      <publishTime>08/17/2020 09:53:41</publishTime>
    </File>
    <File Include="WebPages/Default.aspx">
      <publishTime>08/11/2020 16:56:09</publishTime>
@ -1339,10 +1339,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt
      <publishTime>08/11/2020 16:56:09</publishTime>
    </File>
    <File Include="WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx">
-      <publishTime>08/16/2020 12:33:59</publishTime>
+      <publishTime>08/17/2020 09:52:49</publishTime>
    </File>
    <File Include="WebPages/SendTxn/SendTxnRequest.aspx">
-      <publishTime>08/14/2020 08:18:55</publishTime>
+      <publishTime>08/17/2020 08:59:55</publishTime>
    </File>
    <File Include="WebPages/SendTxn/SendV1.aspx">
      <publishTime>07/31/2020 10:42:21</publishTime>
--- 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("");
    });
--- 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
--- 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(),
--- 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,
--- a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx
+++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx
@ -65,8 +65,13 @@
                <tr>
                    <td style="white-space: nowrap" class="tg-fymr">Purpose Of Remittance:</td>
                    <td colspan="2" class="tg-0pky" runat="server" id="recPurposeOfRemittance"></td>
+                    <td class="tg-fymr">Other Purpose of Remittance:</td>
+                    <td colspan="2" class="tg-0pky" runat="server" id="otherPurpose"></td>
+                </tr>
+
+                <tr>
                    <td class="tg-fymr">Payment Mode:</td>
-                    <td colspan="2" class="tg-0pky" runat="server" id="recPaymentMode"></td>
+                    <td class="tg-0pky" runat="server" id="recPaymentMode" colspan="5"></td>
                </tr>
                <tr>
                    <td style="white-space: nowrap" class="tg-fymr">Agent/Bank:</td>
@ -232,6 +237,9 @@
            .table-borderless th {
                border: 0;
            }
+            .detailInfo{
+                font-size:11px;
+            }
        }
    </style>
 </asp:Content>
--- 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();
--- a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx.designer.cs
@ -147,6 +147,15 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration {
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTableCell recPurposeOfRemittance;
        
+        /// <summary>
+        /// otherPurpose control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableCell otherPurpose;
+        
        /// <summary>
        /// recPaymentMode control.
        /// </summary>
--- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx
@ -428,6 +428,12 @@
                                                    </asp:DropDownList>
                                                </div>
                                            </div>
+                                            <div class="col-md-4 col-sm-4" id="purposeOtherDiv" style="display: none;">
+                                                <div class="form-group">
+                                                    <label>Purpose Other:<span class="errormsg">*</span></label>
+                                                    <asp:TextBox ID="purposeOther" runat="server" CssClass="required form-control"></asp:TextBox>
+                                                </div>
+                                            </div>
                                            <div class="col-md-4">
                                                <div class="form-group">
                                                    <label>Payment Mode:<span class="errormsg">*</span></label>
--- 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;
--- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs
@ -561,6 +561,15 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration {
        /// </remarks>
        protected global::System.Web.UI.WebControls.DropDownList recDdlPurposeOfRemitance;
        
+        /// <summary>
+        /// purposeOther 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 purposeOther;
+        
        /// <summary>
        /// recDdlPaymentMode control.
        /// </summary>
--- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx
@ -169,8 +169,12 @@
                <tr>
                    <td style="white-space: nowrap" class="tg-fymr">Purpose Of Remittance:</td>
                    <td colspan="2" class="tg-0pky" runat="server" id="recPurposeOfRemittance"></td>
+                    <td class="tg-fymr">Other Purpose Of Remittance:</td>
+                    <td colspan="2" class="tg-0pky" runat="server" id="otherPurpose"></td>
+                </tr>
+                <tr>
                    <td class="tg-fymr">Payment Mode:</td>
-                    <td colspan="2" class="tg-0pky" runat="server" id="recPaymentMode"></td>
+                    <td class="tg-0pky" runat="server" id="recPaymentMode" colspan="5"></td>
                </tr>
                <tr>
                    <td style="white-space: nowrap" class="tg-fymr">Agent/Bank:</td>
--- 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();
--- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.designer.cs
@ -399,6 +399,15 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration {
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTableCell recPurposeOfRemittance;
        
+        /// <summary>
+        /// otherPurpose control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableCell otherPurpose;
+        
        /// <summary>
        /// recPaymentMode control.
        /// </summary>
--- a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx
+++ b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx
@ -39,7 +39,7 @@
                                        <div class="col-md-4 col-sm-4">
                                            <div class="form-group">
                                                <label>Address:<span class="errormsg">*</span></label>
-                                                <asp:TextBox ID="receiveraddress" runat="server" placeholder="FullName" MaxLength="14" CssClass="form-control required" />
+                                                <asp:TextBox ID="receiveraddress" runat="server" placeholder="Address" MaxLength="14" CssClass="form-control required" />
                                            </div>
                                        </div>
                                        <div class="col-md-4 col-sm-4">