4 years ago · d0bc7edcfa
10 changed files with 408 additions and 444 deletions
--- a/Database/Sp/proc_customerInfo.sql
+++ b/Database/Sp/proc_customerInfo.sql
@ -126,7 +126,6 @@ BEGIN
 				 LEFT JOIN tbl_japan_address_detail detail (NOLOCK) ON detail.row_id = cm.district
               WHERE   customerId = @customerId;  
  
-  
   SELECT			ri.receiverId ,  
 				  ri.fullName customerName,  
                   ri.customerId ,  
@ -170,7 +169,7 @@ BEGIN
     LEFT JOIN STATICDATAVALUE SDV1 (NOLOCK) ON SDV1.VALUEID = RI.PURPOSEOFREMIT  
     LEFT JOIN STATICDATAVALUE SDV2 (NOLOCK) ON SDV2.VALUEID = RI.RECEIVERTYPE  
     LEFT JOIN STATICDATAVALUE SDV3 (NOLOCK) ON SDV3.VALUEID = RI.idtype  
-     LEFT JOIN API_BANK_BRANCH_LIST ABBL (NOLOCK) ON ABBL.BRANCH_ID = RI.BANKLOCATION  
+     LEFT JOIN API_BANK_BRANCH_LIST ABBL (NOLOCK) ON cast(ABBL.BRANCH_ID as varchar) = RI.BANKLOCATION  
     LEFT JOIN API_BANK_LIST ABL (NOLOCK) ON ABL.BANK_ID = RI.PAYOUTPARTNER  
     LEFT JOIN dbo.customerMaster (NOLOCK) cmm ON cmm.customerId = ri.customerId  
           WHERE   receiverId = @receiverId ;  
--- 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/27/2020 18:55:57</publishTime>
+      <publishTime>08/27/2020 20:41:29</publishTime>
    </File>
    <File Include="bin/JMEAgentSystem.pdb">
-      <publishTime>08/27/2020 18:55:57</publishTime>
+      <publishTime>08/27/2020 20:41:29</publishTime>
    </File>
    <File Include="bin/Microsoft.AspNet.FriendlyUrls.dll">
      <publishTime>08/11/2020 16:56:02</publishTime>
@ -865,7 +865,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
      <publishTime>08/24/2020 11:45:30</publishTime>
    </File>
    <File Include="Scripts/Receiver/ReceiverRegistrationNew.js">
-      <publishTime>08/24/2020 12:03:08</publishTime>
+      <publishTime>08/27/2020 20:38:00</publishTime>
    </File>
    <File Include="Scripts/ReferralReports/DashBoard.js">
      <publishTime>08/27/2020 12:26:11</publishTime>
@ -898,7 +898,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="Site.Master">
-      <publishTime>08/27/2020 18:55:46</publishTime>
+      <publishTime>08/27/2020 19:17:06</publishTime>
    </File>
    <File Include="Site.Mobile.Master">
      <publishTime>10/25/2019 16:47:02</publishTime>
@ -1321,13 +1321,13 @@ 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/27/2020 18:55:42</publishTime>
+      <publishTime>08/27/2020 20:37:33</publishTime>
    </File>
    <File Include="WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx">
-      <publishTime>08/27/2020 17:57:53</publishTime>
+      <publishTime>08/27/2020 20:02:00</publishTime>
    </File>
    <File Include="WebPages/Calculator/Calculator.aspx">
-      <publishTime>08/27/2020 18:55:52</publishTime>
+      <publishTime>08/27/2020 20:08:23</publishTime>
    </File>
    <File Include="WebPages/Contact.aspx">
      <publishTime>08/11/2020 16:56:08</publishTime>
@ -1336,7 +1336,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
      <publishTime>08/24/2020 11:26:26</publishTime>
    </File>
    <File Include="WebPages/CustomerRegistration/PrintDetails.aspx">
-      <publishTime>08/27/2020 18:01:37</publishTime>
+      <publishTime>08/27/2020 20:02:10</publishTime>
    </File>
    <File Include="WebPages/Default.aspx">
      <publishTime>08/27/2020 12:26:40</publishTime>
@ -1357,7 +1357,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/SendTxn/PrintSendMoneyRequestDetails.aspx">
-      <publishTime>08/27/2020 17:59:14</publishTime>
+      <publishTime>08/27/2020 20:02:26</publishTime>
    </File>
    <File Include="WebPages/SendTxn/SendTxnRequest.aspx">
      <publishTime>08/24/2020 15:02:47</publishTime>
--- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx
+++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx
@ -2,9 +2,6 @@


 <asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
-    <asp:ScriptManager EnableCdn="true" runat="server"></asp:ScriptManager>
-    <asp:UpdatePanel ID="up1" runat="server">
-        <ContentTemplate>
    <div class="hidden">
        <asp:HiddenField ID="hideCustomerId" runat="server" />
    </div>
@ -70,7 +67,7 @@
                        <div class="panel-body">
                            <div class="col-md-12">
                                <div class="form-group">
-                                            <asp:Button ID="add" runat="server" CssClass="btn btn-primary m-t-25" Text="Add" OnClick="add_Click" />
+                                    <input type="button" id="add" class="btn btn-primary m-t-25" value="Add" />
                                </div>
                            </div>
                        </div>
@ -339,10 +336,7 @@
            </div>
        </div>
    </div>
-            </div>
    <asp:HiddenField ID="hddImgURL" runat="server" />
-        </ContentTemplate>
-    </asp:UpdatePanel>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="Script" runat="server">
    <style>
@ -375,6 +369,14 @@

    <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@1.5.4/src/loadingoverlay.min.js"></script>
    <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@1.5.4/extras/loadingoverlay_progress/loadingoverlay_progress.min.js"></script>
-    <script src="/Scripts/Receiver/ReceiverRegistrationNew.js"></script>
-
+    <script src="../../Scripts/Receiver/ReceiverRegistrationNew.js"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $("#" + mId + "regUp").hide();
+            $("#add").click(function () {
+                $("#" + mId + "regUp").show();
+                CallSignature();
+            });
+        });
+    </script>
 </asp:Content>
--- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs
+++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs
@ -34,12 +34,10 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
        {
            GetStatic.PrintMessage(Page);
            _sl.CheckSession();
-            //regUp.Visible = false;
            receiverAccountNo.Attributes.Add("hidden", "hidden");
            if (!IsPostBack)
            {
                PopulateDDL();
-                regUp.Visible = false;
                infoDiv.Visible = false;
                string reqMethod = Request.Form["MethodName"];
                switch (reqMethod)
@ -580,7 +578,7 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration
        protected void add_Click(object sender, EventArgs e)
        {
            regUp.Visible = true;
-            GetStatic.CallBackJs(Page, "Alert Message", "CallSignature();");
+            GetStatic.CallBackJs(Page, "Alert Message", "CallSignature()");
        }
        private void SetCustomerDetails(DataRow dr)
        {
--- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.designer.cs
@ -12,15 +12,6 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration {
    
    public partial class Manage {
        
-        /// <summary>
-        /// up1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UpdatePanel up1;
-        
        /// <summary>
        /// hideCustomerId control.
        /// </summary>
@ -84,15 +75,6 @@ namespace JMEAgentSystem.WebPages.BenificiaryRegistration {
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl test;
        
-        /// <summary>
-        /// add 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 add;
-        
        /// <summary>
        /// regUp control.
        /// </summary>
--- a/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx
+++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/PrintBeneficiaryDetails.aspx
@ -108,6 +108,7 @@
            </table>
            <div class="panel-body row" id="docDiv" runat="server">
            </div>
+
            <div class="panel-body row" id="dateDiv" runat="server">
                <div class="col-md-12">
                    <div class="form-group">
--- a/JMEAgentSystem/WebPages/Calculator/Calculator.aspx
+++ b/JMEAgentSystem/WebPages/Calculator/Calculator.aspx
@ -16,9 +16,6 @@
                    <div class="panel-body">
                        <div>

-                            <asp:ScriptManager EnableCdn="true" runat="server"></asp:ScriptManager>
-                            <asp:UpdatePanel ID="upnl1" runat="server">
-                                <ContentTemplate>
                            <div class="rowConatainer">
                                <table class="table table-responsive">
                                    <tr>
@ -121,9 +118,6 @@
                                        <td>&nbsp;</td>
                                    </tr>
                                </table>
-                                </ContentTemplate>
-                                <Triggers></Triggers>
-                            </asp:UpdatePanel>
                            </div>
                        </div>
                    </div>
@ -133,9 +127,4 @@
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="Script" runat="server">
    <script src="/Scripts/Calculator/Calculator.js"></script>
-    <style type="text/css">
-        .Container-fluid {
-            margin-left: 340px;
-        }
-    </style>
 </asp:Content>
--- a/JMEAgentSystem/WebPages/Calculator/Calculator.aspx.designer.cs
+++ b/JMEAgentSystem/WebPages/Calculator/Calculator.aspx.designer.cs
@ -12,15 +12,6 @@ namespace JMEAgentSystem.WebPages.Calculator {
    
    public partial class Calculator {
        
-        /// <summary>
-        /// upnl1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UpdatePanel upnl1;
-        
        /// <summary>
        /// pCountry control.
        /// </summary>
--- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx
+++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx
@ -211,6 +211,7 @@
            </table>
            <div class="panel-body row" id="docDiv" runat="server">
            </div>
+
            <div class="panel-body row" id="dateDiv" runat="server">
                <div class="col-md-12">
                    <div class="form-group">
--- a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx
+++ b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx
@ -111,6 +111,7 @@
            </table>
            <div class="panel-body row" id="docDiv" runat="server">
            </div>
+
            <div class="panel-body row" id="dateDiv" runat="server">
                <div class="col-md-12">
                    <div class="form-group">