From 6c646f9a723c5353912a95ed4694eb478d279891 Mon Sep 17 00:00:00 2001
From: gagan <gagan>
Date: Wed, 12 Aug 2020 04:57:29 +0000
Subject: [PATCH]

---
 .../PublishProfiles/FolderProfile.pubxml.user |  8 +--
 JMEAgentSystem/Web.config                     |  1 +
 .../BenificiaryRegistration/Manage.aspx       | 41 +++++++++++---
 .../Manage.aspx.designer.cs                   | 18 +++++++
 .../WebPages/CustomerRegistration/Manage.aspx | 51 +-----------------
 .../CustomerRegistration/Manage.aspx.cs       |  1 -
 .../Manage.aspx.designer.cs                   | 54 -------------------
 .../WebPages/SendTxn/SendTxnRequest.aspx      | 34 ++++++++++--
 .../SendTxn/SendTxnRequest.aspx.designer.cs   | 36 +++++++++----
 9 files changed, 115 insertions(+), 129 deletions(-)

diff --git a/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user b/JMEAgentSystem/Properties/PublishProfiles/FolderProfile.pubxml.user
index 3b0c626..a9c5e2c 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
       <publishTime>08/11/2020 16:56:02</publishTime>
     </File>
     <File Include="bin/JMEAgentSystem.dll">
-      <publishTime>08/12/2020 09:07:42</publishTime>
+      <publishTime>08/12/2020 09:24:33</publishTime>
     </File>
     <File Include="bin/JMEAgentSystem.pdb">
-      <publishTime>08/12/2020 09:07:42</publishTime>
+      <publishTime>08/12/2020 09:24:33</publishTime>
     </File>
     <File Include="bin/Microsoft.AspNet.FriendlyUrls.dll">
       <publishTime>08/11/2020 16:56:02</publishTime>
@@ -1084,7 +1084,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <publishTime>10/20/2019 15:35:21</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/12/2020 09:07:43</publishTime>
+      <publishTime>08/12/2020 09:24:34</publishTime>
     </File>
     <File Include="WebPages/About.aspx">
       <publishTime>08/11/2020 16:56:09</publishTime>
@@ -1108,7 +1108,7 @@ 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/BenificiaryRegistration/Manage.aspx">
-      <publishTime>08/11/2020 16:56:09</publishTime>
+      <publishTime>08/12/2020 09:19:38</publishTime>
     </File>
     <File Include="WebPages/Contact.aspx">
       <publishTime>08/11/2020 16:56:08</publishTime>
diff --git a/JMEAgentSystem/Web.config b/JMEAgentSystem/Web.config
index b2d03fb..dc21f9c 100644
--- a/JMEAgentSystem/Web.config
+++ b/JMEAgentSystem/Web.config
@@ -74,6 +74,7 @@
         <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
       </providers>
     </sessionState>
+      <customErrors mode="off" defaultRedirect="mycustompage.htm"/>
   </system.web>
   <appSettings>
     <add key="virtualDirName" value="" />
diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx
index a4a57ad..4c43132 100644
--- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx
+++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx
@@ -1,9 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Manage.aspx.cs" Inherits="JMEAgentSystem.WebPages.BenificiaryRegistration.Manage" %>
 
-<%@ Register Src="/Component/AutoComplete/SwiftTextBox.ascx" TagName="SwiftTextBox" TagPrefix="uc1" %>
-<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
-<%@ Register Src="~/Component/AutoComplete/SwiftTextBox.ascx" TagPrefix="uc2" TagName="SwiftTextBox" %>
-
 
 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
     <asp:UpdatePanel ID="up1" runat="server">
@@ -29,11 +25,12 @@
                     <div class="col-md-12">
                         <div class="panel panel-default ">
                             <div class="panel-heading">
-                                <h4 class="panel-title">Add Beneficiary 
+                                <h4 class="panel-title">
+                                Add Beneficiary 
                             </div>
                             <div class="panel-body">
                                 <div class="form-group">
-                                    <label>Enter Customer Id :<span class="errormsg">*</span></label>
+                                    <label>Enter Customer Id:<span class="errormsg">*</span></label>
                                     <asp:TextBox ID="customerId" Width="200px" runat="server" CssClass="form-control"></asp:TextBox>
                                 </div>
                             </div>
@@ -218,13 +215,40 @@
                                                         <asp:TextBox ID="txtRemarks" runat="server" TextMode="MultiLine" Rows="2" CssClass="form-control"></asp:TextBox>
                                                     </div>
                                                 </div>
-                                                <div class="col-sm-12" runat="server">
+
+                                                <%--End body part--%>
+                                            </div>
+                                        </div>
+                                        <div class="panel panel-default clearfix m-b-20">
+                                            <div class="panel-heading">Agreement Information</div>
+                                            <div class="panel-body">
+                                                <div class="col-md-12 col-sm-12" runat="server" id="BenificiaryAgreementDiv">
+                                                    <div class="form-group">
+                                                        <label class="checkbox-ui">
+                                                            <input type="checkbox" runat="server" class="custom-control-input" id="BenificiaryAgreement" />
+                                                            <small class="custom-control-label">「受取人登録書」
+                                                         私は本依頼書に記載されているジャパンマネーエクスプレス株式会社の「海外送金利用規約」の内容に同意します。
+                                                         私の依頼する送金は、北朝鮮及びイランとは関係無い取引であり、反社会勢力と一切の関りはありません。
+                                                         受取人及び私は「外内国の重要な公的な地位にある者」ではありません。
+                                                         また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの受取人登録を依頼します. <br />
+                                                         
+                                                         「Beneficiary Registration Form」
+                                                         I understand and agree to the ”Terms and Conditions for Overseas Remittance” of Japan Money Express Co., Ltd. (JME).
+                                                         Beneficiary and I no relation with North Korea nor Iran、and have no relation to any Anti-Social Forces or engaged in any illegal activities.
+                                                         Beneficiary and I are not Politically Exposed Persons(PEPs).
+                                                         I confirm the information shown in this application to register beneficiary/ beneficiaries is true and correct.
+
+
+                                                            </small>
+                                                        </label>
+                                                    </div>
+                                                </div>
+                                                <div class="row" runat="server">
                                                     <div class="form-group">
                                                         <asp:Button ID="register" runat="server" CssClass="btn btn-primary m-t-25" Text="Submit" />
                                                         <%--<asp:Button ID="register" runat="server" CssClass="btn btn-primary m-t-25" Text="Submit" OnClientClick="return CheckFormValidation()" />--%>
                                                     </div>
                                                 </div>
-                                                <%--End body part--%>
                                             </div>
                                         </div>
                                     </div>
@@ -234,6 +258,7 @@
                     </div>
                 </div>
             </div>
+            </div>
         </ContentTemplate>
     </asp:UpdatePanel>
 </asp:Content>
diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.designer.cs b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.designer.cs
index 392192a..094667d 100644
--- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.designer.cs
@@ -327,6 +327,24 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtRemarks;
         
+        /// <summary>
+        /// BenificiaryAgreementDiv 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.HtmlGenericControl BenificiaryAgreementDiv;
+        
+        /// <summary>
+        /// BenificiaryAgreement 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.HtmlInputCheckBox BenificiaryAgreement;
+        
         /// <summary>
         /// register control.
         /// </summary>
diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx
index 2b270af..15fb21a 100644
--- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx
@@ -530,14 +530,6 @@
                                 <div class="panel panel-default clearfix m-b-20">
                                     <div class="panel-heading">Agreement Information</div>
                                     <div class="panel-body">
-                                        <div class="col-md-12 col-sm-12" runat="server" id="displayCounterVisit" style="display:none">
-                                            <div class="form-group">
-                                                <label class="checkbox-ui">
-                                                    <input type="checkbox" runat="server" class="custom-control-input" id="customerCounterVisit" />
-                                                    <small class="custom-control-label">Counter Visit</small>
-                                                </label>
-                                            </div>
-                                        </div>
                                         <div class="col-md-12 col-sm-12" runat="server" id="CustomerAgreementDiv">
                                             <div class="form-group">
                                                 <label class="checkbox-ui">
@@ -546,7 +538,7 @@
                                                                     私は、本依頼書に記載されているジャパンマネーエクスプレス株式会社の「海外送金利用規約」の内容に同意します。
                                                                     私の依頼する送金は、北朝鮮及びイランとは関係無い取引であり、反社会勢力と一切の関りはありません。
                                                                     私は「外内国の重要な公的な地位にある者」ではありません。
-                                                                    また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの利用を依頼します。
+                                                                    また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの利用を依頼します。 <br />
                                                                     
                                                                     「Overseas Remittance Service Application」(customer registration)
                                                                     I understand and agree to the ”Terms and Conditions for Overseas Remittance” of Japan Money Express Co., Ltd. (JME).
@@ -558,47 +550,6 @@
                                                 </label>
                                             </div>
                                         </div>
-                                        <div class="col-md-12 col-sm-12" runat="server" id="BenificiaryAgreementDiv">
-                                            <div class="form-group">
-                                                <label class="checkbox-ui">
-                                                    <input type="checkbox" runat="server" class="custom-control-input" id="BenificiaryAgreement" />
-                                                    <small class="custom-control-label">「受取人登録書」
-                                                         私は本依頼書に記載されているジャパンマネーエクスプレス株式会社の「海外送金利用規約」の内容に同意します。
-                                                         私の依頼する送金は、北朝鮮及びイランとは関係無い取引であり、反社会勢力と一切の関りはありません。
-                                                         受取人及び私は「外内国の重要な公的な地位にある者」ではありません。
-                                                         また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの受取人登録を依頼します。
-                                                         
-                                                         「Beneficiary Registration Form」
-                                                         I understand and agree to the ”Terms and Conditions for Overseas Remittance” of Japan Money Express Co., Ltd. (JME).
-                                                         Beneficiary and I no relation with North Korea nor Iran、and have no relation to any Anti-Social Forces or engaged in any illegal activities.
-                                                         Beneficiary and I are not Politically Exposed Persons(PEPs).
-                                                         I confirm the information shown in this application to register beneficiary/ beneficiaries is true and correct.
-
-
-                                                    </small>
-                                                </label>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-12 col-sm-12" runat="server" id="TransactionAgreementDiv">
-                                            <div class="form-group">
-                                                <label class="checkbox-ui">
-                                                    <input type="checkbox" runat="server" class="custom-control-input" id="TransactionAgreement" />
-                                                    <small class="custom-control-label">外国送金依頼書」
-                                                        私は、本依頼書に記載されているジャパンマネーエクスプレス株式会社の「海外送金利用規約」の内容に同意します。
-                                                        私の依頼する送金は、北朝鮮及びイランとは関係無い取引であり、反社会勢力と一切の関りはありません。
-                                                        私は「外内国の重要な公的な地位にある者」ではありません。
-                                                        また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの利用を依頼します。
-                                                        
-                                                        「Application for Remittance」
-                                                        I understand and agree to the ”Terms and Conditions for Overseas Remittance” of Japan Money Express Co., Ltd. (JME).
-                                                        I confirm that this remittance has nothing to do with North Korea nor Iran、and have no relation to any Anti-Social Forces nor engagement in any illegal activities.
-                                                        I am not Politically Exposed Persons(PEPs).
-                                                        I confirm the information shown in this application to avail the remittance service is true and correct.
-
-                                                    </small>
-                                                </label>
-                                            </div>
-                                        </div>
                                         <div class="row" id="agreementDiv" runat="server">
                                             <div class="col-sm-8 form-group">
                                                 <label class="checkbox-ui">
diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs
index 068bce6..148f08d 100644
--- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.cs
@@ -482,7 +482,6 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration
             customerModel.remarks = txtRemarks.Text;
             customerModel.nameofEmployeer = txtNameofEmployeer.Text;
             customerModel.MonthlyIncome = ddlSalary.SelectedValue;
-            customerModel.IsCounterVisited = customerCounterVisit.Checked ? "Y" : "N";
             customerModel.customerPassword = customerPassword.Text;
             //customerModel.agentId = Int32.Parse(GetStatic.GetAgent());
             customerModel.DocumentType = ddlDocType.SelectedValue;
diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs
index eddcfdf..b44917a 100644
--- a/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/Manage.aspx.designer.cs
@@ -642,24 +642,6 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration {
         /// </remarks>
         protected global::System.Web.UI.WebControls.FileUpload reg_back_id;
         
-        /// <summary>
-        /// displayCounterVisit 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.HtmlGenericControl displayCounterVisit;
-        
-        /// <summary>
-        /// customerCounterVisit 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.HtmlInputCheckBox customerCounterVisit;
-        
         /// <summary>
         /// CustomerAgreementDiv control.
         /// </summary>
@@ -678,42 +660,6 @@ namespace JMEAgentSystem.WebPages.CustomerRegistration {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputCheckBox CustomerAgreement;
         
-        /// <summary>
-        /// BenificiaryAgreementDiv 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.HtmlGenericControl BenificiaryAgreementDiv;
-        
-        /// <summary>
-        /// BenificiaryAgreement 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.HtmlInputCheckBox BenificiaryAgreement;
-        
-        /// <summary>
-        /// TransactionAgreementDiv 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.HtmlGenericControl TransactionAgreementDiv;
-        
-        /// <summary>
-        /// TransactionAgreement 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.HtmlInputCheckBox TransactionAgreement;
-        
         /// <summary>
         /// agreementDiv control.
         /// </summary>
diff --git a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx
index c2f49b8..ac61224 100644
--- a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx
+++ b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx
@@ -133,9 +133,7 @@
                                                 <asp:TextBox ID="referralName" runat="server" placeholder="Referral Name" MaxLength="14" CssClass="form-control required" />
                                             </div>
                                         </div>
-                                        <div class="col-md-12">
-                                            <asp:Button ID="Save" Text="Save" runat="server" CssClass="btn btn-primary" OnClientClick="return ValidateDetails()" OnClick="Save_Click" />
-                                        </div>
+
 
                                         <asp:HiddenField ID="hddPayoutPartner" runat="server" />
                                         <asp:HiddenField ID="hddPmode" runat="server" />
@@ -147,6 +145,36 @@
 
                                     </div>
                                 </div>
+                                <div class="panel panel-default clearfix m-b-20">
+                                    <div class="panel-heading">Agreement Information</div>
+                                    <div class="panel-body">
+                                        <div class="col-md-12 col-sm-12" runat="server" id="TransactionAgreementDiv">
+                                            <div class="form-group">
+                                                <label class="checkbox-ui">
+                                                    <input type="checkbox" runat="server" class="custom-control-input" id="TransactionAgreement" />
+                                                    <small class="custom-control-label">外国送金依頼書」
+                                                        私は、本依頼書に記載されているジャパンマネーエクスプレス株式会社の「海外送金利用規約」の内容に同意します。
+                                                        私の依頼する送金は、北朝鮮及びイランとは関係無い取引であり、反社会勢力と一切の関りはありません。
+                                                        私は「外内国の重要な公的な地位にある者」ではありません。
+                                                        また申込書に表示された内容について間違いが無い事を確認した上で、JME送金サービスの利用を依頼します。 <br />
+                                                        
+                                                        「Application for Remittance」
+                                                        I understand and agree to the ”Terms and Conditions for Overseas Remittance” of Japan Money Express Co., Ltd. (JME).
+                                                        I confirm that this remittance has nothing to do with North Korea nor Iran、and have no relation to any Anti-Social Forces nor engagement in any illegal activities.
+                                                        I am not Politically Exposed Persons(PEPs).
+                                                        I confirm the information shown in this application to avail the remittance service is true and correct.
+
+                                                    </small>
+                                                </label>
+                                            </div>
+                                        </div>
+                                        <div class="row" runat="server">
+                                            <div class="form-group">
+                                                <asp:Button ID="Save" Text="Save" runat="server" CssClass="btn btn-primary" OnClientClick="return ValidateDetails()" OnClick="Save_Click" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs
index 725215c..3b1b692 100644
--- a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs
@@ -228,15 +228,6 @@ namespace JMEAgentSystem.WebPages.SendTxn {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox referralName;
         
-        /// <summary>
-        /// Save 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.Button Save;
-        
         /// <summary>
         /// hddPayoutPartner control.
         /// </summary>
@@ -299,5 +290,32 @@ namespace JMEAgentSystem.WebPages.SendTxn {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hddServiceCharge;
+        
+        /// <summary>
+        /// TransactionAgreementDiv 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.HtmlGenericControl TransactionAgreementDiv;
+        
+        /// <summary>
+        /// TransactionAgreement 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.HtmlInputCheckBox TransactionAgreement;
+        
+        /// <summary>
+        /// Save 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.Button Save;
     }
 }