From 5e948969f3aa50a3be511fadb64c343279812773 Mon Sep 17 00:00:00 2001
From: Leeza Baidar <leeza.baidar@gmeremit.com.np>
Date: Tue, 23 Jul 2024 14:53:08 +0545
Subject: [PATCH] #33791 changes to make bene details editable

#33786 changes in customer details page
---
 .../Benificiar/AddBeneficiary.aspx            |  4 +--
 .../AddBeneficiary.aspx.designer.cs           |  9 ------
 Swift.web/AgentNew/SendTxn/SendV2.aspx        | 22 +++++++-------
 Swift.web/AgentNew/js/SendTxn/sendSender.js   | 29 +++++++++++++++++++
 .../AgentNew/js/SendTxn/usableunctions.js     | 11 +++++++
 .../CustomerSetup/CustomerDetails.aspx.cs     |  2 +-
 6 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx b/Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx
index 90e258d..55ba7f0 100644
--- a/Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx
+++ b/Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx
@@ -842,7 +842,7 @@
                                                         <asp:TextBox ID="txtRemarks" runat="server" TextMode="MultiLine" Rows="2" CssClass="form-control"></asp:TextBox>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-12" id="isFromPhoneDiv" runat="server">
+                                                <%--<div class="col-md-12" id="isFromPhoneDiv" runat="server">
                                                     <div class="form-group">
                                                         <label class="checkbox-ui">
                                                             <input type="checkbox" id="isFromPhone" name="isFromPhone" required="required" />
@@ -851,7 +851,7 @@
                                                             </small>
                                                         </label>
                                                     </div>
-                                                </div>
+                                                </div>--%>
                                                 <%--End body part--%>
                                             </div>
                                         </div>
diff --git a/Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx.designer.cs b/Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx.designer.cs
index 1e26620..c5e98aa 100644
--- a/Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx.designer.cs
+++ b/Swift.web/AgentNew/Administration/CustomerSetup/Benificiar/AddBeneficiary.aspx.designer.cs
@@ -428,15 +428,6 @@ namespace Swift.web.AgentNew.Administration.CustomerSetup.Benificiar
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtRemarks;
 
-        /// <summary>
-        /// isFromPhoneDiv 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 isFromPhoneDiv;
-
         /// <summary>
         /// register control.
         /// </summary>
diff --git a/Swift.web/AgentNew/SendTxn/SendV2.aspx b/Swift.web/AgentNew/SendTxn/SendV2.aspx
index cd6c49a..48c6004 100644
--- a/Swift.web/AgentNew/SendTxn/SendV2.aspx
+++ b/Swift.web/AgentNew/SendTxn/SendV2.aspx
@@ -671,25 +671,25 @@
                                                         <span class="ErrMsg" id='txtRecFName_err'>*</span>
                                                     </td>
                                                     <td>
-                                                        <asp:TextBox ID="txtRecFName" autocomplete="stopdoingthat" runat="server" placeholder="First Name" CssClass="required SmallTextBox form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver First Name');"></asp:TextBox>
+                                                        <asp:TextBox ID="txtRecFName" autocomplete="stopdoingthat" runat="server" placeholder="First Name" CssClass="required SmallTextBox form-control" onblur="CheckForSpecialCharacter(this, 'Receiver First Name');"></asp:TextBox>
                                                     </td>
                                                     <td>
-                                                        <asp:TextBox ID="txtRecMName" autocomplete="stopdoingthat" runat="server" placeholder="Middle Name" CssClass="SmallTextBox form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver Middle Name');"></asp:TextBox>
+                                                        <asp:TextBox ID="txtRecMName" autocomplete="stopdoingthat" runat="server" placeholder="Middle Name" CssClass="SmallTextBox form-control" onblur="CheckForSpecialCharacter(this, 'Receiver Middle Name');"></asp:TextBox>
                                                     </td>
                                                     <td>
-                                                        <asp:TextBox ID="txtRecLName" autocomplete="stopdoingthat" runat="server" placeholder="Last Name" CssClass=" required SmallTextBox form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver Last Name');"></asp:TextBox>
+                                                        <asp:TextBox ID="txtRecLName" autocomplete="stopdoingthat" runat="server" placeholder="Last Name" CssClass=" required SmallTextBox form-control" onblur="CheckForSpecialCharacter(this, 'Receiver Last Name');"></asp:TextBox>
                                                         <span class="ErrMsg" id='txtRecLName_err'></span>
                                                     </td>
                                                     <td style="display: none;">
-                                                        <asp:TextBox ID="txtRecSLName" runat="server" CssClass="SmallTextBox form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver Second Last Name');"></asp:TextBox>
+                                                        <asp:TextBox ID="txtRecSLName" runat="server" CssClass="SmallTextBox form-control" onblur="CheckForSpecialCharacter(this, 'Receiver Second Last Name');"></asp:TextBox>
                                                     </td>
                                                 </tr>
-                                                <tr id="receiverNameFromPartnerTR">
+                                                <%--<tr id="receiverNameFromPartnerTR">
                                                     <td>&nbsp;</td>
                                                     <td colspan="3"><span class="form-control" style="background-color: #c1d6f1; text-transform: uppercase; font-size: 15px !important; font-weight: bold;">Beneficiary Name as per bank: <span style="background-color: yellow;">
                                                         <label id="lblReceiverName"></label>
                                                     </span></span></td>
-                                                </tr>
+                                                </tr>--%>
                                                 <tr id="trRecAddress1" runat="server">
                                                     <td>Address1:
                                                 <span runat="server" class="ErrMsg" id='txtRecAdd1_err'>*</span>
@@ -711,7 +711,7 @@
                                                         <span runat="server" class="ErrMsg" id='txtRecCity_err'>*</span>
                                                     </td>
                                                     <td id="tdRecCityTxt" runat="server" colspan="3">
-                                                        <asp:TextBox ID="txtRecCity" placeholder="Receiver City" runat="server" CssClass="form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver City');"></asp:TextBox>
+                                                        <asp:TextBox ID="txtRecCity" placeholder="Receiver City" runat="server" CssClass="form-control" onblur="CheckForSpecialCharacter(this, 'Receiver City');"></asp:TextBox>
                                                     </td>
                                                     <asp:TextBox Style="display: none" ID="txtRecPostal" runat="server" CssClass="form-control" onblur="CheckForSpecialCharacter(this, 'Receiver Postal Code');"></asp:TextBox>
                                                 </tr>
@@ -722,7 +722,7 @@
                                                         <asp:TextBox ID="txtRecMobile" autocomplete="stopdoingthat" runat="server" placeholder="Mobile Number" MaxLength="16" CssClass="required form-control" onchange="CheckForMobileNumber(this, 'Receiver Mobile No.');"></asp:TextBox>
                                                     </td>
                                                     <td id="tdRecTelNoTxt" runat="server">
-                                                        <asp:TextBox ID="txtRecTel" autocomplete="stopdoingthat" runat="server" placeholder="Phone Number" MaxLength="15" CssClass="form-control readonlyOnReceiverSelect" onchange="CheckForPhoneNumber(this, 'Receiver Tel. No.');"></asp:TextBox>
+                                                        <asp:TextBox ID="txtRecTel" autocomplete="stopdoingthat" runat="server" placeholder="Phone Number" MaxLength="15" CssClass="form-control" onchange="CheckForPhoneNumber(this, 'Receiver Tel. No.');"></asp:TextBox>
                                                     </td>
                                                 </tr>
                                             </table>
@@ -741,7 +741,7 @@
                                                         <span runat="server" class="ErrMsg" id='ddlRecIdType_err'>*</span>
                                                     </td>
                                                     <td colspan="3">
-                                                        <asp:DropDownList ID="ddlRecIdType" runat="server" CssClass="form-control readonlyOnReceiverSelect"></asp:DropDownList>
+                                                        <asp:DropDownList ID="ddlRecIdType" runat="server" CssClass="form-control"></asp:DropDownList>
                                                     </td>
                                                 </tr>
                                                 <tr id="trRecId1" runat="server" class="trRecId">
@@ -750,7 +750,7 @@
                                                         <span runat="server" class="ErrMsg" id='txtRecIdNo_err'>*</span>
                                                     </td>
                                                     <td colspan="3">
-                                                        <asp:TextBox ID="txtRecIdNo" runat="server" placeholder="ID Number" CssClass="form-control readonlyOnReceiverSelect" onblur="CheckForSpecialCharacter(this, 'Receiver ID Number');"></asp:TextBox>
+                                                        <asp:TextBox ID="txtRecIdNo" runat="server" placeholder="ID Number" CssClass="form-control" onblur="CheckForSpecialCharacter(this, 'Receiver ID Number');"></asp:TextBox>
                                                     </td>
                                                 </tr>
                                                 <tr style="display: none">
@@ -2077,7 +2077,7 @@
 
             $("#ContentPlaceHolder1_occupation").prop("disabled", true);
             //$("#ContentPlaceHolder1_ddlOccupation").prop("disabled", true);
-            $('#ContentPlaceHolder1_txtRecIdNo').attr('readonly', true);
+            //$('#ContentPlaceHolder1_txtRecIdNo').attr('readonly', true);
             //$("#ContentPlaceHolder1_introducerTxt_aText").prop('required', true);
             $("#ContentPlaceHolder1_branch").change(function () {
                 var choosePayer = $("#" + mId + "hddChoosePayer").val();
diff --git a/Swift.web/AgentNew/js/SendTxn/sendSender.js b/Swift.web/AgentNew/js/SendTxn/sendSender.js
index bc0d75d..73a7550 100644
--- a/Swift.web/AgentNew/js/SendTxn/sendSender.js
+++ b/Swift.web/AgentNew/js/SendTxn/sendSender.js
@@ -64,6 +64,35 @@ function SearchCustomerDetails(customerId, type) {
     return true;
 }
 
+function PopulateReceiverDataDDL(response) {
+    //var data = jQuery.parseJSON(response);
+    var data = response;
+    var ddl = GetElement(mId + "ddlReceiver");
+    $(ddl).empty();
+
+    var option = document.createElement("option");
+    option.text = 'Select Receiver';
+    option.value = '';
+
+    ddl.options.add(option);
+
+    for (var i = 0; i < data.length; i++) {
+        option = document.createElement("option");
+        option.text = data[i].fullName.toUpperCase();
+        option.value = data[i].receiverId;
+        try {
+            ddl.options.add(option);
+        }
+        catch (e) {
+            alert(e);
+        }
+    }
+    option = document.createElement("option");
+    option.text = 'New Receiver';
+    option.value = '0';
+    ddl.options.add(option);
+}
+
 function PopulateCustomerDocumentDetails(result) {
     var table = $('#customerDocDetails');
     table.find("tbody tr").remove();
diff --git a/Swift.web/AgentNew/js/SendTxn/usableunctions.js b/Swift.web/AgentNew/js/SendTxn/usableunctions.js
index e1728ac..efc6f4f 100644
--- a/Swift.web/AgentNew/js/SendTxn/usableunctions.js
+++ b/Swift.web/AgentNew/js/SendTxn/usableunctions.js
@@ -630,6 +630,17 @@ function ClearReceiverData() {
 }
 /////////// End Function For Receiver Info Data //////////////
 
+function ClearReceiverValidationData() {
+    //new added for receiver name validation
+    $('#receiverNameFromPartnerTR').hide();
+    $('#lblReceiverNamePartner').text('');
+    $('#lblReceiverName').text('');
+    $('#hddReceiverNameFromPartner').val('');
+    $('#hddShowPopupForReceiver').val('N');
+    $('#calc').attr('disabled', false);
+    $('#btnSendTxnCDDI').attr('disabled', false);
+}
+
 ///////////// Start Function For Location/Reciving Mode/Payout Currency Info Data //////////
 function ClearLocationRModeCurrencyInfoData() {
     SetDDLValueSelected(mId + "pCountry", "");
diff --git a/Swift.web/Remit/Administration/CustomerSetup/CustomerDetails.aspx.cs b/Swift.web/Remit/Administration/CustomerSetup/CustomerDetails.aspx.cs
index de4616a..fc8bf46 100644
--- a/Swift.web/Remit/Administration/CustomerSetup/CustomerDetails.aspx.cs
+++ b/Swift.web/Remit/Administration/CustomerSetup/CustomerDetails.aspx.cs
@@ -305,8 +305,8 @@ namespace Swift.web.Remit.Administration.CustomerSetup
                 str.Append("<td>" + dr["createdFrom"].ToString() + "</td>");
                 str.Append("<td>" + dr["verifiedDate"].ToString() + "</td>");
                 str.Append("<td>" + dr["verifiedBy"].ToString() + "</td>");
-                str.Append("<td>" + dr["approvedDate"].ToString() + "</td>");
                 str.Append("<td>" + dr["approvedBy"].ToString() + "</td>");
+                str.Append("<td>" + dr["approvedDate"].ToString() + "</td>");
                 str.Append("<td>" + dr["lastLoginTs"].ToString() + "</td>");
                 str.Append("<td>" + dr["phoneBrand"].ToString() + "</td>");
                 str.Append("</tr>");