V10

Bug #33784: Increase ID Length Actions
Bug #33786: Replace Approve By with approved Date Actions
Bug #33788: Replace JME with IME London Actions
Bug #33789: Remove the statement below remarks while adding beneficiary Actions
Bug #33843: TXN Report Actions
Bug #33862: Download all to Excel Actions
Feature #33790: Add Cash and Bank Name is Receiver list Actions
Feature #33794: Add Cancel Request in Notification Actions
Change Request #34208: KYC Validation

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>

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>

Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx

@@ -163,7 +163,6 @@
             });
 
             $('#modalClose').on('click', function () {
-               
 
                 $("#apiDataPopup").modal("hide");
             })
@@ -1087,7 +1086,7 @@
                                             </div>
                                         </div>--%>
                                     </div>
-                                   <%-- <div id="apiDataPopup" class="modal fade" role="dialog">
+                                    <%-- <div id="apiDataPopup" class="modal fade" role="dialog">
                                         <div class="modal-dialog">
                                             <div class="modal-content">
                                                 <div class="modal-header">
@@ -1138,7 +1137,7 @@
                                                     <div class="form-group">
                                                         <label id="verificationType">Verification Type No.:<span class="errormsg">*</span></label>
                                                         <div class="input-group input-append date dpYears">
-                                                            <asp:TextBox ID="verificationTypeNo" runat="server" placeholder="Verification Type Number" onchange="CheckRequiredOrNot()" MaxLength="14" CssClass="form-control required" />
+                                                            <asp:TextBox ID="verificationTypeNo" runat="server" placeholder="Verification Type Number" onchange="CheckRequiredOrNot()" MaxLength="20" CssClass="form-control required" />
                                                             <div class="input-group-addon" onclick="ShowIdTypeInfo();"><i class="fa fa-info"></i></div>
                                                         </div>
                                                     </div>
@@ -1344,10 +1343,10 @@
                                                     <label class="checkbox-ui">
                                                         <input type="checkbox" id="agreement" name="agreement" required="required" />
                                                         <small>
-                                                            <asp:Localize runat="server" meta:resourcekey="Register_048" Text="By submitting of this form, I hereby understand and aggree the Terms & Condition with Japan Money Express Co. Ltd."></asp:Localize><br />
+                                                            <asp:Localize runat="server" meta:resourcekey="Register_048" Text="By submitting of this form, I hereby understand and agree the Terms & Condition with IME London"></asp:Localize><br />
                                                         </small>
                                                     </label>
-                                                    <a data-toggle="modal" data-target="#termsAndCondition">
+                                                    <a href="https://imelondon.co.uk/terms-and-conditions" target="_blank">
                                                         <small><span class="primary-c">
                                                             <asp:Localize runat="server" meta:resourcekey="Register_049" Text="User Agreement"></asp:Localize>
                                                         </span></small>
@@ -1355,6 +1354,7 @@
                                                 </div>
                                             </div>
 
+
                                             <div class="row" id="signatureDiv" runat="server">
                                                 <div class="col-md-6">
                                                     <label class="control-label">Customer Signature:</label>

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">
@@ -1856,9 +1856,12 @@
                     else {
                         var branchId = data[0].branchDetails.split('|')[0];
                         var text = data[0].branchDetails.split('|')[1];
+
                         SetDDLValueSelected("<%=branch.ClientID %>", text);
                         GetBranch(branchId, text);
+                       
                         $('#ContentPlaceHolder1_branch').val(text);
+
                     }
                 }--%>
                 if (data[0].branchDetails) {
@@ -1878,6 +1881,8 @@
                         }
                     }
                 }
+
+              
                 <%--if ($("#<%=pCountry.ClientID%> option:selected ").val() != "") {
                     PcountryOnChange('c', "");
                     SetPayCurrency($("#<%=pCountry.ClientID%>").val());
@@ -2072,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();

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();

Swift.web/AgentNew/js/SendTxn/usableunctions.js

@@ -87,9 +87,11 @@ function ClearCollModeAndAvailableBal() {
 }
 
 function ParseCalculateData(response, amtType) {
+    
     var data = response;
     CheckSession1(data);
     if (data[0].ErrCode === '1') {
+        
         alert(data[0].Msg);
         ClearAmountFields();
         return;
@@ -220,6 +222,7 @@ function LoadPayMode(response, myDDL, recall, selectField, obj) {
 }
 
 function ParseLoadDDl(response, myDDL, recall, selectField) {
+    
     var data = response;
     CheckSession(data);
     var ddl2 = GetElement(mId + "pAgentDetail");
@@ -627,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", "");

Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs

@@ -127,11 +127,13 @@ namespace Swift.web.MobileRemit.Admin.Reports
             else if (customerDetails.Rows[0]["customerSource"].ToString() == "temp")
             {
                 btnReset.Enabled = false;
+                btnMove.Enabled = true;
             }
             else
             {
                 //btnUpdate.Enabled = true;
                 btnReset.Enabled = true;
+                btnMove.Enabled = false;
             }
         }
 
@@ -278,7 +280,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
             }
             else
             {
-                GetStatic.AlertMessage(this.Page, "Customer KYC has been successfully cleared.");
+                GetStatic.AlertMessage(this.Page, "Customer has been successfully verified.");
             }
         }
     }

Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx

@@ -60,6 +60,10 @@
 
     <script type="text/javascript">
 
+  function SetMessageBox(msg, id) {
+            alert(msg);
+        }
+		
         $(document).ready(function () {
 
             $('#btnSearch').click(function () {
@@ -1210,7 +1214,7 @@
                                                         <div class="form-group">
                                                             <label id="otherVerificationType">Other Verification ID Type.:<span class="errormsg">*</span></label>
                                                             <div class="input-group input-append date dpYears">
-                                                                <asp:TextBox ID="otherVerificationTypeNo" runat="server" placeholder="Other Verification Id Type" MaxLength="14" CssClass="form-control" />
+                                                                <asp:TextBox ID="otherVerificationTypeNo" runat="server" placeholder="Other Verification Id Type" MaxLength="25" CssClass="form-control" />
                                                                 <div class="input-group-addon" onclick="ShowIdTypeInfo();"><i class="fa fa-info"></i></div>
                                                             </div>
                                                         </div>
@@ -1219,7 +1223,7 @@
                                                         <div class="form-group">
                                                             <label id="verificationType">Verification Type No.:<span class="errormsg">*</span></label>
                                                             <div class="input-group input-append date dpYears">
-                                                                <asp:TextBox ID="verificationTypeNo" runat="server" placeholder="Verification Type Number" onchange="CheckRequiredOrNot()" MaxLength="14" CssClass="form-control required" />
+                                                                <asp:TextBox ID="verificationTypeNo" runat="server" placeholder="Verification Type Number" onchange="CheckRequiredOrNot()" MaxLength="20" CssClass="form-control required" />
                                                                 <div class="input-group-addon" onclick="ShowIdTypeInfo();"><i class="fa fa-info"></i></div>
                                                             </div>
                                                         </div>

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>");

Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs

@@ -181,11 +181,11 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
 
                 for (int i = 0; i < partnerTable.Columns.Count; i++)
                 {
-                    if (i == 17 || i == 19 || i == 20|| i == 21 || i == 22 || i == 24 || i == 27)
+                    if (i == 17 || i == 19 || i == 20 || i == 21 || i == 26 || i == 27)
                     {
                         decimal total = partnerTable.AsEnumerable()
                             .Sum(row => decimal.TryParse(row[i].ToString(), out decimal val) ? val : 0);
-                        if(i == 17)
+                        if(i == 17 && i == 27)
                         {
                             strTable.Append("<td align=\"left\"><b>" + total + "</b></td>");
                         }

Swift.web/SendMoney/Default.aspx.cs

@@ -552,6 +552,7 @@ namespace Swift.web.SendMoney
             GetStatic.WriteSession("branch", ud.Branch);
             GetStatic.WriteSession("branchName", ud.BranchName);
             GetStatic.WriteSession("agent", ud.Agent);
+            GetStatic.WriteSession("agentId", ud.Agent);
             GetStatic.WriteSession("agentName", ud.AgentName);
             GetStatic.WriteSession("branch", ddlBranch.SelectedValue);
             GetStatic.WriteSession("branchName", ddlBranch.SelectedItem.Text);